tbb-commits

Download

tbb-commits@lists.torproject.org

1 participants
18710 discussions

[tor-browser-build/master] Bug 18691: switch Windows builds from precise to jessie
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

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

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: No sandboxed-tor-browser in the stable series yet
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] Bug 24912: No Win64 stable bundles yet
by gk＠torproject.org 16 Jan '18

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: Disable selfrando on stable series
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

[tor-browser-build/master] Bug 24912: Don't build snowflake on the stable series yet
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] Reset timestamp when no_build_id is selected
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

[torbutton/master] Bug 21245: Add da translation to Torbutton and keep track of it
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

[torbutton/master] Update translations
by gk＠torproject.org 10 Jan '18

10 Jan '18

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"> + +<!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? "> + +<!ENTITY help.donateLink "Doner"> +<!ENTITY help.or " eller "> + +<!ENTITY help.getInvolvedLink "vær med"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Spørgsmål?"> + +<!ENTITY bottomLinks.grow "Hjælp Tor Network med at vokse!"> + +<!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 @@  -<!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."> + + +<!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

[tor-browser-build/master] Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit fe7d1b4ba0bc683c6b23d162c1ea7d7efa2b13d8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 9 12:39:18 2018 +0100 Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds --- projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index ac51782..14ba58e 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -44,6 +44,10 @@ openssldir=/var/tmp/dist/openssl # the libstdc++ into the directory with the libs tor depends on, too. See bug # 13359 for further details. cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + [% IF c("var/asan") -%] + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.2 "$distdir/Tor/" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/" + [% END -%] chmod 700 "$distdir"/Tor/*.so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$distdir/Tor/"

1 0

[tor-browser-build/master] Bug 23892: Include Firefox and Tor debug files in final build directory
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit ea4d78280772479da994c3222e76eabe47b26257 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 22 14:24:35 2017 +0100 Bug 23892: Include Firefox and Tor debug files in final build directory --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f8f1356..e87ef11 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -288,6 +288,10 @@ cd $distdir rm -rf $distdir/${PKG_DIR} cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ +[% IF c("var/linux") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.gz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.gz + cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.gz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.gz +[% END -%] # If we did not create a multi-lingual package above, create a package for # each locale.

1 0

[tor-browser-build/master] Bug 23911: Create .htaccess file in build directory
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit a7dd0dd538533f35edf2dcd18d99b59447a2517b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 22 13:50:37 2017 +0100 Bug 23911: Create .htaccess file in build directory --- projects/release/build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/release/build b/projects/release/build index 2be0c49..985ffa3 100644 --- a/projects/release/build +++ b/projects/release/build @@ -23,6 +23,13 @@ mkdir -p "$destdir" mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" +cat > .htaccess <<EOF +RewriteEngine On +RewriteRule ^sha256sums.txt$ sha256sums-unsigned-build.txt +RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc +RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt +RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc +EOF sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt

1 0

[torbutton/master] Bug 24702: Remove Mozilla text from banner
by gk＠torproject.org 09 Jan '18

09 Jan '18

commit f3dd9d4caf350bf87550fdec45061f9691f86b48 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Dec 21 14:45:53 2017 -0800 Bug 24702: Remove Mozilla text from banner --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 - src/chrome/content/aboutTor/donation_banner.js | 2 -- src/chrome/skin/donation_banner.css | 17 ----------------- 3 files changed, 20 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 248df11..0fca4b9 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,7 +37,6 @@ window.addEventListener("pageshow", function() { <div id="banner-contents-container"> <div id="banner-tagline"><span></span></div> <div id="banner-slogan"><span></span></div> - <div id="banner-mozilla"><span></span></div> <a id="banner-donate-button-link" href="https://www.torproject.org/donate/donate-pdr-tbb"> <div id="banner-donate-button"> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 391c28f..85f6af1 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -46,7 +46,6 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-slogan")); - fitTextInElement(sel("#banner-mozilla")); fitTextInElement(sel("#banner-donate-button-inner")); avoidWidows(sel("#banner-tagline span")); }; @@ -59,7 +58,6 @@ let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLoca try { sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; sel("#banner-slogan span").innerText = slogan; - sel("#banner-mozilla span").innerText = mozilla; let donateButtonText = sel("#banner-donate-button-inner span"); let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index c91f0e5..dd9d7be 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -75,23 +75,6 @@ left: 285px; right: 85px; } -#banner-mozilla { - align-items: center; - bottom: 5px; - color: white; - display: flex; - font-family: sans-serif; - left: 85px; - position: absolute; - right: 285px; - text-align: start; - top: 120px; - white-space: nowrap; -} -#banner-mozilla:-moz-dir(rtl) { - left: 285px; - right: 85px; -} #banner-donate-button { background-color: #13a513; border: 0px;

1 0

[tor-browser-build/master] Bug 24514: set tmp directory used by dmg2mar
by gk＠torproject.org 19 Dec '17

19 Dec '17

commit c4db919cd945f421f36ec1c358bce15ecc192590 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Dec 19 20:46:55 2017 +0100 Bug 24514: set tmp directory used by dmg2mar --- projects/release/dmg2mar | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/release/dmg2mar b/projects/release/dmg2mar index d6175f5..ad1058e 100644 --- a/projects/release/dmg2mar +++ b/projects/release/dmg2mar @@ -1,4 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] +export TMPDIR=[% shell_quote(c("tmp_dir")) %] +mkdir -p "$TMPDIR" cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] [% shell_quote(c("basedir")) %]/tools/dmg2mar

1 0

[tor-browser-build/master] Release preparations for 7.5a10
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit ce45a8d054de9d9c7d93767a3e19915190a440ac Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 18 09:00:52 2017 +0000 Release preparations for 7.5a10 Versions bump and Changelog update --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 25 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 +++-- 7 files changed, 34 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4821baf..182b6b5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ececb9a..cfbe26d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,28 @@ +Tor Browser 7.5a10 -- December 19 2017 + * All Platforms + * Update Tor to 0.3.2.7-rc + * Update OpenSSL to 1.0.2n + * Update Torbutton to 1.9.8.4 + * Bug 21847: Update copy for security slider + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update Tor Launcher to 0.2.14.2 + * Bug 24623: Revise "country that censors Tor" text + * Bug 24428: Bootstrap error message sometimes lost + * Bug 24624: tbb-logo.svg may cause network access + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update NoScript to 5.1.8.3 + * Bug 23104: CSS line-height reveals the platform Tor Browser is running on + * Bug 24398: Plugin-container process exhausts memory + * OS X + * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser + * Linux + * Bug 23970: Make "Print to File" work with sandboxing enabled + * Bug 23016: "Print to File" is broken on some non-english Linux systems + * Android + * Bug 22084: Spoof network information API + Tor Browser 7.5a9 -- December 09 2017 * All Platforms * Update Firefox to 52.5.2esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d2085b0..7fded62 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 + sha256sum: 9a81de6e26f639e5f82cabddcd361177815c59af2bca6363ba755255feffd2ec - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 587c257..c048175 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14.1 +version: 0.2.14.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index f662561..6f01b29 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.6-alpha +version: 0.3.2.7-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index f92bb48..a4e8715 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.3 +version: 1.9.8.4 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 5714e1f..8b9309d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a9' - torbrowser_build: 'build4' + torbrowser_version: '7.5a10' + torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5a8 + - 7.5a9 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Adding 7.0.10 changelog as well
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit 967767603e27e50264e4e17202bd4c634d8280b0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 18 08:17:40 2017 +0000 Adding 7.0.10 changelog as well --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index fb38ba0..ececb9a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -34,6 +34,22 @@ Tor Browser 7.5a8 -- November 15 2017 * Bug 20636+10026: Create 64bit Tor Browser for Windows * Bug 24052: Block file:// redirects early +Tor Browser 7.0.10 -- November 14 2017 + * All Platforms + * Update Firefox to 52.5.0esr + * Update Tor to 0.3.1.8 + * Update Torbutton to 1.9.7.10 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Translations update + * Update HTTPS-Everywhere to 2017.10.30 + * Bug 24178: Use make.sh for building HTTPS-Everywhere + * Update NoScript to 5.1.5 + * Bug 23968: NoScript icon jumps to the right after update + * Windows + * Bug 23582: Enable the Windows DLL blocklist for mingw-w64 builds + * Bug 23396: Update the msvcr100.dll we ship + * Bug 24052: Block file:// redirects early + Tor Browser 7.5a7 -- November 4 2017 * OS X * Bug 24052: Streamline handling of file:// resources

1 0

[tor-launcher/master] Release preparations for 0.2.14.2
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit 7f1f56b7c719cbf281999e76b2e62561eb941df3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 18 08:33:31 2017 +0000 Release preparations for 0.2.14.2 Translations update and version bump --- src/chrome/locale/ach/network-settings.dtd | 2 +- src/chrome/locale/ady/network-settings.dtd | 2 +- src/chrome/locale/af/network-settings.dtd | 2 +- src/chrome/locale/ak/network-settings.dtd | 2 +- src/chrome/locale/am/network-settings.dtd | 2 +- src/chrome/locale/ar/network-settings.dtd | 2 +- src/chrome/locale/arn/network-settings.dtd | 2 +- src/chrome/locale/ast/network-settings.dtd | 2 +- src/chrome/locale/az/network-settings.dtd | 2 +- src/chrome/locale/be/network-settings.dtd | 2 +- src/chrome/locale/bg/network-settings.dtd | 36 ++++----- src/chrome/locale/bn-BD/network-settings.dtd | 78 +++++++++--------- src/chrome/locale/bn-BD/torlauncher.properties | 92 +++++++++++----------- src/chrome/locale/bn-IN/network-settings.dtd | 2 +- src/chrome/locale/bn/network-settings.dtd | 2 +- src/chrome/locale/bo/network-settings.dtd | 2 +- src/chrome/locale/br/network-settings.dtd | 2 +- src/chrome/locale/bs/network-settings.dtd | 2 +- src/chrome/locale/ca/network-settings.dtd | 36 ++++----- src/chrome/locale/ca/torlauncher.properties | 4 +- src/chrome/locale/cs/network-settings.dtd | 36 ++++----- src/chrome/locale/cs/torlauncher.properties | 4 +- src/chrome/locale/csb/network-settings.dtd | 2 +- src/chrome/locale/cv/network-settings.dtd | 2 +- src/chrome/locale/cy/network-settings.dtd | 2 +- src/chrome/locale/da/network-settings.dtd | 36 ++++----- src/chrome/locale/da/torlauncher.properties | 4 +- src/chrome/locale/de/network-settings.dtd | 36 ++++----- src/chrome/locale/de/torlauncher.properties | 4 +- src/chrome/locale/dz/network-settings.dtd | 2 +- src/chrome/locale/el/network-settings.dtd | 2 +- src/chrome/locale/en-GB/network-settings.dtd | 2 +- src/chrome/locale/eo/network-settings.dtd | 2 +- src/chrome/locale/es-AR/network-settings.dtd | 2 +- src/chrome/locale/es-CL/network-settings.dtd | 2 +- src/chrome/locale/es-CO/network-settings.dtd | 2 +- src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es/network-settings.dtd | 36 ++++----- src/chrome/locale/es/torlauncher.properties | 4 +- src/chrome/locale/et/network-settings.dtd | 2 +- src/chrome/locale/eu/network-settings.dtd | 2 +- src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/fi/network-settings.dtd | 2 +- src/chrome/locale/fil/network-settings.dtd | 2 +- src/chrome/locale/fo/network-settings.dtd | 2 +- src/chrome/locale/fr-CA/network-settings.dtd | 36 ++++----- src/chrome/locale/fr-CA/torlauncher.properties | 4 +- src/chrome/locale/fr/network-settings.dtd | 40 +++++----- src/chrome/locale/fr/torlauncher.properties | 10 +-- src/chrome/locale/fur/network-settings.dtd | 2 +- src/chrome/locale/fy/network-settings.dtd | 2 +- src/chrome/locale/ga/network-settings.dtd | 36 ++++----- src/chrome/locale/ga/torlauncher.properties | 4 +- src/chrome/locale/gl/network-settings.dtd | 2 +- src/chrome/locale/gu-IN/network-settings.dtd | 2 +- src/chrome/locale/gu/network-settings.dtd | 2 +- src/chrome/locale/gun/network-settings.dtd | 2 +- src/chrome/locale/ha/network-settings.dtd | 2 +- src/chrome/locale/he/network-settings.dtd | 36 ++++----- src/chrome/locale/he/torlauncher.properties | 4 +- src/chrome/locale/hi/network-settings.dtd | 2 +- src/chrome/locale/hr-HR/network-settings.dtd | 2 +- src/chrome/locale/hr/network-settings.dtd | 2 +- src/chrome/locale/ht/network-settings.dtd | 2 +- src/chrome/locale/hu/network-settings.dtd | 26 +++--- src/chrome/locale/hu/torlauncher.properties | 4 +- src/chrome/locale/hy/network-settings.dtd | 2 +- src/chrome/locale/ia/network-settings.dtd | 2 +- src/chrome/locale/id/network-settings.dtd | 2 +- src/chrome/locale/is/network-settings.dtd | 2 +- src/chrome/locale/it/network-settings.dtd | 36 ++++----- src/chrome/locale/it/torlauncher.properties | 4 +- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/jv/network-settings.dtd | 2 +- src/chrome/locale/ka/network-settings.dtd | 2 +- src/chrome/locale/kk/network-settings.dtd | 2 +- src/chrome/locale/km/network-settings.dtd | 2 +- src/chrome/locale/kn/network-settings.dtd | 2 +- src/chrome/locale/ko-KR/network-settings.dtd | 2 +- src/chrome/locale/ko/network-settings.dtd | 2 +- src/chrome/locale/ku/network-settings.dtd | 2 +- src/chrome/locale/kw/network-settings.dtd | 2 +- src/chrome/locale/ky/network-settings.dtd | 2 +- src/chrome/locale/lb/network-settings.dtd | 2 +- src/chrome/locale/lg/network-settings.dtd | 2 +- src/chrome/locale/ln/network-settings.dtd | 2 +- src/chrome/locale/lo/network-settings.dtd | 2 +- src/chrome/locale/lt/network-settings.dtd | 22 +++--- src/chrome/locale/lv/network-settings.dtd | 2 +- src/chrome/locale/mg/network-settings.dtd | 2 +- src/chrome/locale/mi/network-settings.dtd | 2 +- src/chrome/locale/mk/network-settings.dtd | 2 +- src/chrome/locale/ml/network-settings.dtd | 2 +- src/chrome/locale/mn/network-settings.dtd | 2 +- src/chrome/locale/mr/network-settings.dtd | 2 +- src/chrome/locale/ms-MY/network-settings.dtd | 68 ++++++++-------- src/chrome/locale/ms-MY/torlauncher.properties | 14 ++-- src/chrome/locale/mt/network-settings.dtd | 2 +- src/chrome/locale/my/network-settings.dtd | 2 +- src/chrome/locale/nah/network-settings.dtd | 2 +- src/chrome/locale/nap/network-settings.dtd | 2 +- src/chrome/locale/nb/network-settings.dtd | 36 ++++----- src/chrome/locale/nb/torlauncher.properties | 6 +- src/chrome/locale/nds/network-settings.dtd | 2 +- src/chrome/locale/ne/network-settings.dtd | 2 +- src/chrome/locale/nl-BE/network-settings.dtd | 2 +- src/chrome/locale/nl/network-settings.dtd | 34 ++++---- src/chrome/locale/nl/torlauncher.properties | 4 +- src/chrome/locale/nn/network-settings.dtd | 2 +- src/chrome/locale/nso/network-settings.dtd | 2 +- src/chrome/locale/oc/network-settings.dtd | 2 +- src/chrome/locale/or/network-settings.dtd | 2 +- src/chrome/locale/pa/network-settings.dtd | 2 +- src/chrome/locale/pap/network-settings.dtd | 2 +- src/chrome/locale/pl/network-settings.dtd | 2 +- src/chrome/locale/pms/network-settings.dtd | 2 +- src/chrome/locale/ps/network-settings.dtd | 2 +- src/chrome/locale/pt-BR/network-settings.dtd | 36 ++++----- src/chrome/locale/pt-BR/torlauncher.properties | 4 +- src/chrome/locale/pt/network-settings.dtd | 2 +- src/chrome/locale/ro/network-settings.dtd | 2 +- src/chrome/locale/ru/network-settings.dtd | 2 +- src/chrome/locale/ru(a)petr1708/network-settings.dtd | 2 +- src/chrome/locale/sco/network-settings.dtd | 2 +- src/chrome/locale/si-LK/network-settings.dtd | 2 +- src/chrome/locale/sk-SK/network-settings.dtd | 2 +- src/chrome/locale/sk/network-settings.dtd | 2 +- src/chrome/locale/sl-SI/network-settings.dtd | 2 +- src/chrome/locale/sl/network-settings.dtd | 2 +- src/chrome/locale/sn/network-settings.dtd | 2 +- src/chrome/locale/so/network-settings.dtd | 2 +- src/chrome/locale/son/network-settings.dtd | 2 +- src/chrome/locale/sq/network-settings.dtd | 2 +- src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 2 +- src/chrome/locale/st/network-settings.dtd | 2 +- src/chrome/locale/su/network-settings.dtd | 2 +- src/chrome/locale/sv/network-settings.dtd | 36 ++++----- src/chrome/locale/sv/torlauncher.properties | 4 +- src/chrome/locale/sw/network-settings.dtd | 2 +- src/chrome/locale/szl/network-settings.dtd | 2 +- src/chrome/locale/ta/network-settings.dtd | 2 +- src/chrome/locale/te-IN/network-settings.dtd | 2 +- src/chrome/locale/te/network-settings.dtd | 2 +- src/chrome/locale/tg/network-settings.dtd | 2 +- src/chrome/locale/th/network-settings.dtd | 2 +- src/chrome/locale/ti/network-settings.dtd | 2 +- src/chrome/locale/tk/network-settings.dtd | 2 +- src/chrome/locale/tr/network-settings.dtd | 40 +++++----- src/chrome/locale/tr/torlauncher.properties | 8 +- src/chrome/locale/uk/network-settings.dtd | 2 +- src/chrome/locale/ur-PK/network-settings.dtd | 2 +- src/chrome/locale/ur/network-settings.dtd | 2 +- src/chrome/locale/uz/network-settings.dtd | 2 +- src/chrome/locale/ve/network-settings.dtd | 2 +- src/chrome/locale/vi/network-settings.dtd | 2 +- src/chrome/locale/wa/network-settings.dtd | 2 +- src/chrome/locale/wo/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 36 ++++----- src/chrome/locale/zh-CN/torlauncher.properties | 4 +- src/chrome/locale/zh-HK/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/network-settings.dtd | 2 +- src/chrome/locale/zu/network-settings.dtd | 2 +- src/install.rdf | 2 +- 164 files changed, 623 insertions(+), 623 deletions(-) diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index e953e63..244b2c4 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index 4d9c2f1..ac63286 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "አገናኝ"> diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 86e64fb..6c13156 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "تكوين"> <!ENTITY torSettings.connect "اتصل"> diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 4d99e28..dc4ce8c 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Quraşdır"> <!ENTITY torSettings.connect "Qoşul"> diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index 258e915..a691503 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Наладзіць"> <!ENTITY torSettings.connect "Злучэнне"> diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 929acfe..9887b54 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Настройки на Tor мрежата"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Свързване с Tor"> +<!ENTITY torsettings.wizard.title.configure "Настройки на Tor мрежата"> +<!ENTITY torsettings.wizard.title.connecting "Осъществяване на Тор връзка">  <!ENTITY torlauncher.localePicker.title "Език на Tor браузъра"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Натиснете "Свързване", за да се свържете с Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connect "Свържи се"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Аз използвам прокси за достъп до интернет"> <!ENTITY torsettings.useProxy.type "Прокси Тип:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "Изберете вида на проксито"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Този компютър се свързва през firewall,който позволява връзки само към определени портове."> <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран в моята страна"> +<!ENTITY torsettings.useBridges.default "Избор на вграден бридж"> +<!ENTITY torsettings.useBridges.default.placeholder "изберете бридж"> +<!ENTITY torsettings.useBridges.custom "Задавне на бридж сега"> +<!ENTITY torsettings.useBridges.label "Въведете информация за бриджа от източник, на който вярвате."> +<!ENTITY torsettings.useBridges.placeholder "напишете адрес:порт (по един на ред)"> <!ENTITY torsettings.copyLog "Копирай Tor лога в клипборда"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Прокси помощ"> +<!ENTITY torsettings.proxyHelp1 "Локално прокси е нужно, когато се свързвате през мрежата на компания, училище или университет. Ако не сте сигурни как да отговорите на този въпрос, вижте интернет настройките на друг браузър или разгледайте системните мрежови настройки, за да видите дали се нуждаете от прокси."> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay помощ"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Бриджовете са не публикуване релеи, които правят блокирването на връзката до Tor мрежата много по-трудно. Всеки тип бридж използва различен метод да заообиколи цензурата. Тези, използващи obfs маскират интернет трафика като произволен шум, базираните на meek маскират трафика да излглежда, че се свързва с услугата, а не с Tor."> +<!ENTITY torsettings.bridgeHelp2 "Поради методите, които определени държави използват, за да блокират Tor, някои бриджове работят в определени държаи, но не и в други. Ако не сте сигурни кои бриджове работят във Вашата държа, посетете torproject.org/about/contact.html#support.">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 240154c..e9b06bc 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -1,58 +1,58 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.default "টর সাথে সংযোগ স্থাপন করুন"> +<!ENTITY torsettings.wizard.title.configure "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.connecting "একটি সংযোগ স্থাপন">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "টর ব্রাউজার ভাষা"> +<!ENTITY torlauncher.localePicker.prompt "দয়া করে একটি ভাষা নির্বাচন করুন">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connectPrompt "টর সাথে সংযোগ করতে "সংযোগ করুন" ক্লিক করুন"> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configure "কনফিগার করুন"> +<!ENTITY torSettings.connect "সংযোগ করা">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "টর শুরু করার জন্য অপেক্ষা করছে ..."> +<!ENTITY torsettings.restartTor "টর্চ পুনরায় চালু করুন"> +<!ENTITY torsettings.reconfigTor "পুনরায় কনফিগার করুন"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "আপনি টর ব্রিজগুলি কনফিগার করেছেন বা আপনি স্থানীয় প্রক্সি সেটিংস এ প্রবেশ করেছেন।  টর নেটওয়ার্কের সাথে সরাসরি সংযোগ স্থাপনের জন্য, এই সেটিংস মুছে ফেলা আবশ্যক।"> +<!ENTITY torsettings.discardSettings.proceed "সেটিংস সরান এবং সংযুক্ত করুন"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "ঐচ্ছিক"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি"> +<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:"> +<!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন"> +<!ENTITY torsettings.useProxy.address "ঠিকানা:"> +<!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম"> +<!ENTITY torsettings.useProxy.port "পোর্টঃ"> +<!ENTITY torsettings.useProxy.username "ব্যবহারকারীর নাম:"> +<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.firewall.checkbox "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়"> +<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:"> +<!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> +<!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> +<!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> +<!ENTITY torsettings.useBridges.custom "একটি ব্রিজ প্রদান আমি জানি"> +<!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।"> +<!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.copyLog "ক্লিপবোর্ডে কপি টর লগ করুন"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "প্রক্সি সাহায্য"> +<!ENTITY torsettings.proxyHelp1 "একটি কোম্পানী, স্কুল বা বিশ্ববিদ্যালয় নেটওয়ার্কের মাধ্যমে সংযোগ স্থাপন করার সময় একটি স্থানীয় প্রক্সি প্রয়োজন। আপনি   যদি এই প্রশ্নটির উত্তর দিতে না পারেন তবে অন্য ব্রাউজারের ইন্টারনেট সেটিংস দেখুন বা আপনার প্রক্সিটির প্রয়োজন কিনা তা দেখতে আপনার সিস্টেমের নেটওয়ার্ক সেটিংস পরীক্ষা করুন।"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "ব্রিজ রিলে সহায়তা"> +<!ENTITY torsettings.bridgeHelp1 "ব্রিজগুলি তালিকাভুক্ত নয় এমন রিলে যা টর নেটওয়ার্ক সংযোগ বন্ধ করে আরও কঠিন করে তোলে।   সেন্সরশিপ এড়ানোর জন্য প্রতিটি ধরনের সেতু একটি ভিন্ন পদ্ধতি ব্যবহার করে।   Obfs আপনার ট্র্যাফিক র্যান্ডম শব্দ মত চেহারা, এবং নিছক টাওয়ার ট্র্যাফিক চেহারা মত এটি টর পরিবর্তে যে পরিষেবা সংযোগ করা হয়।"> +<!ENTITY torsettings.bridgeHelp2 "কিছু দেশ টোরকে বাধা দেওয়ার চেষ্টা করে কেন, কিছু কিছু ব্রিজ নির্দিষ্ট দেশে কাজ করে কিন্তু অন্যদের নয়।   আপনার দেশে কোন ব্রিজগুলি কাজ করে তা যদি আপনি অনিশ্চিত থাকেন, তাহলে torproject.org/about/contact.html#support দেখুন">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন। এই কয়েক মিনিট সময় নিতে পারে."> diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index b09753e..ad73a28 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -1,64 +1,64 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=টর লঞ্চার -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=টর্চ প্রারম্ভকালে exited। এটি আপনার torrc ফাইলের ত্রুটির কারণে, টর বা আপনার সিস্টেমে অন্য প্রোগ্রামের একটি বাগ বা ত্রুটির হার্ডওয়্যারগুলির কারণে হতে পারে। যতক্ষন না আপনি অন্তর্নিহিত সমস্যাটি সমাধান করেন এবং টর পুনরায় চালু করুন, টর ব্রাউজারটি শুরু হবে না। torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=টর রিস্টার্ট করলে আপনার ব্রাউজার ট্যাব বন্ধ হবে না। torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=টর্চ নিয়ন্ত্রণ নিতে ব্যর্থ হয়েছে torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ (%2$S)। -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=টর শুরু করতে অক্ষম %S +torlauncher.tor_missing=টর্ক এক্সিকিউটেবল মিস করা হয়। +torlauncher.torrc_missing=Torrc ফাইলটি অনুপস্থিত এবং তৈরি করা যায়নি। +torlauncher.datadir_missing=টর ডেটা ডিরেক্টরিটি বিদ্যমান নয় এবং তৈরি করা যাবে না। +torlauncher.password_hash_missing=হ্যাশড পাসওয়ার্ড পেতে ব্যর্থ। -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=টর সেটিংস পুনরুদ্ধার করতে অক্ষম। %S +torlauncher.failed_to_save_settings=টর সেটিংস সংরক্ষণ করতে অক্ষম %S +torlauncher.ensure_tor_is_running=টর চলছে তা নিশ্চিত করুন। -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=আপনি ইন্টারনেট অ্যাক্সেস করার জন্য প্রক্সি ব্যবহার করার জন্য টরকে কনফিগার করার জন্য অবশ্যই একটি IP ঠিকানা বা হোস্টনাম এবং একটি পোর্ট নম্বর উল্লেখ করতে হবে। +torlauncher.error_proxy_type_missing=আপনাকে প্রক্সি টাইপ নির্বাচন করতে হবে। +torlauncher.error_bridges_missing=আপনাকে অবশ্যই এক বা একাধিক ব্রিজগুলি নির্দিষ্ট করতে হবে। +torlauncher.error_default_bridges_type_missing=সরবরাহকৃত ব্রিজের জন্য আপনাকে অবশ্যই একটি পরিবহন প্রকার নির্বাচন করতে হবে। +torlauncher.error_bridge_bad_default_type=কোনও ব্রিজ নেই যেটি ট্রান্সপোর্ট টাইপ% S আছে। আপনার সেটিংস সামঞ্জস্য করুন দয়া করে। -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(চীন মধ্যে কাজ করে) +torlauncher.bridge_suffix.meek-azure=(চীন মধ্যে কাজ করে) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.connect=সংযোগ করা +torlauncher.restart_tor=টর্চ পুনরায় চালু করুন +torlauncher.quit=অব্যাহতিপ্রাপ্ত +torlauncher.quit_win=বাহির +torlauncher.done=সম্পন্ন -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=সহায়তার জন্য, যোগাযোগ করুন %S +torlauncher.forAssistance2=সহায়তার জন্য, %S এ যান -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত। -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.conn_dir=একটি রিলে ডিরেক্টরি সাথে সংযোগ স্থাপন torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.requesting_status=নেটওয়ার্ক স্থিতি পুনরুদ্ধার +torlauncher.bootstrapStatus.loading_status=নেটওয়ার্ক স্থিতি লোড হচ্ছে +torlauncher.bootstrapStatus.loading_keys=কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে +torlauncher.bootstrapStatus.requesting_descriptors=রিলে তথ্য অনুরোধ +torlauncher.bootstrapStatus.loading_descriptors=রিলে তথ্য লোড হচ্ছে +torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কে সংযুক্ত হচ্ছে +torlauncher.bootstrapStatus.handshake_or=একটি টর্ক সার্কিট স্থাপন +torlauncher.bootstrapStatus.done=টর নেটওয়ার্ক সংযুক্ত! -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=সম্পন্ন +torlauncher.bootstrapWarning.connectrefused=সংযোগ প্রত্যাখ্যাত +torlauncher.bootstrapWarning.misc=বিবিধ +torlauncher.bootstrapWarning.resourcelimit=অপর্যাপ্ত সম্পদ +torlauncher.bootstrapWarning.identity=পরিচয় মেলেনি +torlauncher.bootstrapWarning.timeout=আউট সংযোগ সময় +torlauncher.bootstrapWarning.noroute=কোন রুট হোস্ট করার জন্য +torlauncher.bootstrapWarning.ioerror=পড়া / লিখুন ত্রুটি +torlauncher.bootstrapWarning.pt_missing=অনুপস্থিত প্ল্যাগেবল পরিবহন diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 2988f47..da2abde 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "সংযোগ করুন"> diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index f542b8c..ac6e347 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 65e8947..cf44305 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuració de la xarxa Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Connectar a Tor"> +<!ENTITY torsettings.wizard.title.configure "Configuració de la xarxa Tor"> +<!ENTITY torsettings.wizard.title.connecting "S'està establint connexió">  <!ENTITY torlauncher.localePicker.title "Llengua del navegador Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Feu clic a "Connectar" per a connectar a Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connect "Conecta't"> @@ -26,9 +26,9 @@ <!ENTITY torsettings.optional "Opcional "> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Jo utilitzo un proxy per a accedir a Internet"> <!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "seleccioneu un tipus de proxy"> <!ENTITY torsettings.useProxy.address "Adreça:"> <!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -39,21 +39,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor està censurat al meu país"> +<!ENTITY torsettings.useBridges.default "Seleccioneu un pont predefinit"> +<!ENTITY torsettings.useBridges.default.placeholder "seleccioneu un pont"> +<!ENTITY torsettings.useBridges.custom "Proveir un pont conegut"> +<!ENTITY torsettings.useBridges.label "Insertar informació d'un pont d'una font fiable"> +<!ENTITY torsettings.useBridges.placeholder "introduiu adreça:port (un per línia)"> <!ENTITY torsettings.copyLog "Copia el registre de Tor al porta-retalls"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Ajuda del proxy"> +<!ENTITY torsettings.proxyHelp1 "Un proxy local es necessari quan us connecteu mitjançant la xarxa d'una companyia, escola o universitat. Si no sabeu com respondre aquesta pregunta, mireu les preferències d'internet d'un altre navegador o reviseu la configuració de xarxa del vostre sistema per veure si cal un servidor intermediari local. "> <!ENTITY torsettings.bridgeHelpTitle "Ajuda per als repetidors de pont"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Els ponts son repetidors no llistats que fan més dificultós el bloqueig de connexions a la xarxa Tor.  Cada tipus de pont usa un diferent mètode per a evitar la censura.  Els tipus OBFS fan passar el seu tràfic com a soroll aleatori, mentre que els meek fan que el seu trafic parega que es connecta a un altre servici diferent a Tor."> +<!ENTITY torsettings.bridgeHelp2 "Depenent de com el països intenten bloquejar Tor, alguns ponts poden funcionar correctament en certs països però no en altres.  Si no esteu segurs de quins ponts funcionen al vostre país, visiteu torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 6a35ee5..23ca2a9 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Has d'especificar un o mes repetidors. torlauncher.error_default_bridges_type_missing=Heu de seleccionar un tipus de transport per als ponts subministrats. torlauncher.error_bridge_bad_default_type=No hi ha ponts subministrats que tinguin el tipus de transport %S disponible. Si us plau canvieu la configuració. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funciona a la Xina) +torlauncher.bridge_suffix.meek-azure=(funciona a la Xina) torlauncher.connect=Conectar torlauncher.restart_tor=Reinicia Tor diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 9ed2a46..0b749ff 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Síťové nastavení TORu"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Připojit k Toru"> +<!ENTITY torsettings.wizard.title.configure "Nastavení sítě Tor"> +<!ENTITY torsettings.wizard.title.connecting "Sestavuji spojení">  <!ENTITY torlauncher.localePicker.title "Jazyk Tor Prohlížeče"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Klikněte na „Připojit“ pro připojení k Toru."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connect "Připojit"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Volitelný"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Používám proxy pro připojení k Internetu"> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor je v mé zemi cenzurován"> +<!ENTITY torsettings.useBridges.default "Vyberte vestavěný most"> +<!ENTITY torsettings.useBridges.default.placeholder "vyberte most"> +<!ENTITY torsettings.useBridges.custom "Znám poskytovatele mostu"> +<!ENTITY torsettings.useBridges.label "Zadejte informace o mostu z důvěryhodného zdroje."> +<!ENTITY torsettings.useBridges.placeholder "napište adresa:post (jedna položka na řádek)"> <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Nápověda k proxy"> +<!ENTITY torsettings.proxyHelp1 "Při připojování přes firemní, školní nebo univerzitní síť je třeba místní proxy. Pokud si nejste jisti jak odpovědět na tuto otázku, podívejte se na Internetová nastavení v jiném prohlížeči nebo na systémová nastavení sítě, kde uvidíte, zda je potřeba proxy."> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Mosty jsou nezveřejněné prvky, které dělají blokování připojení k síti Tor obtížnější.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru."> +<!ENTITY torsettings.bridgeHelp2 "Protože se každá země snaží zablokovat Tor jinak, některé typy mostů fungují pouze v některých zemích.  Pokud si nejste jisti typy mostů, které fungují ve vaší zemi, navštivte torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Počkejte prosím, než vytvoříme spojení do sítě Tor.  Může to trvat několik minut."> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 78b8217..138a841 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Musíte specifikovat jeden nebo více mostů. torlauncher.error_default_bridges_type_missing=Pro zadané bridge musíte zadat typ transportu. torlauncher.error_bridge_bad_default_type=Nejsou zadané žádné bridge, které by měly ty transportu %S. Změňte prosím nastavení. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funguje v Číně) +torlauncher.bridge_suffix.meek-azure=(funguje v Číně) torlauncher.connect=Připojit torlauncher.restart_tor=Restartovat Tor diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index a9dfcdf..527c9f5 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Çыхăнтар"> diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index ccabb74..a3ef262 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Ffurfweddu"> <!ENTITY torSettings.connect "Cysylltu"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 6ca365b..689af5c 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Opret forbindelse til Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor netværksindstillinger"> +<!ENTITY torsettings.wizard.title.connecting "Etablerer en forbindelse">  <!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Klik på “Opret forbindelse” for at oprette forbindelse til Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Indstil"> <!ENTITY torSettings.connect "Tilslut"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Valgfri"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet"> <!ENTITY torsettings.useProxy.type "Proxy type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> +<!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> +<!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> +<!ENTITY torsettings.useBridges.custom "Formidl en bro jeg kender"> +<!ENTITY torsettings.useBridges.label "Indtast broinformation fra en betroet kilde."> +<!ENTITY torsettings.useBridges.placeholder "skriv adresse:port (én pr. linje)"> <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> +<!ENTITY torsettings.proxyHelp1 "Det er nødvendigt med en lokal proxy når der oprettes forbindelse gennem et firma-, skole- eller universitetsnetværk. Hvis du i tvivl om hvordan du skal svarer på sprøgsmålet, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger, for at se om det er nødvendigt med en proxy."> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor."> +<!ENTITY torsettings.bridgeHelp2 "Pga. den måde bestemte lande prøver at blokere Tor, vil bestemte broer virke i nogle lande men ikke andre.  Besøg torproject.org/about/contact.html#support hvis du er i tvivl om hvilke broer der virker i dit land.">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vent venligst mens der etableres forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index f0ae6c1..b839fc1 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(virker i kina) +torlauncher.bridge_suffix.meek-azure=(virker i kina) torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 534b17d..38d62ed 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor-Netzwerkeinstellungen"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Mit Tor verbinden"> +<!ENTITY torsettings.wizard.title.configure "Tor-Netzwerkeinstellungen"> +<!ENTITY torsettings.wizard.title.connecting "Eine Verbindung herstellen">  <!ENTITY torlauncher.localePicker.title "Tor-Browser-Sprache"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Klicken Sie auf "Verbinden", um eine Verbindung zu Tor herzustellen."> +<!ENTITY torSettings.configurePrompt "Klicken Sie auf "Konfigurieren", um die Netzwerkeinstellungen anzupassen, wenn Sie sich in einem Land befinden, das Tor blockiert (z.B. Ägypten, China, Türkei) oder wenn Sie sich von einem privaten Netzwerk aus verbinden, das einen Proxy benötigt."> <!ENTITY torSettings.configure "Konfigurieren"> <!ENTITY torSettings.connect "Verbinden"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Ich benutze einen Proxy, um mich mit dem Internet zu verbinden"> <!ENTITY torsettings.useProxy.type "Proxy-Typ:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "Proxy-Typ auswählen"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-Adresse oder Rechnername"> <!ENTITY torsettings.useProxy.port "Anschluss:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte Anschlüsse zulässt"> <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert."> +<!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> +<!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> +<!ENTITY torsettings.useBridges.custom "Biete mir eine Brücke an, die ich kenne"> +<!ENTITY torsettings.useBridges.label "Geben Sie Brückeninformationen aus einer vertrauenswürdigen Quelle ein."> +<!ENTITY torsettings.useBridges.placeholder "Tippen Sie Adresse:Port (eines pro Zeile)"> <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Proxy-Hilfe"> +<!ENTITY torsettings.proxyHelp1 "Ein lokaler Proxy wird verwendet, wenn Sie sich aus einem Unternehmens-, Schul- oder Universitätsnetzwerk heraus verbinden. Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, sehen Sie sich die Interneteinstellungen in einem anderen Browser an oder überprüfen Sie die Netzwerkeinstellungen des Systems um zu bestimmen, ob sie einen lokalen Proxyserver benötigen."> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor."> +<!ENTITY torsettings.bridgeHelp2 "Aufgrund der Tatsache, dass bestimmte Länder versuchen, Tor zu blockieren, funktionieren bestimmte Brücken in bestimmten Ländern, aber nicht in anderen.  Wenn Sie sich nicht sicher sind, welche Brücken in Ihrem Land funktionieren, besuchen Sie torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index c198101..9b863d5 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Sie müssen eine oder mehrere Brücken eingebe torlauncher.error_default_bridges_type_missing=Sie müssen eine Transporttyp für die bereitgestellten Brücken auswählen. torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten Brücken verfügbar, die den Transporttyp %S haben. Bitte passen Sie Ihre Einstellungen an. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funktioniert in China) +torlauncher.bridge_suffix.meek-azure=(funktioniert in China) torlauncher.connect=Verbinden torlauncher.restart_tor=Tor neustarten diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index f089eae..5d69b11 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connect "Σύνδεση"> diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 6030497..d3f0bd4 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Konekti"> diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 5cb2dda..d1138d1 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 0ead399..f97ab3b 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index 2aa5251..4b69b66 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 4128c81..fabb6b3 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 143ac6c..a9850f7 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuración de la red Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Conectar a Tor"> +<!ENTITY torsettings.wizard.title.configure "Configuración de la red Tor"> +<!ENTITY torsettings.wizard.title.connecting "Estableciendo una conexión.">  <!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Pincha en "Connect" para conectar con Tor"> +<!ENTITY torSettings.configurePrompt "Pulse "Configurar" para ajustar la configuración de red si está en un país que censura Tor (como Egipto, China, Turquía) o si está conectando desde una red privada que requiere un proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Utilizo un proxy para conectar a Internet."> <!ENTITY torsettings.useProxy.type "Tipo de proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "seleccionar un tipo de proxy"> <!ENTITY torsettings.useProxy.address "Dirección:"> <!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de máquina (host)"> <!ENTITY torsettings.useProxy.port "Puerto:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos(firewall) que sólo permite conexiones a ciertos puertos"> <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "En mi país se censura a Tor"> +<!ENTITY torsettings.useBridges.default "Seleccionar un puente construido"> +<!ENTITY torsettings.useBridges.default.placeholder "seleccionar un puente"> +<!ENTITY torsettings.useBridges.custom "Proporcionar un puente que conozco"> +<!ENTITY torsettings.useBridges.label "Ingresa la información del puente desde una fuente confiable."> +<!ENTITY torsettings.useBridges.placeholder "escribe dirección:puerto (uno por línea)"> <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Ayuda "> +<!ENTITY torsettings.proxyHelp1 "Se necesita un proxy local cuando se conecta a través de una red de empresa, escuela o universidad. Si no estás seguro de cómo responder a esta pregunta, consulta la configuración de Internet en otro navegador o consulta la configuración de red de tu sistema para ver si se necesita un proxy."> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Los puentes son transmisores no listados que dificultan el bloqueo de las conexiones a la red Tor&#160. Cada tipo de puente utiliza un método diferente para evitar la censura&#160. Los obfs hacen que tu tráfico parezca ruido aleatorio, y los modestos hacen que tu tráfico parezca que se está conectando a ese servicio en lugar de a Tor."> +<!ENTITY torsettings.bridgeHelp2 "Debido a la forma en que ciertos países intentan bloquear a Tor, ciertos puentes funcionan en algunos países pero no en otros. Si no estás segura de qué puentes funcionan en tu país, visita torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Espera mientras establecemos una conexión a la red To.&#160r. Esto puede durar varios minutos."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 085285c..865afb7 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges' torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados. torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funciona en China) +torlauncher.bridge_suffix.meek-azure=(funciona en China) torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar Tor diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index 4559d19..bba3761 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Häälesta"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 886d888..8af929e 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connect "Konektatu"> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 3f189a3..f2e3d2b 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connect "اتصال"> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index deaba69..617e245 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Määritä"> <!ENTITY torSettings.connect "Yhdistä"> diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index bade2fe..d40c98b 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Makipag-ugnay"> diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 063e803..570917a 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Paramètres du réseau Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Se connecter à Tor"> +<!ENTITY torsettings.wizard.title.configure "Paramètres du réseau Tor"> +<!ENTITY torsettings.wizard.title.connecting "Établissement d’une connexion">  <!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Cliquez sur « Se connecter » pour vous connecter à Tor."> +<!ENTITY torSettings.configurePrompt "Cliquez sur « Configurer » pour ajuster les paramètres du réseau si vous êtes dans un pays qui censure Tor (tel que la Chine, l’Iran, la Turquie) ou si vous vous connectez d’un réseau privé qui exige un mandataire."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connect "Se connecter"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Facultatif"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "J’utilise un mandataire pour accéder à Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "sélectionner un type de mandataire"> <!ENTITY torsettings.useProxy.address "Adresse :"> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> <!ENTITY torsettings.useProxy.port "Port :"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays"> +<!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> +<!ENTITY torsettings.useBridges.default.placeholder "sélectionner un pont"> +<!ENTITY torsettings.useBridges.custom "Fournir un pont que je connais"> +<!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable"> +<!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)"> <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Aide sur les mandataires"> +<!ENTITY torsettings.proxyHelp1 "Un mandataire local est requis lors d’une connexion par un réseau d’entreprise, d’école ou d’université. Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un mandataire est requis."> <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Les ponts sont des relais non référencés qui rendent les connexions au Tor réseau plus difficile à bloquer.  Chaque type de pont utilise un moyen différent pour éviter la censure.  Avec les ponts obfs, votre trafic ressemble à du bruit aléatoire et avec les ponts meek, il semble que votre trafic se connecte à ce service plutôt qu’à Tor."> +<!ENTITY torsettings.bridgeHelp2 "Dans la mesure où certains pays essaient de bloquer Tor, certains ponts fonctionnent dans certains pays, mais pas dans d’autres.  Si vous ne savez pas quels ponts fonctionnent dans votre pays, visitez torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index 9d60972..00d886a 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez choisir un type de transport pour les ponts fournis. torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(fonctionne en Chine) +torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine) torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 6a7c2ca..f8347d0 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Paramètres du réseau Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Se connecter à Tor"> +<!ENTITY torsettings.wizard.title.configure "Paramètres du réseau Tor"> +<!ENTITY torsettings.wizard.title.connecting "Établissement d’une connexion">  <!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Cliquez sur « Se connecter » pour vous connecter à Tor."> +<!ENTITY torSettings.configurePrompt "Cliquez sur « Configurer » pour ajuster les paramètres du réseau si vous êtes dans un pays qui censure Tor (tel que la Chine, l’Iran, la Turquie) ou si vous vous connectez d’un réseau privé qui exige un mandataire."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connect "Se connecter"> @@ -20,14 +20,14 @@ <!ENTITY torsettings.restartTor "Redémarrer Tor"> <!ENTITY torsettings.reconfigTor "Reconfigurer"> -<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor (Bridges) ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés."> +<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés."> <!ENTITY torsettings.discardSettings.proceed "Supprimer les paramètres et se connecter"> <!ENTITY torsettings.optional "Facultatif"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "J’utilise un mandataire pour accéder à Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "sélectionner un type de mandataire"> <!ENTITY torsettings.useProxy.address "Adresse :"> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> <!ENTITY torsettings.useProxy.port "Port :"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays"> +<!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> +<!ENTITY torsettings.useBridges.default.placeholder "sélectionner un pont"> +<!ENTITY torsettings.useBridges.custom "Fournir un pont que je connais"> +<!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable"> +<!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)"> <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Aide sur les mandataires"> +<!ENTITY torsettings.proxyHelp1 "Un mandataire local est requis lors d’une connexion par un réseau d’entreprise, d’école ou d’université. Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un mandataire est requis."> -<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts ((Bridges Relays)"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> +<!ENTITY torsettings.bridgeHelp1 "Les ponts sont des relais non référencés qui rendent les connexions au Tor réseau plus difficile à bloquer.  Chaque type de pont utilise un moyen différent pour éviter la censure.  Avec les ponts obfs, votre trafic ressemble à du bruit aléatoire et avec les ponts meek, il semble que votre trafic se connecte à ce service plutôt qu’à Tor."> +<!ENTITY torsettings.bridgeHelp2 "Dans la mesure où certains pays essaient de bloquer Tor, certains ponts fonctionnent dans certains pays, mais pas dans d’autres.  Si vous ne savez pas quels ponts fonctionnent dans votre pays, visitez torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 7754ca3..066dd15 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -24,12 +24,12 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. -torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts (Bridges). -torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts (Bridges) fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. +torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. +torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(fonctionne en Chine) +torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine) torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index e89bea9..8d30037 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index f9a2a91..63ac611 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Socruithe Líonra Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Ceangail le Tor"> +<!ENTITY torsettings.wizard.title.configure "Socruithe Líonra Tor"> +<!ENTITY torsettings.wizard.title.connecting "Ceangal á bhunú">  <!ENTITY torlauncher.localePicker.title "Teanga Bhrabhsálaí Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Cliceáil “Ceangail” chun ceangal a bhunú le Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Cumraigh"> <!ENTITY torSettings.connect "Ceangail"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Roghnach"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Úsáidim seachfhreastalaí chun ceangal leis an Idirlíon"> <!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "roghnaigh cineál an tseachfhreastalaí"> <!ENTITY torsettings.useProxy.address "Seoladh:"> <!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe"> <!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> +<!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> +<!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> +<!ENTITY torsettings.useBridges.custom "Úsáid droichead ar m'eolas"> +<!ENTITY torsettings.useBridges.label "Cuir isteach eolas faoi dhroichead ó fhoinse iontaofa."> +<!ENTITY torsettings.useBridges.placeholder "clóscríobh seoladh:port (ceann amháin ar gach líne)"> <!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Cabhair le Seachfhreastalaithe"> +<!ENTITY torsettings.proxyHelp1 "Úsáidtear seachfhreastalaí áitiúil nuair a cheanglaítear ó líonra i gcomhlacht, i scoil, nó in ollscoil. Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais, le fáil amach an bhfuil seachfhreastalaí de dhíth."> <!ENTITY torsettings.bridgeHelpTitle "Cabhair le Droichid"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Tá sé níos deacra cosc a chur ar cheangail le Líonra Tor nuair a úsáideann tú droichead, cineál athsheachadán neamhliostaithe. Úsáideann gach droichead modh difriúil leis an gcinsireacht a sheachaint. Mar shampla, cuireann na droichid obfs cuma randamach ar do thrácht líonra, agus leis na cinn meek, dealraíonn sé go bhfuil tú ag ceangal leis an tseirbhís sin seachas le Tor."> +<!ENTITY torsettings.bridgeHelp2 "Mar gheall ar an tslí a gcuireann tíortha áirithe cosc ar Tor, feidhmíonn droichid áirithe i dtíortha áirithe ach ní fheidhmíonn siad i dtíortha eile.&160;Mura bhfuil tú cinnte faoi na droichid a fheidhmeoidh i do thírse, tabhair cuairt ar torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Fan tamall agus ceangal le líonra Tor á bhunú.  Seans go dtógfaidh seo cúpla nóiméad."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index cccb746..9c9a313 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(oibríonn sé sa tSín) +torlauncher.bridge_suffix.meek-azure=(oibríonn sé sa tSín) torlauncher.connect=Ceangail torlauncher.restart_tor=Atosaigh Tor diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index 46c5c63..d8e8ba8 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index ee4dc05..410b036 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 24f3411..a40576c 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "הגדרות רשת Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "התחבר אל Tor"> +<!ENTITY torsettings.wizard.title.configure "הגדרות רשת Tor"> +<!ENTITY torsettings.wizard.title.connecting "מקים חיבור">  <!ENTITY torlauncher.localePicker.title "שפת דפדפן Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "לחץ על “התחבר“ כדי להתחבר אל Tor."> +<!ENTITY torSettings.configurePrompt "לחץ על “הגדר“ כדי להתאים הגדרות רשת אם אתה במדינה שמצנזרת את Tor (למשל מצרים, סין וטורקיה) או אם אתה מתחבר מרשת פרטית הדורשת ייפוי-כוח."> <!ENTITY torSettings.configure "הגדר"> <!ENTITY torSettings.connect "התחבר"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "רשותי"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "אני משתמש בייפוי-כוח כדי להתחבר לאינטרנט"> <!ENTITY torsettings.useProxy.type "סוג ייפוי-כוח:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "בחר סוג ייפוי-כוח"> <!ENTITY torsettings.useProxy.address "כתובת:"> <!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח"> <!ENTITY torsettings.useProxy.port "פתחה:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש המתירה חיבורים רק אל פתחות מסוימות"> <!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> +<!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> +<!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> +<!ENTITY torsettings.useBridges.custom "סַפֵּק גשר שאני מכיר"> +<!ENTITY torsettings.useBridges.label "הכנס מידע גשר ממקור מהימן."> +<!ENTITY torsettings.useBridges.placeholder "הכנס כתובת:פתחה (אחד לשורה)"> <!ENTITY torsettings.copyLog "העתק את יומן Tor ללוח החיתוך"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "עזרת ייפוי-כוח"> +<!ENTITY torsettings.proxyHelp1 "ייפוי-כוח מקומי נדרש בעת התחברות דרך רשת של חברה, בית-ספר או אוניברסיטה. אם אינך בטוח כיצד לענות על שאלה זו, הבט בהגדרות האינטרנט בדפדפן אחר או בדוק בהגדרות הרשת של מערכתך כדי לראות האם ייפוי-כוח מקומי נחוץ."> <!ENTITY torsettings.bridgeHelpTitle "עזרת ממסרי גשר"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "גשרים הם ממסרים לא ברשימה אשר מקשים לחסום חיבורים אל רשת Tor.  כל סוג של גשר משתמש בשיטה שונה כדי למנוע צינזור  ה-obfs גורם לתעבורה שלך להיראות כרעש אקראי, וה-meek גורם לתעבורה שלך להיראות כאילו היא מתחברת אל שירות זה במקום אל Tor."> +<!ENTITY torsettings.bridgeHelp2 "מפאת כיצד מדינות מסוימות מנסות לחסום את Tor, גשרים מסוימים עובדים במדינות מסוימות אבל לא באחרות.  אם אינך בטוח לגבי אילו גשרים עובדים במדינתך, בקר ב-torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "אנא המתן בזמן שאנחנו מקימים חיבור אל רשת Tor.  זה עשוי לקחת מספר דקות."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 7345a79..0ca3edd 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(עובד בסין) +torlauncher.bridge_suffix.meek-azure=(עובד בסין) torlauncher.connect=התחבר torlauncher.restart_tor=הפעל מחדש את Tor diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 48ffa46..837edf6 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "जोड़ें"> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 4a0151d..fcb2daf 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connect "Spoji"> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index be04620..1fd8f67 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguriraj"> <!ENTITY torSettings.connect "Poveži se"> diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 7a54757..2f5b1bb 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor hálózati beállítások"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Csatalkozás a Tor-hoz"> +<!ENTITY torsettings.wizard.title.configure "Tor hálózati beállítások"> +<!ENTITY torsettings.wizard.title.connecting "Kapcsolat létrehozása">  <!ENTITY torlauncher.localePicker.title "Tor Browser nyelv"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Kattintson a "Csatlakozásra" hogy csatlakozzon a Tor-hoz."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Beállít"> <!ENTITY torSettings.connect "Csatlakozás"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Opcionális"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Proxy-t használok az Internetre való kapcsolódáshoz"> <!ENTITY torsettings.useProxy.type "Proxy Típus:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder " válaszon ki egy proxy típust"> <!ENTITY torsettings.useProxy.address "Cím:"> <!ENTITY torsettings.useProxy.address.placeholder "IP cím vagy gépnév"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál ami csak adott portokon keresztül engedélyezi a kapcsolatotokat."> <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.checkbox "A Tor cenzúrázva van az országomban"> +<!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> +<!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "A Tor log Vágólapra másolása"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Proxy segítség"> +<!ENTITY torsettings.proxyHelp1 "Egy helyi proxy szükséges amennyiben olyan hálózaton keresztül csatlakozik amely, cégen, iskolán, vagy egyetemi hálózaton megy keresztül.  Ha nem biztos benne, hogyan válaszoljon erre a kérdésre, akkor nézze meg egy másik böngésző vagy a rendszer hálózati beállításait, hogy szükséges-e proxyt beállítani."> <!ENTITY torsettings.bridgeHelpTitle "Híd kapcsoló súgó"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index 711dbd0..3d675a0 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Meg kell adnia egy vagy több hidat. torlauncher.error_default_bridges_type_missing=Ki kell választanod egy átviteli típust a felkínált hidakhoz. torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az átviteli típusa %S elérhető lenne. Kérlek módosítsd a beállításaidat. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(működik Kínában) +torlauncher.bridge_suffix.meek-azure=(működik Kínában) torlauncher.connect=Csatlakozás torlauncher.restart_tor=Tor újraindítása diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index 2683a1e..7dc2636 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index f2b0bdf..c52833f 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connect "Sambung"> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index f630f85..a61e72a 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Stilla"> <!ENTITY torSettings.connect "Tengjast"> diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 3ad32ca..f4fe00d 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Impostazioni rete Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Connetti a Tor"> +<!ENTITY torsettings.wizard.title.configure "Impostazioni della rete Tor"> +<!ENTITY torsettings.wizard.title.connecting "Connessione in corso">  <!ENTITY torlauncher.localePicker.title "Lingua per il Tor Browser"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Clicca "Connetti" per connetterti a Tor"> +<!ENTITY torSettings.configurePrompt "Clicca "Configura" per regolare le impostazioni di rete se ti trovi in un Paese che censura Tor (come Egitto, Cina, Turchia) o se ti stai connettendo da una rete privata che richiede un proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connect "Connetti"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Facoltativo"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Uso un proxy per connettermi a internet"> <!ENTITY torsettings.useProxy.type "Tipo di proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "Seleziona un tipo di proxy"> <!ENTITY torsettings.useProxy.address "Indirizzo:"> <!ENTITY torsettings.useProxy.address.placeholder "Indirizzo IP oppure hostname"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese"> +<!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato"> +<!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge"> +<!ENTITY torsettings.useBridges.custom "Fornisci un bridge che conosco"> +<!ENTITY torsettings.useBridges.label "Inserisci le informazioni del bridge da una fonte fidata."> +<!ENTITY torsettings.useBridges.placeholder "digita indirizzo:porta (uno per riga)"> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Aiuto proxy"> +<!ENTITY torsettings.proxyHelp1 "Un proxy locale è necessario quando ti connetti dalla rete di un'azienda, scuola o università. Se non sei sicuro della risposta alla domanda, guarda le impostazioni internet in un altro browser o controlla le impostazioni di rete del sistema."> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "I bridge sono relay non elencati che rendono più difficile bloccare le connessioni alla rete Tor.  Ogni tipo di bridge usa un metodo diverso per evitare la censura.  Quelli obfs mascherano il tuo traffico come rumore casuale, quelli meek lo mascherano come se si connettesse a quel servizio al posto di Tor."> +<!ENTITY torsettings.bridgeHelp2 "A causa dei tentativi di blocco di Tor in alcuni Paesi, certi bridge funzionano in certi Paesi, ma non in altri.  Se non sei sicuro di quali bridge funzionino nel tuo Paese, visita torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Attendi mentre stabiliamo una connessione alla rete Tor.  Potrebbe richiedere qualche minuto."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index f0222af..25e2e33 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Devi specificare uno o più ponti. torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo di trasporto per il bridge preconfigurato. torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funziona in Cina) +torlauncher.bridge_suffix.meek-azure=(funziona in Cina) torlauncher.connect=Connetti torlauncher.restart_tor=Riavvia Tor diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 3bff26f..e2cd7d7 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "構成"> <!ENTITY torSettings.connect "接続"> diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index a2cde90..f9a3bb2 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "კონფიგურირება"> <!ENTITY torSettings.connect "დაკავშირება"> diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index fd4646d..5da268e 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "កំណត់រចនាសម្ព័ន្ធ"> <!ENTITY torSettings.connect "តភ្ជាប់"> diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index 46a2438..17a87ed 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index 68237c2..8e4b8df 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connect "연결"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 8dca12c..9310734 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connect "연결"> diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index 2e64ffa..7463f76 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Байланышуу "> diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index ac57dd6..6254877 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index 6d77fcd..a882f4e 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "ກຳນົດຄ່າ"> <!ENTITY torSettings.connect "ເຊື່ອມຕໍ່"> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 279c490..b38f443 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor tinklo nustatymai"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Prisijungti prie Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor tinklo nustatymai"> +<!ENTITY torsettings.wizard.title.connecting "Užmezgiamas ryšys">  <!ENTITY torlauncher.localePicker.title "Tor naršyklės kalba"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Norėdami prisijungti prie Tor, spustelėkite "Prisijungti"."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigūruoti"> <!ENTITY torSettings.connect "Prisijungti"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Nebūtina"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Prisijungimui prie interneto aš naudoju įgaliotąjį serverį"> <!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "pasirinkite įgaliotojo serverio tipą"> <!ENTITY torsettings.useProxy.address "Adresas:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas"> <!ENTITY torsettings.useProxy.port "Prievadas:"> @@ -36,18 +36,18 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Šis kompiuteris jungiasi per užkardą, kuri leidžia jungtis tik prie tam tikrų prievadų"> <!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Mano šalyje Tor yra cenzūruojamas"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "pasirinkite tinklų tiltą"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopijuoti Tor žurnalą į iškarpinę"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "Įgaliotojo serverio žinynas"> <!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index ee8fd53..970c645 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurēt"> <!ENTITY torSettings.connect "Veidot savienojumu"> diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index c457350..951952e 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index 5f0d428..7115f89 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "जोडा"> diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 0d66f7a..d2b8962 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -1,58 +1,58 @@ <!ENTITY torsettings.dialog.title "Tetapan Rangkaian Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Sambung denganTor"> +<!ENTITY torsettings.wizard.title.configure "Tetapan Rangkaian Tor"> +<!ENTITY torsettings.wizard.title.connecting "Menjalinkan Sambungan">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Bahasa Pelayar Tor"> +<!ENTITY torlauncher.localePicker.prompt "Sila pilih satu bahasa.">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfigurasi"> -<!ENTITY torSettings.connect "Menyambung"> +<!ENTITY torSettings.connectPrompt "Klik "Sambung" untuk bersambung dengan Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configure "Konfigur"> +<!ENTITY torSettings.connect "Sambung">  <!ENTITY torsettings.startingTor "Menunggu Tor untuk dimulakan..."> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.restartTor "Mula Semula Tor"> +<!ENTITY torsettings.reconfigTor "Konfigur Semula"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Anda telah mengkonfigur titi Tor atau telah memasukkan tetapan proksi setempat.  Untuk membuat sambungan terus dengan rangkaian Tor. tetapan ini mesti dibuang."> +<!ENTITY torsettings.discardSettings.proceed "Buang Tetapan dan Sambung"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Pilihan"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Saya guna proksi untuk bersambung dengan Internet"> <!ENTITY torsettings.useProxy.type "Jenis Proksi:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "pilih sejenis proksi"> <!ENTITY torsettings.useProxy.address "Alamat:"> -<!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama host"> +<!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama hos"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Kata pengguna:"> -<!ENTITY torsettings.useProxy.password "Kata laluan:"> +<!ENTITY torsettings.useProxy.username "Nama Pengguna:"> +<!ENTITY torsettings.useProxy.password "Kata Laluan:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Komputer ini melalui firewall yang hanya membenarkan sambungan ke port tertentu"> -<!ENTITY torsettings.firewall.allowedPorts "Port yang dibenarkan:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.firewall.checkbox "Komputer ini melalui tembok api yang hanya membolehkan sambungan ke port tertentu"> +<!ENTITY torsettings.firewall.allowedPorts "Port Dibenarkan:"> +<!ENTITY torsettings.useBridges.checkbox "Tor dilarang penggunaannya di negara saya"> +<!ENTITY torsettings.useBridges.default "Pilih satu titi terbina-dalam"> +<!ENTITY torsettings.useBridges.default.placeholder "pilih satu titi"> +<!ENTITY torsettings.useBridges.custom "Sediakan satu titi yang saya tahu"> +<!ENTITY torsettings.useBridges.label "Masukkan maklumat titi dari sumber yang dipercayai."> +<!ENTITY torsettings.useBridges.placeholder "taip alamat:port (satu per baris)"> -<!ENTITY torsettings.copyLog "Salin log Tor ke clipboard"> +<!ENTITY torsettings.copyLog "Salin log Tor ke Papan Keratan"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Bantuan Proksi"> +<!ENTITY torsettings.proxyHelp1 "Satu proksi setempat diperlukan semasa menyambung dengan rangkaian syarikat, sekolah, atau universiti. Jika anda tidak pasti bagaimana untuk menjawab soalan ini, lihat tetapan Internet dalam pelayar yang lain atau periksa tetapan rangkaian sistem anda untuk melihat sama ada proksi diperlukan."> -<!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "Bantuan Geganti Titi"> +<!ENTITY torsettings.bridgeHelp1 "Titi adalah geganti tidak tersenarai yang menjadikannya lebih sukar menyekat sambungan dengan Rangkaian Tor.  Setiap jenis titi menggunakan kaedah berbeza untuk menghindari sekatan.  Obf menjadikan trafik anda seakan-akan hingar rawak, dan paling teruk menjadikan trafik anda kelihatan mahu bersambung dengan perkhidmatan lain selain dari Tor."> +<!ENTITY torsettings.bridgeHelp2 "Oleh kerana terdapat beberapa negara menyekat Tor, sesetengah titi berfungsi di negara tertentu tetapi tidak pada negar lain.  Jika anda tidak pasti titi yang manakah sesuai untuk negara anda, sila lawati torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Tunggu sebentar sementara kami menjalinkan sambungan dengan rangkaian Tor.  Ia mengambil masa beberapa minit."> diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index 83bedf6..2706398 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -20,19 +20,19 @@ torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes. torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S torlauncher.failed_to_save_settings=Gagal menyimpan tetapan Tor.\n\n%S -torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor sedang berjalan. +torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor telah berjalan. -torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama host dan beberapa port bagi mengkonfigurasi Tor untuk menggunakan proksi bagi mengakses Internet. -torlauncher.error_proxy_type_missing=Anda mesti memilih jenis proksi. -torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges. +torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama hos dan nombor port bagi mengkonfigur Tor untuk menggunakan proksi yang dapat mencapai Internet. +torlauncher.error_proxy_type_missing=Anda mesti pilih jenis proksi. +torlauncher.error_bridges_missing=Anda mesti nyatakan satu atau lebih titi. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.bridge_suffix.meek-amazon=(works in China) torlauncher.bridge_suffix.meek-azure=(works in China) -torlauncher.connect=Menyambung -torlauncher.restart_tor=Restart Tor +torlauncher.connect=Sambung +torlauncher.restart_tor=Mula Semula Tor torlauncher.quit=Henti torlauncher.quit_win=Keluar torlauncher.done=Selesai @@ -49,7 +49,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Menyambung ke rangkaian Tor. +torlauncher.bootstrapStatus.conn_or=Menyambung ke rangkaian Tor torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index e079969..112fd89 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "ချိတ်ဆက်ရန်"> diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 2824aa6..190b56e 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Koble til Tor"> +<!ENTITY torsettings.wizard.title.configure "Nettverksinnstillinger for Tor"> +<!ENTITY torsettings.wizard.title.connecting "Etablering av tilkobling">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Klikk "koble til" for å koble til Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Sett opp"> <!ENTITY torSettings.connect "Koble til"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Valgfritt"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett"> <!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter"> <!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land"> +<!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsårer"> +<!ENTITY torsettings.useBridges.default.placeholder "velg en bro"> +<!ENTITY torsettings.useBridges.custom "Tilby en bro jeg kjenner"> +<!ENTITY torsettings.useBridges.label "Skriv inn broinformasjon fra en betrodd kilde."> +<!ENTITY torsettings.useBridges.placeholder "type addresse:port (én per linje)"> <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Mellomtjenerhjelp"> +<!ENTITY torsettings.proxyHelp1 "En lokal mellomtjener trengs når du kobler til fra et bedrifts-, skole-, eller universitets-nettverk. Hvis du ikke er sikker på hvordan du besvarer dette spørsmålet, sjekk internettinnstillingene i en annen nettleser, eller sjekk nettverksinnstillingene på systemet ditt for å se hvorvidt en mellomtjener behøves."> <!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Broer er ulistede rutingstafettoppsett som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket.  Hver type bro bruker en egen måte å unngå sensur.  Obfs-broene får trafikken din til å se ut som tilfeldig støy, og de ydmyke broene får broene til å se ut som de kobler til en annen tjeneste enn Tor."> +<!ENTITY torsettings.bridgeHelp2 "På grunn av hvordan noen land prøver å blokkere Tor, fungerer noen broer i noen land, men ikke i andre.. Hvis du er usikker på hvilke broer som fungerer i ditt land, besøk torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket opprettes.  Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index adefc26..acde34b 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -23,13 +23,13 @@ torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S torlauncher.ensure_tor_is_running=Sjekk at Tor kjører. torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å sette opp Tor til bruk med en mellomtjener for å koble til Internett. -torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen +torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen. torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(virker i Kina) +torlauncher.bridge_suffix.meek-azure=(virker i Kina) torlauncher.connect=Koble til torlauncher.restart_tor=Omstart av Tor diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 26fdd4a..60c1035 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "जडान गर्नुहोस् "> diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index 6692952..131f73a 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configureer"> <!ENTITY torSettings.connect "Verbinden"> diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index b9da126..a1e2a83 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netwerkinstellingen"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Verbind met Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Netwerk Instellingen"> +<!ENTITY torsettings.wizard.title.connecting "Creëer een verbinding">  <!ENTITY torlauncher.localePicker.title "Tor-browsertaal"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Klik "Verbind" om met Tor te verbinden."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configureren"> <!ENTITY torSettings.connect "Verbinden"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Optioneel"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I gebruik een proxy om met het internet te verbinden."> <!ENTITY torsettings.useProxy.type "Proxytype:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "Selecteer een proxy type"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adres of hostnaam"> <!ENTITY torsettings.useProxy.port "Poort:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat"> <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor is geblokkeerd in mijn land."> +<!ENTITY torsettings.useBridges.default "Selecteer een ingebouwde bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "Kies een bridge"> +<!ENTITY torsettings.useBridges.custom "Geef een bridge weer die ik ken"> +<!ENTITY torsettings.useBridges.label "Voer bridge informatie van een vertrouwde bron in."> +<!ENTITY torsettings.useBridges.placeholder "type adres:poort (een per lijn)"> <!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "Een lokale proxy is nodig wanneer u verbind door het netwerk van uw werk, school, universiteit. Als u niet zeker bent hoe u deze vraag zou beantwoorden, kijk naar uw internet instellingen in een andere browser of controleer uw systeem zijn netwerk instellingen om te zien of een proxy nodig is."> <!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet vermelde relays die het moeilijk maken om verbindingen naar het Tor Network te blokkeren.  Elk van deze bridges gebruikt een andere methode om censuur te vermijden.  Degene die obfs gebruiken, zien eruit gelijk willekeurige ruis, en de andere laten uw netwerk verkeer eruit zien alsof u verbind met een andere service in plaats van met Tor."> +<!ENTITY torsettings.bridgeHelp2 "Omdat bepaalde landen proberen Tor te blokkeren, sommige bridges zullen in bepaalde landen werken maar niet in andere.  Als u niet zeker bent over welke bridges werken in uw land, ga naar torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Even geduld terwijl we een verbinding maken met het Tor network.  Dit kan enkele minuten duren."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index b372c39..cb6dd12 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven. torlauncher.error_default_bridges_type_missing=Je moet een transport-type selecteren voor de verstrekte bridges. torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub je instellingen aan. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(Werkt in China) +torlauncher.bridge_suffix.meek-azure=(werkt in China) torlauncher.connect=Verbind torlauncher.restart_tor=Herstart Tor diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 60d422a..27bf639 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurer"> <!ENTITY torSettings.connect "Kopla til"> diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index d60f00c..013a7e4 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "ਸੰਰਚਨਾ"> <!ENTITY torSettings.connect "ਕੁਨੈਕਟ ਕਰੋ"> diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 5806fe5..90525cc 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguruj"> <!ENTITY torSettings.connect "Połącz"> diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 4338412..a301a99 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Conectar-se ao Tor"> +<!ENTITY torsettings.wizard.title.configure "Configurações da Rede Tor"> +<!ENTITY torsettings.wizard.title.connecting "Estabelecendo uma Conexão ">  <!ENTITY torlauncher.localePicker.title "Idioma do navegador Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Clique em “Conectar-se” para conectarse ao Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Eu uso proxy para me conectar à Internet"> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "Selecione um tipo de proxy"> <!ENTITY torsettings.useProxy.address "Endereço:"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou Servidor"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor é censurado no país onde estou"> +<!ENTITY torsettings.useBridges.default "Selecione uma ponte embutida"> +<!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> +<!ENTITY torsettings.useBridges.custom "Ofereça um ponte já conhecida"> +<!ENTITY torsettings.useBridges.label "Inserir informações sobre a ponte a partir de uma fonte confiável"> +<!ENTITY torsettings.useBridges.placeholder "digite o endereço : port (um por linha)"> <!ENTITY torsettings.copyLog "Copiar o registro do Tor na área de transferência"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Ajuda com o Proxy"> +<!ENTITY torsettings.proxyHelp1 "Um proxy local é necessário para conectar-se por meio de uma rede de empresa, escola ou universidade. Se você não tiver certeza se um proxy é necessário no seu caso, verifique as configurações de Internet em um outro navegador ou consulte as suas configurações de sistema de rede. "> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Pontes são retransmissores não listados que dificultam o bloqueio de conexões à Rede Tor.  Cada tipo de ponte usa um método diferente para evitar censura.  Obfs faz com que o seu tráfego online pareca um barulho aleatório, e as de tipo meek fazem o seu tráfego online parecer como se estivesse conectando-se a um outro serviço e não ao Tor."> +<!ENTITY torsettings.bridgeHelp2 "Por causa do modo como certos países tentam bloquear Tor, certas pontes funcionam em alguns países, mas não em outros.  Caso você não tenha certeza sobre como pontes funcionam no país onde você está, consulte torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 5777e48..97f4a39 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funciona na China) +torlauncher.bridge_suffix.meek-azure=(funciona na China) torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar o Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 554dc90..2c4e38d 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Ligar"> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index ae2f66f..80338f7 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configuraţi "> <!ENTITY torSettings.connect "Conectare"> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 335655a..fcbdfc7 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Настроить"> <!ENTITY torSettings.connect "Соединиться"> diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index bf9aca6..c9e4ddd 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index ef72a6a..de53883 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "වින්‍යාස කරන්න"> <!ENTITY torSettings.connect "සම්බන්ධ වෙන්න"> diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index a56c632..c30729a 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurovať"> <!ENTITY torSettings.connect "Pripojiť"> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index f73572f..9b8915e 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurácia"> <!ENTITY torSettings.connect "Pripojiť"> diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 41b7063..46f1692 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Oblikovanje"> <!ENTITY torSettings.connect "Povezava"> diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index 919f708..6882de9 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Poveži"> diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index cba8ae5..94161ad 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguroni"> <!ENTITY torSettings.connect "Lidhuni"> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index c69d297..c3dc007 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Конфигуриши"> <!ENTITY torSettings.connect "Повежи се"> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 53fe718..54ebf72 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguriši"> <!ENTITY torSettings.connect "Povezivanje"> diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index aaffeb3..d158134 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nätverksinställningar för Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Anslut till Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Nätverk inställningar"> +<!ENTITY torsettings.wizard.title.connecting "Etablerar en anslutning">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Klicka på "Anslut" för att ansluta till Tor."> +<!ENTITY torSettings.configurePrompt "Klicka "Konfigurera" för att justera nätverks inställningar ifall du är i ett land som censurerar Tor( som Egypten, Kina och Turkiet) eller ifall du ansluter från ett privat nätverk som kräver en proxy."> <!ENTITY torSettings.configure "Konfigurera"> <!ENTITY torSettings.connect "Anslut"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Valfri"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> <!ENTITY torsettings.useProxy.type "Typ av proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "Välj en proxy typ"> <!ENTITY torsettings.useProxy.address "Adress:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denna dator går genom en brandvägg som bara tillåter anslutningar på vissa specifika portar."> <!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land"> +<!ENTITY torsettings.useBridges.default "Välj en inbyggd brygga"> +<!ENTITY torsettings.useBridges.default.placeholder "Välj en brygga"> +<!ENTITY torsettings.useBridges.custom "Använd en egen brygga"> +<!ENTITY torsettings.useBridges.label "Ange brygg informationen från en trodd källa"> +<!ENTITY torsettings.useBridges.placeholder "skriv adress:port (en per rad)"> <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Proxy hjälp"> +<!ENTITY torsettings.proxyHelp1 "En lokal proxy behövs när du ansluter via ett företag, skola eller universitets nätverk.   Om du inte är säker på hur du ska svara på denna frågan, se Internet inställningar i en annan webbläsaren eller kolla ditt systems nätverks inställningar för att se ifall en proxy behövs."> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Bryggor är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av brygga använder sig av olika metoder för att unvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> +<!ENTITY torsettings.bridgeHelp2 "I och med att vissa länder försöker blockera Tor fungerar inte alla bryggor i alla länder.   Ifall du är osäker på vilka bryggor som fungerar i ditt land besök torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Var god och vänta medans vi etablerar en anslutning till Tor nätverket.   Detta kan ta upp till flera minuter."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 70821c1..7d7bdf1 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(Fungerar i Kina) +torlauncher.bridge_suffix.meek-azure=(Fungerar i Kina) torlauncher.connect=Anslut torlauncher.restart_tor=Starta om Tor diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index ebfbd91..32ac0ab 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "கட்டமைக்க"> <!ENTITY torSettings.connect "இணைக்க"> diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index b025dd2..cdf5a9b 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "กำหนดค่า"> <!ENTITY torSettings.connect "เชื่อมต่อ"> diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index a4bd576..6111cfb 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Ağı Ayarları"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Tor Ağına Bağlan"> +<!ENTITY torsettings.wizard.title.configure "Tor Ağı Ayarları"> +<!ENTITY torsettings.wizard.title.connecting "Bağlantı kuruluyor">  <!ENTITY torlauncher.localePicker.title "Tor Browser Dili"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Tor ağına bağlanmak için "Bağlan" üzerine tıklayın."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connect "Bağlan"> @@ -18,16 +18,16 @@ <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor…"> <!ENTITY torsettings.restartTor "Tor'u Yeniden Başlat"> -<!ENTITY torsettings.reconfigTor "Yeniden Ayarla"> +<!ENTITY torsettings.reconfigTor "Yeniden Yapılandır"> -<!ENTITY torsettings.discardSettings.prompt "Tor Köprülerini ayarladınız ya da yerel vekil sunucu ayarlarını yazdınız.  Tor ağına doğrudan bağlanmak için bu ayarlar kaldırılmalıdır."> +<!ENTITY torsettings.discardSettings.prompt "Tor Köprülerini yapılandırdınız ya da yerel vekil sunucu ayarlarını yazdınız.  Tor ağına doğrudan bağlanmak için bu ayarlar kaldırılmalıdır."> <!ENTITY torsettings.discardSettings.proceed "Ayarları Kaldır ve Bağlan"> <!ENTITY torsettings.optional "İsteğe bağlı"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Internete erişmek için vekil sunucu kullanıyorum"> <!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu türünü seçin"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> <!ENTITY torsettings.useProxy.port "Bağlantı noktası:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnız belirli bağlantı noktalarına bağlanmaya izin veren bir güvenlik duvarı kullanıyor"> <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor engelleniyor"> +<!ENTITY torsettings.useBridges.default "Bir hazır köprü seçin"> +<!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin"> +<!ENTITY torsettings.useBridges.custom "Bildiğim bir köprü sağla"> +<!ENTITY torsettings.useBridges.label "Güvenli bir kaynaktan gelen köprü bilgisini yazın."> +<!ENTITY torsettings.useBridges.placeholder "adres:kapı numarası şeklinde yazın (her satıra bir tane)"> <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Vekil Sunucu Yardımı"> +<!ENTITY torsettings.proxyHelp1 "Bir kurum, okul ya da üniversite ağı aracılığıyla bağlanırken yerel bir vekil sunucu gereklidir. Bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, başka bir tarayıcıdaki İnternet ayarlarına bakın ya da vekil sunucunun gerekip gerekmediğini görmek için sisteminizin ağ ayarlarını gözden geçirin."> <!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Köprüler, Tor Ağına bağlantıların engellenmesini zorlaştıran listelenmemiş aktarıcılardır.  Her köprü türü engellemeden kaçınmak için farklı bir yöntem kullanır.  Obfs köprüler, trafiğinizi rastgele gürültü gibi gösterir ve meek köprüleri ise, trafiğinizi Tor yerine o hizmete bağlanmış gibi gösterir."> +<!ENTITY torsettings.bridgeHelp2 "Bazı ülkelerin Tor ağını engellemeye çalışması nedeniyle bazı köprüler bazı ülkelerde çalışır ancak diğer ülkelerde çalışmaz.  Ülkenizde hangi köprülerin çalışacağından emin değilseniz, torproject.org/about/contact.html#support adresine bakın.">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Lütfen Tor  ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index d9bbcfc..5f1d85b 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -3,9 +3,9 @@ torlauncher.error_title=Tor Başlatıcı -torlauncher.tor_exited_during_startup=Tor başlatılırken sonlandı. Bu durum torrc dosyasındaki ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Sorunu çözene ve Tor yazılımını yeniden başlatana kadar Tor Browser çalışmayacak. +torlauncher.tor_exited_during_startup=Tor başlatılırken sonlandı. Bu durum torrc dosyasındaki ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Sorun çözülene ve Tor uygulaması yeniden başlatılana kadar Tor Browser çalışmayacak. torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor Günlüğünün bir kopyasını destek takımına gönderin. -torlauncher.tor_exited2=Tor yeniden başlatıldığında tarayıcı sekmeleriniz kapatılmayacak. +torlauncher.tor_exited2=Tor uygulaması yeniden başlatıldığında tarayıcı sekmeleriniz kapatılmayacak. torlauncher.tor_controlconn_failed=Tor denetim bağlantı noktasına bağlanılamadı. torlauncher.tor_failed_to_start=Tor başlatılamadı. torlauncher.tor_control_failed=Tor denetimi alınamadı. @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Hazır köprüler için bir aktarım türü seçmelisiniz. torlauncher.error_bridge_bad_default_type=Hazır köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(Çin'de çalışır) +torlauncher.bridge_suffix.meek-azure=(Çin'de çalışır) torlauncher.connect=Bağlan torlauncher.restart_tor=Tor'u Yeniden Başlat diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 35788dc..e282a55 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Налаштування"> <!ENTITY torSettings.connect "З'єднатися"> diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index 41bed6b..cb5a403 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index e2ea1f7..4cf7dfe 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index 5970b9c..48ee1dc 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Ulanish"> diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 0f637e6..ca9a560 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Cấu hình"> <!ENTITY torSettings.connect "Kết nối"> diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 50b72ff..fe4f697 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor 网络设置"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "已连接到 Tor 网络"> +<!ENTITY torsettings.wizard.title.configure "Tor 网络设置"> +<!ENTITY torsettings.wizard.title.connecting "正在建立连接">  <!ENTITY torlauncher.localePicker.title "Tor Browser 语言"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "请点击“连接”以连接至 Tor 网络。"> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connect "连接"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "可选"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "使用代理访问互联网"> <!ENTITY torsettings.useProxy.type "代理类型："> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "选择代理类型"> <!ENTITY torsettings.useProxy.address "地址："> <!ENTITY torsettings.useProxy.address.placeholder "IP 地址或主机名"> <!ENTITY torsettings.useProxy.port "端口："> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "我所在国家对 Tor 进行了封锁"> +<!ENTITY torsettings.useBridges.default "选择内置网桥"> +<!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> +<!ENTITY torsettings.useBridges.custom "输入获取的网桥"> +<!ENTITY torsettings.useBridges.label "输入可信来源提供的网桥："> +<!ENTITY torsettings.useBridges.placeholder "输入地址:端口（每行一个）"> <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "代理帮助"> +<!ENTITY torsettings.proxyHelp1 "从公司或学校网络连接互联网时，有时需使用本地代理。 如果不确定如何回答该问题，请查看其他浏览器的互联网设置，或者查看系统网络设置是否需要代理。"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "网桥指未公开的 Tor 节点，通过这种节点连接 Tor 网络时更难以封锁。每种网桥使用不同的方式来突破审查。obfs 类型的网桥使通信看起来像随机信号，而 meek 网桥看起来像连接到相应的服务而不是 Tor 网络。"> +<!ENTITY torsettings.bridgeHelp2 "由于封锁方式不同，某种网桥在一些国家可用，但其他国家可能不可用。如果无法确定您应该使用哪种网桥，请访问 torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "正在连接 Tor 网络，可能需几分钟，请稍等。"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 8bbb139..aaec8e5 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=必须指定一个或多个网桥。 torlauncher.error_default_bridges_type_missing=必须指定网桥的传输类型。 torlauncher.error_bridge_bad_default_type=没有传输类型为 %S 的可用网桥。请调整设置。 -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=（中国可用） +torlauncher.bridge_suffix.meek-azure=（中国可用） torlauncher.connect=连接 torlauncher.restart_tor=重新启动 Tor diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 63c7f3a..db92556 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connect "連接"> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 82ec4d3..c579112 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connect "連接"> diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect"> diff --git a/src/install.rdf b/src/install.rdf index 6cb74e9..ba2640e 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.14.1</em:version> + <em:version>0.2.14.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[torbutton/master] Release preparations for 1.9.8.4
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit 0603de63b53567cb21cc5dfcd0fecfb4eca8eb3f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 18 08:21:57 2017 +0000 Release preparations for 1.9.8.4 CHANGELOG update and version bump --- src/CHANGELOG | 9 +++++++++ src/install.rdf | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index f0dac84..08a5a14 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,9 +1,18 @@ +1.9.8.4 + * Bug 21847: Update copy for security slider + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + 1.9.8.3 * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi * Bug 23949: Fix donation banner display * Update locales with translated banner * Translations update +1.9.7.10 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Translations update + 1.9.7.9 * Bug 23949: Fix donation banner display * Update locales with translated banner diff --git a/src/install.rdf b/src/install.rdf index 423edd7..41c8f8a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.8.3</em:version> + <em:version>1.9.8.4</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit 07ab727e66c958ff4190f78c1b3f8b5f8631da88 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 18 08:14:42 2017 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 092d36e..fb38ba0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -6,6 +6,13 @@ Tor Browser 7.5a9 -- December 09 2017 * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 +Tor Browser 7.0.11 -- December 09 2017 + * All Platforms + * Update Firefox to 52.5.2esr + * Update Tor to 0.3.1.9 + * Update HTTPS-Everywhere to 2017.12.6 + * Update NoScript to 5.1.8.1 + Tor Browser 7.5a8 -- November 15 2017 * All Platforms * Update Firefox to 52.5.0esr

1 0

[torbutton/master] Translations update
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit d8a65ac9c880896d990e22b7c3d54a0ba041458c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 18 08:12:32 2017 +0000 Translations update --- src/chrome/locale/ar/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/de/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/es/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/eu/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/fa/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/fr/aboutDialog.dtd | 4 +-- src/chrome/locale/fr/aboutTor.dtd | 14 +++++----- src/chrome/locale/fr/aboutTor.properties | 4 +-- src/chrome/locale/fr/brand.properties | 8 +++--- src/chrome/locale/fr/torbutton.dtd | 43 ++++++++++++------------------- src/chrome/locale/fr/torbutton.properties | 28 ++++++++++---------- src/chrome/locale/it/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/ja/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/ko/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/nl/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/pl/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/pt-BR/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/ru/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/sv/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/tr/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/vi/torbutton.dtd | 39 ++++++++++------------------ src/chrome/locale/zh-CN/torbutton.dtd | 41 +++++++++++------------------ 22 files changed, 270 insertions(+), 457 deletions(-) diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index db75c7a..3de2586 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> -<!ENTITY torbutton.prefs.sec_low "منخفض (افتراضي)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "هذا يوفر أفضل خبرة للإستخدام"> -<!ENTITY torbutton.prefs.sec_low_desc "طبقاً لهذا المستوى من إعدادات الأمان سوف يتم تفعيل كل صفات المتصفح"> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "آلية تجسيد الخط SVG OpenType معطلة."> -<!ENTITY torbutton.prefs.sec_gen_desc "طبقاً لهذا المستوى من إعدادات الأمان سوف يتم تفعيل هذه التغيرات ( لمزيد من التفاصيل مرر الفأرة فوق)"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "في بعض المواقع من الممكن أن تحتاج لإستخدام زر تعطيل السكريبتات في شرط الأدوات لتفعل المحتويات المرئية."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "بعض محسنات نصوص الجافا معطلة"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> -<!ENTITY torbutton.prefs.sec_mathml_desc "بعض الآليات لعرض معادلات رياضية معطلة."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "في المواقع التي تشغل جافا سكريبت، يكون تطوير الأداء معطل."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "بعض ميزات إظهار الخطوط معطلة "> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "آلية تجسيد الخط Graphite معطلة."> -<!ENTITY torbutton.prefs.sec_svg_desc "بعض الانواع من الصور معطله"> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "الصور SVG معطلة."> -<!ENTITY torbutton.prefs.sec_js_https_desc "تعطيل جافا سكريبت افتراضيا على جميع المواقع غير HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "يمكن تفعيل جافا سكريبت حسب كل موقع عن طريق زر تعطيل السكريبتات الموجود على شريط الأدوات."> -<!ENTITY torbutton.prefs.sec_high "عالٍ"> -<!ENTITY torbutton.prefs.sec_all_js_desc "جافا سكريبت معطل بشكل افتراضي على جميع المواقع."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "من الممكن أن بعض الخطوط والايقونات معروضة خطأ"> -<!ENTITY torbutton.prefs.sec_webfonts_desc_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.circuit_display.title "دائرة تور لهذا الموقع"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 6dac97e..cf5cdc2 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -33,29 +33,18 @@ <!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_low "Gering (Standard)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Dies liefert die am meisten nutzbaren Erfahrungen."> -<!ENTITY torbutton.prefs.sec_low_desc "Auf dieser Sicherheitsstufe sind alle Browserfunktionen aktiviert."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Der SVG-OpenType-Schriftdarstellungsvorgang ist deaktiviert."> -<!ENTITY torbutton.prefs.sec_gen_desc "Auf dieser Sicherheitsstufe gelten die folgenden Änderungen (für weitere Details mit der Maus überfahren):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5-Video- und Audiomedien werden per Click-to-Play über NoScript abspielbar."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Auf manchen Webseiten müssen Sie möglicherweise die NoScript-Schaltfläche in der Werkzeugleiste verwenden, um diese Medienobjekte zu aktivieren."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Einige JavaScript-Ausführungsoptimierungen sind deaktiviert."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Grundversion."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen Seiten langsamer laufen."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Manche Vorgänge zur Anzeige von mathematischen Gleichungen sind deaktiviert."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ist deaktiviert."> -<!ENTITY torbutton.prefs.sec_medium "Mittel"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Auf Seiten, auf denen JavaScript aktiviert ist, sind Leistungsoptimierungen deaktiviert."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Einige Schriftdarstellungseigenschaften sind deaktiviert."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Der Graphite-Schriftdarstellungsvorgang ist deaktiviert."> -<!ENTITY torbutton.prefs.sec_svg_desc "Einige Arten von Bilddateien sind deaktiviert."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-Bilder sind deaktiviert."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript ist standardmäßig auf allen Nicht-HTTPS-Webseiten deaktiviert."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kann über die NoScript-Schaltfläche in der Werkzeugleiste für jede Webseite einzeln aktiviert werden."> -<!ENTITY torbutton.prefs.sec_high "Hoch"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript ist standardmäßig auf allen Webseiten deaktiviert."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Manche Schriftarten und Symbole könnten falsch angezeigt werden."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien werden blockiert."> +<!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.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 a562e00..1a0f9fd 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -33,29 +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_low "Bajo (por defecto)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Esto proporciona la mejor experiencia de usabilidad."> -<!ENTITY torbutton.prefs.sec_low_desc "En este nivel de seguridad están habilitadas todas las funcionalidades del navegador ."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanismo de representación de fuentes SVG OpenType está deshabilitado."> -<!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad se aplican los siguientes cambios (ratón encima para detalles):"> -<!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vídeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios puede que necesite usar el botón NoScript de la barra de herramientas para habilitar estos objetos audiovisuales."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript están deshabilitadas."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), RegExp nativas."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Los scripts en algunos sitios puede que se ejecuten más lentamente."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Algunos mecanismos de representación de ecuaciones matemáticas están deshabilitados."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML está deshabilitado."> -<!ENTITY torbutton.prefs.sec_medium "Medio"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "En sitios donde JavaScript esté habilitado, las optimizaciones de rendimiento están deshabilitadas."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Algunas características de representación de fuentes están deshabilitadas."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "El mecanismo de representación de fuentes Graphite está deshabilitado."> -<!ENTITY torbutton.prefs.sec_svg_desc "Algunos tipos de imágenes están deshabilitados."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Las imágenes SVG están deshabilitadas."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript está deshabilitado por defecto en todos los sitios que no usan HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript puede habilitarse por sitios mediante el botón de barra de herramientas de NoScript."> -<!ENTITY torbutton.prefs.sec_high "Alto"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está deshabilitado por defecto en todos los sitios."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Algunas fuentes e iconos pueden mostrarse de forma incorrecta."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web están bloqueados."> +<!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.circuit_display.title "Circuito Tor para este sitio"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index cfffc79..823cf58 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> -<!ENTITY torbutton.prefs.sec_low "Baxua (lehentsia)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ezgaituta dago."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG irudiak ezgaituta daude."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> -<!ENTITY torbutton.prefs.sec_high "Altua"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude."> +<!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.circuit_display.title "Gune honetako Tor zirkuitua"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index bd3eb16..5f0a627 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> -<!ENTITY torbutton.prefs.sec_low "پایین (به طور پیش فرض)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "این فراهم می کند بیشترین تجربه قابل استفاده."> -<!ENTITY torbutton.prefs.sec_low_desc "در این سطح امنیتی، تمام ویژگی های مرورگر ها فعال است."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "مکانیسم رندر فونت SVG اپن تایپ غیر فعال است."> -<!ENTITY torbutton.prefs.sec_gen_desc "در این سطح امنیتی، تغییرات زیر اعمال می شود (خلاصه شده برای جزئیات بیشتر):"> -<!ENTITY torbutton.prefs.sec_html5_desc "صدا و تصویر HTML5 از طریق دکمه NoScript نوار ابزار به حالت -کلیک برای پخش- در می آید"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "در برخی سایت ها، ممکن است شما نیاز به استفاده از دکمه NoScript نوار ابزار برای فعال کردن این اشیاء رسانه داشته باشید."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "برخی از بهینه سازی عملکرد جاوا اسکریپت غیر فعال شده است."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT در شروع مطالعه."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "اسکریپت هل در برخی از سایت ها ممکن است آهسته تر اجرا شود."> -<!ENTITY torbutton.prefs.sec_mathml_desc "برخی مکانیسم ها نمایش معادلات ریاضی غیر فعال می باشد."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML غیر فعال است."> -<!ENTITY torbutton.prefs.sec_medium "متوسط"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "بهینه سازی عملکرد در سایت های حاوی جاوا اسکریپت غیرفعال شده است."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "برخی از ویژگی های رندر فونت غیر فعال می باشد."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "مکانیسم گرافیت رندر فونت غیر فعال است."> -<!ENTITY torbutton.prefs.sec_svg_desc "برخی از انواع تصاویر غیر فعال هستند."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "تصاویر SVG غیر فعال می باشد."> -<!ENTITY torbutton.prefs.sec_js_https_desc "جاوا اسکریپت به طور پیش فرض در تمامی سایت های غیر HTTPS غیر فعال است."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "جاوا اسکریپ برای هر وب سایت از طریق دکمه NoScript نوار ابزار فعال می شود."> -<!ENTITY torbutton.prefs.sec_high "زیاد"> -<!ENTITY torbutton.prefs.sec_all_js_desc "جاوا اسکریپت به طور پیش فرض در تمامی سایت ها غیر فعال است."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "برخی از فونت ها و آیکون های ممکن است نمایش نادرست داشته باشند."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_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.circuit_display.title "مدار تور برای این سایت"> diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index bc47fce..a6d1ec4 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -9,11 +9,11 @@ <!ENTITY help.or "ou">  <!ENTITY help.getInvolvedLink "impliquez-vous"> -<!ENTITY help.end " !"> +<!ENTITY help.end " !">  <!ENTITY bottomLinks.questions "Des questions ?">  <!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  <!ENTITY bottomLinks.license "Informations de licence"> -<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 8b1e3b1..a325239 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -6,16 +6,16 @@ <!ENTITY aboutTor.title "À propos de Tor "> -<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n'est pas à jour."> -<!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon, puis choisissez Vérifier les màj. du navigateur Tor."> +<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n’est pas à jour."> +<!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n’est pas à jour."> +<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l’oignon, puis choisissez Vérifier les màj. du navigateur Tor."> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> <!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement."> -<!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> +<!ENTITY aboutTor.failure.label "Une erreur s’est produite !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> <!ENTITY aboutTor.search.label "Rechercher"> @@ -26,11 +26,11 @@ <!ENTITY aboutTor.torInfo3.label "Nœud de sortie :"> <!ENTITY aboutTor.torInfo4.label "Ce serveur ne journalise aucune information sur les visteurs."> <!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuite ?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement ! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> +<!ENTITY aboutTor.whatnextAnswer.label "Tor n’est PAS tout ce dont vous avez besoin pour naviguer anonymement ! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Le guide d'utilisation du navigateur Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Le guide d’utilisation du navigateur Tor"> <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nœud relais Tor »"> @@ -40,6 +40,6 @@ <!ENTITY aboutTor.helpInfo5.label "Faire un don »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html"> -<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation sans but lucratif US 501(c)(3) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne."> +<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation sans but lucratif US 501(c)(3) dédiée à la recherche, le développement et l’éducation sur l’anonymat et la vie privée en ligne."> <!ENTITY aboutTor.learnMore.label "En savoir plus sur le projet Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html"> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index cd844af..f29050a 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -11,9 +11,9 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faites un don maintenant ! aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique -aboutTor.donationBanner.mozilla=Faites un don aujourd'hui et Mozilla fera un don équivalent ! +aboutTor.donationBanner.mozilla=Faites un don aujourd’hui et Mozilla fera un don équivalent ! -aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d'alerte et activistes depuis 2006 +aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d’alerte et activistes depuis 2006 aboutTor.donationBanner.tagline2=Vers un réseau mondial de liberté aboutTor.donationBanner.tagline3=La liberté en ligne aboutTor.donationBanner.tagline4=Pour favoriser la libre expression dans le monde entier diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties index d6cc6b4..0c6249f 100644 --- a/src/chrome/locale/fr/brand.properties +++ b/src/chrome/locale/fr/brand.properties @@ -7,10 +7,10 @@ brandShortName=Navigateur Tor brandFullName=Navigateur Tor vendorShortName=Projet Tor -homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche intégrée -homePageImport=Importez votre page d'accueil à partir de %S +homePageSingleStartMain=Firefox Start, une page d’accueil rapide avec recherche intégrée +homePageImport=Importez votre page d’accueil à partir de %S -homePageMigrationPageTitle=Choix de la page d'accueil -homePageMigrationDescription=Veuillez choisir la page d'accueil que vous souhaitez utiliser : +homePageMigrationPageTitle=Choix de la page d’accueil +homePageMigrationDescription=Veuillez choisir la page d’accueil que vous souhaitez utiliser : syncBrandShortName=Synchro diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 978cbc1..def0ef7 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -28,34 +28,23 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de suivi à la trace"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L"> <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d'autres utilisateurs du navigateur Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d’autres utilisateurs du navigateur Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant les performances de votre ordinateur, l'agencement du clavier, les paramètres de langue, l'emplacement des greffons installés, la liste des greffons installés, l'état de votre réseau, l'orientation de l'écran, la taille de l'écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL."> +<!ENTITY torbutton.prefs.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_low "Bas (par défaut)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Cela offre l'expérience la plus conviviale."> -<!ENTITY torbutton.prefs.sec_low_desc "À ce niveau de sécurité, toutes les fonctions du navigateur sont activées."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme de rendu de police SVG OpenType est désactivé."> -<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants sont applicables (survolez avec la souris pour plus de détails) :"> -<!ENTITY torbutton.prefs.sec_html5_desc "Le contenu HTML5 vidéo et audio devient « cliquer pour lire » avec NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Pour certains sites, vous aurez peut-être à utiliser le bouton NoScript de la barre d'outils pour activer ces objets multimédias."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations de performance de JavaScript sont désactivées."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts pourraient être exécutés plus lentement sur certains sites."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Certains mécanismes d'affichage des équations mathématiques sont désactivés."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> -<!ENTITY torbutton.prefs.sec_medium "Moyen"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites où JavaScript est activé, les optimisations des performances sont désactivées."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctions de rendu de police sont désactivées."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police Graphite est désactivé."> -<!ENTITY torbutton.prefs.sec_svg_desc "Certains types d'images sont désactivés."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont désactivées."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est désactivé par défaut pour tous les sites non HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut être activé par site avec le bouton NoScript de la barre d'outils"> -<!ENTITY torbutton.prefs.sec_high "Élevé"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est désactivé par défaut pour tous les sites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icônes pourraient ne pas s'afficher correctement."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquées."> +<!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.circuit_display.title "Circuit Tor pour ce site"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 945dc11..1ac1cfd 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -3,38 +3,38 @@ torbutton.circuit_display.ip_unknown = IP inconnue torbutton.circuit_display.onion_site = Site Oignon torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relayer -torbutton.circuit_display.tor_bridge = Pont (Bridge) +torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu -torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l'on vous suive à la trace en ligne. +torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.label.disabled = Tor Inactif torbutton.panel.label.enabled = Tor Actif extensions.torbutton(a)torproject.org.description = BoutonTor fournit un bouton pour configurer les paramètres de Tor et vider facilement les données de navigation privée. torbutton.popup.external.title = Télécharger un type de fichier externe ? -torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l'ouvrir avec une autre application. -torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à l'Internet sans passer par Tor pour certaines applications +torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l’ouvrir avec une autre application. +torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à l’Internet sans passer par Tor pour certaines applications torbutton.popup.external.suggest = Par sécurité, vous ne devriez ouvrir les fichiers téléchargés que lorsque vous êtes hors ligne, ou en utilisant un CD autonome Tor comme Tails.\n torbutton.popup.launch = Télécharger le fichier torbutton.popup.cancel = Annuler torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant -torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? -torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l'offre groupée de navigation Tor ? +torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s’afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? +torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il n’a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l’offre groupée de navigation Tor ? torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor -torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n'est pas sécuritaire d'utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l'offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s'il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. -torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus d'informations. +torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n’est pas sécuritaire d’utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l’offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s’il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. +torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus d’informations. torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à vos anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÊtes-vous certain de vouloir activer les greffons ?\n\n torbutton.popup.never_ask_again = Ne plus me poser la question. torbutton.popup.confirm_newnym = Le navigateur Tor fermera tous les fenêtres et onglets. Toutes les sessions des sites Web seront perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n -torbutton.slider_notification = Le menu de l'oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-le ! +torbutton.slider_notification = Le menu de l’oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-le ! torbutton.slider_notification_button = Ouvrir préférences de sécurité -torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine. +torbutton.maximize_warning = Maximiser le navigateur Tor à l’écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d’origine. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ce site Web (%S) a essayé d'extraire des données d'image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d'extraire des données d'image de canevas HTML5 ? +canvas.siteprompt=Ce site Web (%S) a essayé d’extraire des données d’image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d’extraire des données d’image de canevas HTML5 ? canvas.notNow=Pas maintenant canvas.notNowAccessKey=P canvas.allow=Autoriser à l’avenir @@ -45,7 +45,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Problème de profil %S -profileReadOnly=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d'essayer de l'utiliser. -profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d'essayer de l'utiliser. -profileAccessDenied=%S n'a pas le droit d'accéder au profil. Veuillez ajuster les droits de votre système de fichiers et ressayer. +profileReadOnly=Vous ne pouvez pas exécuter %S à partir d’un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d’essayer de l’utiliser. +profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d’un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d’essayer de l’utiliser. +profileAccessDenied=%S n’a pas le droit d’accéder au profil. Veuillez ajuster les droits de votre système de fichiers et ressayer. profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés. diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index d5aed79..3af2996 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -33,29 +33,18 @@ <!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.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_low "Basso (default)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Questo permette la migliore esperienza di usablità."> -<!ENTITY torbutton.prefs.sec_low_desc "A questo livello di sicurezza, tutte le features del browser sono abilitate."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Il meccanismo di rendering SVG OpenType è disabilitato."> -<!ENTITY torbutton.prefs.sec_gen_desc "A questo livello di sicurezza, i seguenti cambiamenti si applicano a (passa sopra con il mouse per i dettagli):"> -<!ENTITY torbutton.prefs.sec_html5_desc "I video e audio in HTML5 diventano click-to-play grazie a NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Su alcuni siti, potresti dover usare il pulsante toolbar di NoScript per attivare quei media."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Alcune ottimizzazioni di performance JavaScript sono disabilitate."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Gli scripts su alcuni siti possono girare più lenti."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML è disabilitato."> -<!ENTITY torbutton.prefs.sec_medium "Medio"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Nei siti dove è attivato JavaScript le ottimizzazioni sono disabilitate"> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Alcuni rendering dei font sono disabilitati."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Il meccanismo di rendering font Graphite è disabilitato."> -<!ENTITY torbutton.prefs.sec_svg_desc "Alcuni tipi di immagini sono disabilitati."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Le immagini SVG sono disabilitate."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript è disabilitato di default su tutti i siti non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript può essere attivato a seconda del sito usando il pulsante NoScript sulla barra strumenti."> -<!ENTITY torbutton.prefs.sec_high "Alto"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript è disabilitato di default su tutti i siti."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> +<!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.circuit_display.title "Circuito Tor per questo sito"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index e835f14..b238ecf 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> <!ENTITY torbutton.prefs.sec_caption_tooltip "セキュリティ・スライダーを使って、あなたのブラウザーをハッキングの試みに対してより脆弱にする可能性のあるブラウザーの機能を無効にできます。"> -<!ENTITY torbutton.prefs.sec_low "低い(デフォルト)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "最大の利便性を提供します。"> -<!ENTITY torbutton.prefs.sec_low_desc "このレベルでは、全てのブラウザーの機能が有効化されます。"> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType フォントレンダリング機能は無効化されます。"> -<!ENTITY torbutton.prefs.sec_gen_desc "このレベルでは、以下の変更が適用されます。(マウスを重ねると詳細を表示)"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 の映像と音楽は No-Script によりクリックするまで再生されません。"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "いくつかのサイトでは、メディアを有効にするために No-Script ツールバーを使う必要があります。"> -<!ENTITY torbutton.prefs.sec_some_jit_desc "いくつかの JavaScript のパフォーマンス最適化が無効化されます。"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "基本的なJIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "サイトによってはスクリプトの動作が遅くなります。"> -<!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。"> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML が無効化されます。"> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScriptが有効になっているサイトで、パフォーマンスの最適化が無効になります。"> -<!ENTITY torbutton.prefs.sec_font_rend_desc "いくつかのフォントレンダリング機能が無効化されます。"> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite フォントレンダリング機能は無効化されます。"> -<!ENTITY torbutton.prefs.sec_svg_desc "いくつかの画像の種類が無効化されます。"> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG 画像は無効化されます。"> -<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS ではないサイトの JavaScript はデフォルトで無効化されます。"> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "No-Script ツールバーからサイトごとに JavaScript を有効化できます。"> -<!ENTITY torbutton.prefs.sec_high "高い"> -<!ENTITY torbutton.prefs.sec_all_js_desc "全てのサイトの JavaScript はデフォルトで無効化されます。"> -<!ENTITY torbutton.prefs.sec_webfonts_desc "いくつかのフォントとアイコンは正常に表示されません。"> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。"> +<!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.circuit_display.title "このサイト用の Tor サーキット"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index adce6a9..14a24aa 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "이 상자를 체크 해둠으로써 웹사이트가 당신의 식별 할 수 있는 요소를 숨길 수 있습니다. 그것에는 컴퓨터 성능, 키보드 레이아웃, 로케일, 플러그인이 설치된 장소, 설치된 플러그인의 목록, 네트워크 상태, 화면 방향, 화면 크기, 사이트 별 확대 / 축소 수준, 지원되는 파일 형식, 시스템 색, WebGL 기능 등이 있습니다."> <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> -<!ENTITY torbutton.prefs.sec_low "낮음 (기본)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "이것은 가장 유용한 사용자 경험을 제공합니다."> -<!ENTITY torbutton.prefs.sec_low_desc "이 보안 수준에서는 모든 브라우저 기능을 사용할 수 있습니다."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG 폰트 렌터링 체계가 비활성화되었습니다."> -<!ENTITY torbutton.prefs.sec_gen_desc "이 보안 수준에서는 다음과 같은 변경 사항이 적용됩니다 (자세한 내용은 마우스 커서 올리기)."> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 비디오 및 오디오 미디어는 NoScript를 통해 클릭 후 재생으로 변경됩니다."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "일부 사이트에서는 이러한 미디어 개체를 사용하도록 NoScript 도구 모음 단추를 사용해야 할 수 있습니다."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "일부 JavaScript 의 성능 최적화가 비활성화되었습니다."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (베이스라인) JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "일부 사이트의 스크립트 동작이 느려질 수 있습니다."> -<!ENTITY torbutton.prefs.sec_mathml_desc "수학 방정식을 표시하는 일부 메커니즘은 사용할 수 없습니다."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML가 비활성화 되었습니다."> -<!ENTITY torbutton.prefs.sec_medium "중간"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript가 활성화 된 사이트에서는 성능 최적화가 비활성화 됩니다."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "일부 폰트의 렌터링이 비활성화되었습니다."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite 글꼴 렌더링 메커니즘이 비활성화 되어 있습니다."> -<!ENTITY torbutton.prefs.sec_svg_desc "몇몇 종류의 이미지가 비활성화 되었습니다."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images가 비활성화 되었습니다."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript는 HTTPS가 적용되지 않은 사이트에선 기본적으로 비활성화 됩니다."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript는 NoScript 도구 모음 단추를 통해 사이트 별로 활성화 할 수 있습니다."> -<!ENTITY torbutton.prefs.sec_high "높음"> -<!ENTITY torbutton.prefs.sec_all_js_desc "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "어떤 글씨체나 아이콘은 올바르지 않게 표시될 수 있습니다."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_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.circuit_display.title "이 사이트 에서 의 Tor 회로"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index cce0b9d..333e5f1 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -33,29 +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_low "Laag (standaard)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Dit biedt de meest bruikbare ervaring."> -<!ENTITY torbutton.prefs.sec_low_desc "Op dit beveiligingsniveau worden alle browserfuncties ingeschakeld."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Het SVG OpenType-mechanisme voor weergave van lettertypen is uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_gen_desc "Op dit beveiligingsniveau gelden de volgende wijzigingen (beweeg de muis over de items voor meer informatie):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5-video en -audio worden klik-om-af-te-spelen via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites moet je de NoScript-werkbalkknop gebruiken om deze media-objecten in te schakelen."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript-prestatieverbeteringen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kunnen op sommige websites trager zijn."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Sommige mechanismen voor het weergeven van wiskundige vergelijkingen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Op sites die JavaScript toestaan zijn de prestatieverbeteringen uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Sommige functies voor weergave van lettertypen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Het Graphite-weergavemechanisme voor lettertypen is uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_svg_desc "Sommige afbeeldingstypen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG afbeeldingen zijn uitgeschakeld."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is standaard uitgeschakeld op alle niet-HTTPS-websites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan worden ingeschakeld op een site-basis via de NoScript-werkbalkknop."> -<!ENTITY torbutton.prefs.sec_high "Hoog"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is standaard uitgeschakeld op alle websites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. "> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypen worden geblokkeerd."> +<!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.circuit_display.title "Tor-circuit voor deze website"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 085d05f..5ea9250 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Zachowaj to pole zaznaczone, aby ukryć przed stronami internetowymi elementy, które mogą być u ciebie unikalne, wliczając w to wydajność komputera, układ klawiatury, lokalizację, położenie zainstalowanych wtyczek, listę zainstalowanych wtyczek, stan sieci, orientację ekranu, rozmiar ekranu, określone poziomy powiększenia, obsługiwane typy plików, kolory systemu oraz możliwości WebGL."> <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeństwa"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeństwa pozwala na wyłączenie pewnych funkcji przeglądarki, które mogą uczynić ten program bardziej narażonym na próby ataku hakerskiego."> -<!ENTITY torbutton.prefs.sec_low "Niski (domyślny)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "To zapewnia najbardziej przyjazdne dla użytkownika ustawienia."> -<!ENTITY torbutton.prefs.sec_low_desc "Na tym poziomie zabezpieczeń, wszystkie funkcje przeglądarki są włączone."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Mechanizm SVG OpenType renderowania czcionek jest wyłączony."> -<!ENTITY torbutton.prefs.sec_gen_desc "Na tym poziomie bezpieczeństwa, stosuje się następujące zmiany (najedź kursorem po więcej szczegółów): "> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video oraz audio będą dostępne jako 'kliknij-aby-otworzyć' przez NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Na niektórych stronach internetowych będziesz musiał użyć przycisku NoScript znajdującym się w pasku narzędzi, aby włączyć dane obiekty medialne."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Niektóre optymalizacje wydajności JavaScript są wyłączone."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skrypty na niektórych stronach mogą działać wolniej."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Niektóre mechanizmy wyświetlania równań matematycznych są wyłączone."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML jest wyłączony."> -<!ENTITY torbutton.prefs.sec_medium "Średni"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Na stronach, na których włączony jest JavaScript optymalizacje wydajności są wyłączone."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Niektóre funkcje renderingu czcionki są wyłączone."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Mechanizm Graphite do renderowania czcionki jest wyłączony."> -<!ENTITY torbutton.prefs.sec_svg_desc "Niektóre typy obrazów są wyłączone."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Obrazy SVG są wyłączone."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript jest wyłączone domyślnie dla wszystkich stron które nie są HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript może być włączony dla pojedyńczych, wybranych przez Ciebie stronach używając przycisku NoScript z paska narzędzi."> -<!ENTITY torbutton.prefs.sec_high "Wysoki"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript jest domyślnie wyłączona na wszystkich stronach."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Niektóre czcionki i ikony mogą być wyświetlane niepoprawnie."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe są blokowane."> +<!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.circuit_display.title "Obwód Tor dla tej strony"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 4cc12cb..4c37179 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -33,29 +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_low "Baixo (padrão)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Isto proporciona a experiência mais utilizável."> -<!ENTITY torbutton.prefs.sec_low_desc "Nesse nível de segurança, todas as funções do navegador são ativadas. "> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "O mecanismo de renderização de fonte SVG OpenType está desabilitado."> -<!ENTITY torbutton.prefs.sec_gen_desc "Neste nível de segurança, as seguintes mudanças se aplicam (passe o mouse para mais detalhes):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video e mídia de audio torna-se clique-para-tocar através do NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, talvez você precise usar o botão da barra de ferramentas NoScript para habilitar esses objetos de mídia."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizações de perfomance JavaScript estão desabilitadas."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de Base JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts podem rodar mais devagar em alguns sites."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos para mostrar equações matemáticas estão desabilitados."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML foi desabilitado."> -<!ENTITY torbutton.prefs.sec_medium "Média "> -<!ENTITY torbutton.prefs.sec_all_jit_desc "As otimizações de performance serão desabilitadas nos sites em JavaScript estiver habilitado."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Alguns recursos de renderização de fontes estão desabilitados."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderização de fonte Graphite está desabilitado."> -<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagem foram desabilitadas."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imagens SVG foram desabilitadas."> -<!ENTITY torbutton.prefs.sec_js_https_desc "O JavaScript é desabilitado por padrão em todos os sites não-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado individualmente em cada site, clicando no botão da barra de ferramentas NoScript."> -<!ENTITY torbutton.prefs.sec_high "Alto"> -<!ENTITY torbutton.prefs.sec_all_js_desc "Por padrão, o JavaScript é desabilitado em todos os sites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Algumas fontes e ícones podem ser exibidos incorretamente."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Arquivos de fontes fornecidos pelo sítio web estão bloqueados."> +<!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.circuit_display.title "Circuito Tor para este site"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index fb05620..3c0b9a6 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы скрыть от веб-узлов вещи , которые могут быть уникальными для вас, включая производительность компьютера, раскладку клавиатуры, язык, расположение и список установленных плагинов, состояние сети, ориентацию и размер экрана , значения масштабирования для конкретных узлов, поддерживаемые типы файлов, системные цвета и возможности WebGL."> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> -<!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Наиболее простой вариант использования."> -<!ENTITY torbutton.prefs.sec_low_desc "На этом уровне безопасности, все функции браузера включены."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Механизм визуализации шрифта SVG OpenType отключен."> -<!ENTITY torbutton.prefs.sec_gen_desc "На этом уровне безопасности, следующие изменения применяются (при наведении курсора мыши):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 видео и аудио воспроизводятся только после щелчка благодаря NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "На некоторых сайтах, вам может потребоваться использовать кнопку NoScript панели инструментов, чтобы включить эти мультимедийные объекты."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Некоторые оптимизации производительности JavaScript отключены."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Базовый JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Сценарии на некоторых сайтах могут работать медленнее."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Некоторые механизмы отображения математических уравнений отключены."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML отключен."> -<!ENTITY torbutton.prefs.sec_medium "Средний"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "На сайтах с применением JavaScript оптимизация отключена."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Некоторые функции отрисовки шрифтов отключены."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Механизм визуализации шрифта Graphite отключен."> -<!ENTITY torbutton.prefs.sec_svg_desc "Некоторые типы изображений отключены."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG изображения отключены"> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript отключен по умолчанию на всех не HTTPS сайтах."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript может быть включен на сайте с помощью кнопки NoScript на панели инструментов."> -<!ENTITY torbutton.prefs.sec_high "Высокий"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript отключен по умолчанию на всех сайтах."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Некоторые шрифты и значки могут отображаться некорректно."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_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.circuit_display.title "Цепочка Tor для этого сайта"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 8f590c2..7936823 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Låt den här kryssrutan vara ikryssad för att dölja saker från webbplatser som kan vara unika för just dig, såsom datorprestanda, tangentbordslayout, språkinställningar, plats för installerade plugin, lista över installerade plugin, nätverksstatus, skärmorientering, skärmstorlek, platsspecifika zoomnivåer, filtypsstöd, systemfärger, och WebGL-stöd."> <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Säkerhetsreglaget låter dig stänga av vissa webbläsarfunktioner som kan göra din webbläsare mer sårbar mot intrångsförsök."> -<!ENTITY torbutton.prefs.sec_low "Låg (förvald)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Detta skapar den mest användbara upplevelsen."> -<!ENTITY torbutton.prefs.sec_low_desc "På den här säkerhetsnivån är webbläsarens alla funktioner aktiverade."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Användande av SVG OpenType-typsnitt är avaktiverad."> -<!ENTITY torbutton.prefs.sec_gen_desc "På den här säkerhetsnivån gäller följande förändringar (håll markören över för detaljer):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbplatser kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen i verktygsfältet."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript är inaktiverade."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbplatser kan gå långsammare."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "På sidor där JavaScript är aktiverat, är prestandaoptimeringar inaktiverade."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Vissa funktioner för gestaltning av typsnitt är avaktiverad."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Användande av Graphite-typsnitt är avaktiverad."> -<!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder är inaktiverade."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder är inaktiverade."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbplatser som inte använder HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbplatser via NoScript-knappen i verktygsfältet."> -<!ENTITY torbutton.prefs.sec_high "Hög"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbplatser."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbplatser är blockerade."> +<!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.circuit_display.title "Tor-krets för den här webbplatsen"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 7d1fc7e..ebcaa67 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -33,29 +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_low "Düşük (varsayılan)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Bu seçenek en kullanılabilir deneyimi sunar."> -<!ENTITY torbutton.prefs.sec_low_desc "Bu güvenlik düzeyinde tüm tarayıcı özellikleri kullanılabilir."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType yazı tipi görüntüleme düzeneği devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_gen_desc "Bu güvenlik düzeyinde, şu değişiklikler uygulanır (ayrıntılar için fare ile üzerlerinde dolaşın):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 görüntü ve ses ortamı NoScript aracılığıyla tıklayıp oynat şekline dönüştürülür."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Bazı sitelerde bu ortam nesnelerini etkinleştirebilmek için NoScript düğmesinin kullanılması gerekebilir."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Bazı JavaScript başarım iyileştirmeleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Doğal Kurallı İfade"> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Sınır Çizgi JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_medium "Orta"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript kullanılan web sitelerinde başarım iyileştirmeleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel türleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG görselleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS kullanılmayan sitelerde JavaScript varsayılan olarak devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araç çubuğu düğmesi kullanılarak her site için ayrı ayrı etkinleştirilebilir."> -<!ENTITY torbutton.prefs.sec_high "Yüksek"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript varsayılan olarak tüm sitelerde devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Bazı yazı tipi ve simgeler düzgün görüntülenemeyebilir."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafından sunulan yazı tipi dosyaları engellenir."> +<!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.circuit_display.title "Bu site için Tor devresi"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 02fe8be..b5606a0 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Luôn đánh dấu hộp này để ẩn các dấu hiệu có thể là đặc trưng duy nhất về bạn, bao gồm khả năng làm việc của máy tính của bạn, cách sắp xếp của bàn phím, nơi ở, vị trí của các trình thêm vào (plugins) được cài đặt, danh sách của các trình thêm vào được cài đặt, trạng thái mạng của bạn, định hướng màn hình, kích thước màn hình, các mức độ phóng to-thu nhỏ đối với các trang cụ thể, các dạng tệp tin được hỗ trợ, các màu hệ thống, và các năng lực WebGL."> <!ENTITY torbutton.prefs.sec_caption "Mức độ Bảo mật"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Những Người điều chỉnh an ninh để cho bạn vô hiệu một vài tính năng của trình duyệt mà có thể làm trình duyệt của bạn dễ bị tổn thương đổi với những cố gắng tấn công."> -<!ENTITY torbutton.prefs.sec_low "Thấp (mặc định)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Điều này cung cấp trải nghiệm tiện lợi nhất"> -<!ENTITY torbutton.prefs.sec_low_desc "Ở mức này, tất cả tính năng của trình duyệt đều được kích hoạt."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Cơ chế kết xuất font SVG OpenType bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_gen_desc "Ở mức bảo mật này, những thay đổi sau sẽ được áp dụng (rê chuột vào để xem chi tiết):"> -<!ENTITY torbutton.prefs.sec_html5_desc "Video và âm thanh truyền thông HTML5 có thể trở thành nhấp để phát qua NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Trên một số trang, có thể bạn cần phải dùng nút thanh công cụ NoScript để kích hoạt những đối tượng đa phương tiện này."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Một số tối ưu hoá JavaScript bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Những đoạn mã trên một số trang có thể chạy chậm hơn."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Một vài cơ chế hiển thị công thức toán học bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathMK bị vô hiệu"> -<!ENTITY torbutton.prefs.sec_medium "Vừa phải"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Trên những trang nơi JavaScript được cho phép, việc tối ưu hóa hiệu suất bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Một vài chức năng tô vẽ phông chữ bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Cơ chế tô vẽ phông chữ Graphite bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_svg_desc "Một vài loại hình ảnh bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Hình ảnh SVG bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript mặc định bị vô hiệu trên tất cả các trang non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript có thể được cho phép trên nền tảng mỗi trang thông qua nút NoScript trên thanh công cụ."> -<!ENTITY torbutton.prefs.sec_high "Cao"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript mặc định bị vô hiệu trên tất cả các trang."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Một vài phông chữ và biểu tượng có thể hiển thị không đúng."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Những tập tin phông chữ do trang web cung cấp bị chặn."> +<!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.circuit_display.title "Đầu nối Tor dành cho trang này."> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index c02f2c4..236e2d4 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -27,35 +27,24 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证头部，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证标头，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "勾选此选项以避免网站获取您的浏览器指纹信息，包括您的计算机性能、键盘布局、系统语言、安装插件的位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 功能。"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_caption_tooltip "安全滑块可禁用某些浏览器功能，避免因这些功能导致的漏洞而受到攻击。"> -<!ENTITY torbutton.prefs.sec_low "低（默认）"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可提供最佳的用户体验。"> -<!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> -<!ENTITY torbutton.prefs.sec_gen_desc "在这个安全级别，下列更改将会生效（鼠标悬停查看细节）："> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> -<!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT，原版RegExp。"> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> -<!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> -<!ENTITY torbutton.prefs.sec_medium "中等"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "在开启 JavaScript 的站点上禁用性能优化。"> -<!ENTITY torbutton.prefs.sec_font_rend_desc "禁用某些字体渲染功能。"> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "禁用 Graphite 字体渲染。"> -<!ENTITY torbutton.prefs.sec_svg_desc "禁用某些图像类型。"> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "禁用 SVG 图像。"> -<!ENTITY torbutton.prefs.sec_js_https_desc "对于非 HTTPS 网站，默认禁用 JavaScript。"> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可通过工具栏上的 NoScript 按钮，启用某个网站上的 JavaScript。"> -<!ENTITY torbutton.prefs.sec_high "高"> -<!ENTITY torbutton.prefs.sec_all_js_desc "默认禁用所有网站 JavaScript。"> -<!ENTITY torbutton.prefs.sec_webfonts_desc "某些字体和图标可能无法正确显示。"> -<!ENTITY torbutton.prefs.sec_webfonts_desc_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.circuit_display.title "为此站点使用的 Tor 线路">

1 0

[tor-launcher/master] Bug 24428: bootstrap error message sometimes lost
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit c4f55f9f2c29caad1270ece1bc723d22d0996f3e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Nov 27 16:21:56 2017 -0500 Bug 24428: bootstrap error message sometimes lost Avoid replacing an error message with a generic bootstrap progress message. --- src/chrome/content/network-settings.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index da48bab..773a647 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -596,6 +596,13 @@ function updateBootstrapProgress(aStatusObj) if (!isShowingProgress()) return; + // Ignore status updates if the Reconfigure button is showing because this + // means that we are currently displaying an error message, and we do not + // want the error to be replaced by a generic progress message. + let progressContent = document.getElementById("progressContent"); + if (progressContent && progressContent.hasAttribute("isShowingReconfigure")) + return; + let labelText = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, "TAG"); let percentComplete = (aStatusObj.PROGRESS) ? aStatusObj.PROGRESS : 0;

1 0

[tor-launcher/master] Bug 10573: Replace deprecated nsILocalFile with nsIFile
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit e24ab106dffdf4f0504c2f60005e213ebd47d458 Author: ArunaMaurya221B <aruna.maurya12(a)gmail.com> Date: Wed Dec 6 16:57:06 2017 +0530 Bug 10573: Replace deprecated nsILocalFile with nsIFile --- src/components/tl-protocol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 68c6530..a89b84d 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1351,7 +1351,7 @@ TorProtocolService.prototype = _read_authentication_cookie: function(aPath) { - var file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile); + var file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); file.initWithPath(aPath); var fileStream = Cc["@mozilla.org/network/file-input-stream;1"] .createInstance(Ci.nsIFileInputStream);

1 0

[torbutton/master] Bug 10573: Replace deprecated nsILocalFile with nsIFile
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit d3c99991b207bb51dcaf477e2d879eb2234282a0 Author: ArunaMaurya221B <aruna.maurya12(a)gmail.com> Date: Wed Dec 6 17:08:11 2017 +0530 Bug 10573: Replace deprecated nsILocalFile with nsIFile --- src/chrome/content/torbutton.js | 2 +- src/components/cookie-jar-selector.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4fa2fb9..9abc1c5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -831,7 +831,7 @@ function torbutton_socket_readline(input) { // Bug 1506 P4: Control port interaction. Needed for New Identity. function torbutton_read_authentication_cookie(path) { var file = Components.classes['@mozilla.org/file/local;1'] - .createInstance(Components.interfaces.nsILocalFile); + .createInstance(Components.interfaces.nsIFile); file.initWithPath(path); var fileStream = Components.classes['@mozilla.org/network/file-input-stream;1'] .createInstance(Components.interfaces.nsIFileInputStream); diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index 778118d..f6d579e 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -53,7 +53,7 @@ function CookieJarSelector() { var file = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties) - .get(loc, Ci.nsILocalFile) + .get(loc, Ci.nsIFile) .clone(); file.append(filename); return file;

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 1394654 - Remove OS X opengl workaround from Mozilla bug 603134. r=mstange
by gk＠torproject.org 18 Dec '17

18 Dec '17

commit dca73c105071dc969df0f9d03892c786868d4ee7 Author: Josh Aas <jaas(a)kflag.net> Date: Sat Sep 2 14:24:00 2017 -0400 Bug 1394654 - Remove OS X opengl workaround from Mozilla bug 603134. r=mstange This fixes our bug 24566. --- widget/cocoa/nsChildView.h | 1 - widget/cocoa/nsChildView.mm | 33 --------------------------------- 2 files changed, 34 deletions(-) diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h index 5ef686b29521..f6fb44633c3a 100644 --- a/widget/cocoa/nsChildView.h +++ b/widget/cocoa/nsChildView.h @@ -185,7 +185,6 @@ class WidgetRenderingContext; float mCumulativeMagnification; float mCumulativeRotation; - BOOL mDidForceRefreshOpenGL; BOOL mWaitingForPaint; #ifdef __LP64__ diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 91dac240fa66..92ccd8b6c107 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -155,7 +155,6 @@ static uint32_t gNumberOfWidgetsNeedingEventThread = 0; // sets up our view, attaching it to its owning gecko view - (id)initWithFrame:(NSRect)inFrame geckoChild:(nsChildView*)inChild; -- (void)forceRefreshOpenGL; // set up a gecko mouse event based on a cocoa mouse event - (void) convertCocoaMouseWheelEvent:(NSEvent*)aMouseEvent @@ -3239,12 +3238,6 @@ NSEvent* gLastDragMouseDownEvent = nil; mCumulativeMagnification = 0.0; mCumulativeRotation = 0.0; - // We can't call forceRefreshOpenGL here because, in order to work around - // the bug, it seems we need to have a draw already happening. Therefore, - // we call it in drawRect:inContext:, when we know that a draw is in - // progress. - mDidForceRefreshOpenGL = NO; - mNeedsGLUpdate = NO; [self setFocusRingType:NSFocusRingTypeNone]; @@ -3326,25 +3319,6 @@ NSEvent* gLastDragMouseDownEvent = nil; mTextInputHandler = nullptr; } -// Work around bug 603134. -// OS X has a bug that causes new OpenGL windows to only paint once or twice, -// then stop painting altogether. By clearing the drawable from the GL context, -// and then resetting the view to ourselves, we convince OS X to start updating -// again. -// This can cause a flash in new windows - bug 631339 - but it's very hard to -// fix that while maintaining this workaround. -- (void)forceRefreshOpenGL -{ - NS_OBJC_BEGIN_TRY_ABORT_BLOCK; - - [mGLContext clearDrawable]; - CGLLockContext((CGLContextObj)[mGLContext CGLContextObj]); - [self updateGLContext]; - CGLUnlockContext((CGLContextObj)[mGLContext CGLContextObj]); - - NS_OBJC_END_TRY_ABORT_BLOCK; -} - - (bool)preRender:(NSOpenGLContext *)aGLContext { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN; @@ -3828,13 +3802,6 @@ NSEvent* gLastDragMouseDownEvent = nil; LayoutDeviceIntRegion region(geckoBounds); mGeckoChild->PaintWindow(region); - - // Force OpenGL to refresh the very first time we draw. This works around a - // Mac OS X bug that stops windows updating on OS X when we use OpenGL. - if (!mDidForceRefreshOpenGL) { - [self performSelector:@selector(forceRefreshOpenGL) withObject:nil afterDelay:0]; - mDidForceRefreshOpenGL = YES; - } } // Called asynchronously after setNeedsDisplay in order to avoid entering the

1 0

[torbutton/master] Bug 21847: Update copy for security slider
by gk＠torproject.org 17 Dec '17

17 Dec '17

commit 0e9fe510277aeb8617f9de73d24b85436479f129 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 17 21:47:03 2017 +0000 Bug 21847: Update copy for security slider We update the copy of our desktop security slider following the experience provided for mobile users. --- src/chrome/content/preferences.js | 37 ++++++++-- src/chrome/content/preferences.xul | 136 ++++++++++++++++--------------------- src/chrome/locale/en/torbutton.dtd | 39 ++++------- 3 files changed, 104 insertions(+), 108 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index a76dddb..721ff46 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -2,14 +2,17 @@ // Utilities let { utils: Cu } = Components; -let { getBoolPref, getIntPref, setBoolPref, setIntPref } = +let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; // Description elements have the follow names. const descNames = - [, "desc_high", "desc_medium", "desc_low"]; - + [, "desc_safest", "desc_safer", "desc_standard"]; +// "Learn-more"-elements have the follow names. +const linkNames = + [, "link_safest", "link_safer", "link_standard"]; // A single `state` object that reflects the user settings in this UI. + let state = { slider : 0, custom : false}; // Utility functions to convert between the legacy 4-value pref index @@ -41,7 +44,12 @@ function torbutton_init_security_ui() { torbutton_set_slider(prefSettingToSliderPosition( getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); - + torbutton_set_learn_more_links(); + // Make sure the "Accept"-button is focused when we show the dialog and not a + // possible "Learn more"-link. See: comment:16 in bug 21847. + let okBtn = document.documentElement.getButton("accept"); + if (okBtn) + okBtn.focus(); setTimeout(adjustDialogSize, 0); }; @@ -52,6 +60,27 @@ function torbutton_save_security_settings() { setBoolPref("extensions.torbutton.security_custom", state.custom); }; +// We follow the way we treat the links to the Tor Browser User Manual on the +// Help Menu and on about:tor: if we have the manual available for a locale, +// let's show the "Learn more"-link, otherwise hide it. +function torbutton_set_learn_more_links() { + let show_manual = window.opener.torbutton_show_torbrowser_manual(); + let locale = "" + if (show_manual) { + locale = getCharPref('general.useragent.locale'); + } + let links = linkNames.map(name => document.getElementById(name)); + links.forEach(link => {; + if (show_manual && locale != "") { + link.href= "https:/tb-manual.torproject.org/" + locale + + "/security-slider.html"; + link.hidden = false; + } else { + link.hidden = true; + } + }); +} + // Increase the height of this window so that a vertical scrollbar is not // needed on the description box. function adjustDialogSize() { diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 9ebc5d6..a6fabff 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -34,98 +34,85 @@ </vbox> <vbox> <hbox flex="1" align="start"> - <description id="torbutton_sec_high" + <description id="torbutton_sec_safest" onclick="torbutton_set_slider(1);" - tooltip="high_preview"> - &torbutton.prefs.sec_high; + tooltip="safest_preview"> + &torbutton.prefs.sec_safest_label; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_medium" + <description id="torbutton_sec_safer" onclick="torbutton_set_slider(2);" - tooltip="medium_preview"> - &torbutton.prefs.sec_medium; + tooltip="safer_preview"> + &torbutton.prefs.sec_safer_label; </description> </hbox> <hbox flex="1" align="end"> - <description id="torbutton_sec_low" + <description id="torbutton_sec_standard" onclick="torbutton_set_slider(3);" - tooltip="low_preview"> - &torbutton.prefs.sec_low; + tooltip="standard_preview"> + &torbutton.prefs.sec_standard_label; </description> </hbox> </vbox> </hbox> </vbox> <vbox id="descBox" flex="1" style="overflow: hidden;"> - <vbox id="desc_high" collapsed="true"> + <vbox id="desc_safest" collapsed="true"> <description class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_gen_desc; + &torbutton.prefs.sec_safest_description; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_all_js_desc; + <separator orient="horizontal" class="thin"/> + <description class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_safest_list_label; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> - &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> - &torbutton.prefs.sec_mathml_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> - &torbutton.prefs.sec_font_rend_desc; + <description class="slider-text-size"> + &torbutton.prefs.sec_js_disabled; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_svg_desc_tooltip;"> - &torbutton.prefs.sec_svg_desc; + <description class="slider-text-size"> + &torbutton.prefs.sec_limit_graphics_and_typography; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_webfonts_desc_tooltip;"> - &torbutton.prefs.sec_webfonts_desc; + <description class="slider-text-size"> + &torbutton.prefs.sec_click_to_play_media; </description> + <separator orient="horizontal" class="thin"/> + <label id="link_safest" class="text-link"> + &torbutton.prefs.sec_learn_more_label; + </label> </vbox> - <vbox id="desc_medium" collapsed="true"> + <vbox id="desc_safer" collapsed="true"> <description class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_gen_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_js_https_desc; + &torbutton.prefs.sec_safer_description; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> - &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; + <separator orient="horizontal" class="thin"/> + <description class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_safer_list_label; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + <description class="slider-text-size"> + &torbutton.prefs.sec_js_on_https_sites_only; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> - &torbutton.prefs.sec_mathml_desc; + <description class="slider-text-size"> + &torbutton.prefs.sec_limit_typography; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> - &torbutton.prefs.sec_font_rend_desc; + <description class="slider-text-size"> + &torbutton.prefs.sec_click_to_play_media; </description> + <separator orient="horizontal" class="thin"/> + <label id="link_safer" class="text-link"> + &torbutton.prefs.sec_learn_more_label; + </label> </vbox> - <vbox id="desc_low" collapsed="false"> + <vbox id="desc_standard" collapsed="false"> <description class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_low_desc; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_low_usable_desc; + &torbutton.prefs.sec_standard_description; </description> + <separator orient="horizontal" class="thin"/> + <label id="link_standard" class="text-link"> + &torbutton.prefs.sec_learn_more_label; + </label> </vbox> </vbox> </hbox> @@ -146,32 +133,23 @@ </groupbox> </vbox> - <tooltip id="high_preview"> - <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <tooltip id="safest_preview"> + <html:b>&torbutton.prefs.sec_safest_list_label;</html:b> <html:br></html:br> <html:br></html:br> - <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> - <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> - <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> - <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_svg_desc;</html:div> - <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div> + <html:div>&torbutton.prefs.sec_js_disabled;</html:div> + <html:div>&torbutton.prefs.sec_limit_graphics_and_typography;</html:div> + <html:div>&torbutton.prefs.sec_click_to_play_media;</html:div> </tooltip> - <tooltip id="medium_preview"> - <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <tooltip id="safer_preview"> + <html:b>&torbutton.prefs.sec_safer_list_label;</html:b> <html:br></html:br> <html:br></html:br> - <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> - <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> - <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> - <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> + <html:div>&torbutton.prefs.sec_js_on_https_sites_only;</html:div> + <html:div>&torbutton.prefs.sec_limit_typography;</html:div> + <html:div>&torbutton.prefs.sec_click_to_play_media;</html:div> </tooltip> - <tooltip id="low_preview"> - <html:b>&torbutton.prefs.sec_low_desc;</html:b> - <html:br></html:br> - <html:br></html:br> - <html:div>&torbutton.prefs.sec_low_usable_desc;</html:div> + <tooltip id="standard_preview"> + <html:b>&torbutton.prefs.sec_standard_description;</html:b> </tooltip> </dialog> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 608947c..7ccad6a 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -33,29 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!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.circuit_display.title "Tor circuit for this site">

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23970: Printing to a file is broken with Linux content sandboxing enabled
by gk＠torproject.org 15 Dec '17

15 Dec '17

commit 2a11447e4fb8ec6d64031cc41bdcef97603343cb Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Nov 27 14:40:05 2017 -0800 Bug 23970: Printing to a file is broken with Linux content sandboxing enabled Ported over firefox patch 2797f193a147 (Bug 1309205 Part 2) --- gfx/2d/2D.h | 7 + gfx/2d/Factory.cpp | 23 ++- gfx/2d/NativeFontResourceFontconfig.cpp | 65 +++++++ gfx/2d/NativeFontResourceFontconfig.h | 41 +++++ gfx/2d/RecordedEvent.cpp | 21 +-- gfx/2d/RecordedEvent.h | 10 +- gfx/2d/ScaledFontFontconfig.cpp | 315 ++++++++++++++++++++++++++++++++ gfx/2d/ScaledFontFontconfig.h | 59 +++++- gfx/2d/ScaledFontWin.cpp | 17 ++ gfx/2d/ScaledFontWin.h | 4 + gfx/2d/moz.build | 1 + 11 files changed, 540 insertions(+), 23 deletions(-) diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h index 3d5fb52ad925..0b95f37cb1c3 100644 --- a/gfx/2d/2D.h +++ b/gfx/2d/2D.h @@ -1388,6 +1388,13 @@ public: CreateNativeFontResource(uint8_t *aData, uint32_t aSize, FontType aType); /** + * This creates a scaled font of the given type based on font descriptor + * data retrieved from ScaledFont::GetFontDescriptor. + */ + static already_AddRefed<ScaledFont> + CreateScaledFontFromFontDescriptor(FontType aType, const uint8_t* aData, uint32_t aDataLength, Float aSize); + + /** * This creates a scaled font with an associated cairo_scaled_font_t, and * must be used when using the Cairo backend. The NativeFont and * cairo_scaled_font_t* parameters must correspond to the same font. diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp index ceebce690afb..bfe93d82c0ef 100644 --- a/gfx/2d/Factory.cpp +++ b/gfx/2d/Factory.cpp @@ -32,6 +32,7 @@ #ifdef MOZ_WIDGET_GTK #include "ScaledFontFontconfig.h" +#include "NativeFontResourceFontconfig.h" #endif #ifdef WIN32 @@ -534,8 +535,10 @@ Factory::CreateNativeFontResource(uint8_t *aData, uint32_t aSize, return NativeFontResourceGDI::Create(aData, aSize, /* aNeedsCairo = */ true); } -#elif XP_DARWIN +#elif defined(XP_DARWIN) return NativeFontResourceMac::Create(aData, aSize); +#elif defined(MOZ_WIDGET_GTK) + return NativeFontResourceFontconfig::Create(aData, aSize); #else gfxWarning() << "Unable to create cairo scaled font from truetype data"; return nullptr; @@ -548,6 +551,24 @@ Factory::CreateNativeFontResource(uint8_t *aData, uint32_t aSize, } already_AddRefed<ScaledFont> +Factory::CreateScaledFontFromFontDescriptor(FontType aType, const uint8_t* aData, uint32_t aDataLength, Float aSize) +{ + switch (aType) { +#ifdef WIN32 + case FontType::GDI: + return ScaledFontWin::CreateFromFontDescriptor(aData, aDataLength, aSize); +#endif +#ifdef MOZ_WIDGET_GTK + case FontType::FONTCONFIG: + return ScaledFontFontconfig::CreateFromFontDescriptor(aData, aDataLength, aSize); +#endif + default: + gfxWarning() << "Invalid type specified for ScaledFont font descriptor"; + return nullptr; + } +} + +already_AddRefed<ScaledFont> Factory::CreateScaledFontWithCairo(const NativeFont& aNativeFont, Float aSize, cairo_scaled_font_t* aScaledFont) { #ifdef USE_CAIRO diff --git a/gfx/2d/NativeFontResourceFontconfig.cpp b/gfx/2d/NativeFontResourceFontconfig.cpp new file mode 100644 index 000000000000..a205f98fae08 --- /dev/null +++ b/gfx/2d/NativeFontResourceFontconfig.cpp @@ -0,0 +1,65 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +#include "NativeFontResourceFontconfig.h" +#include "ScaledFontFontconfig.h" +#include "Logging.h" + +namespace mozilla { +namespace gfx { + +NativeFontResourceFontconfig::NativeFontResourceFontconfig(UniquePtr<uint8_t[]>&& aFontData, FT_Face aFace) + : mFontData(Move(aFontData)), + mFace(aFace) +{ +} + +NativeFontResourceFontconfig::~NativeFontResourceFontconfig() +{ + if (mFace) { + FT_Done_Face(mFace); + mFace = nullptr; + } +} + +already_AddRefed<NativeFontResourceFontconfig> +NativeFontResourceFontconfig::Create(uint8_t *aFontData, uint32_t aDataLength) +{ + if (!aFontData || !aDataLength) { + return nullptr; + } + UniquePtr<uint8_t[]> fontData(new uint8_t[aDataLength]); + memcpy(fontData.get(), aFontData, aDataLength); + + FT_Face face; + if (FT_New_Memory_Face(Factory::GetFTLibrary(), fontData.get(), aDataLength, 0, &face) != FT_Err_Ok) { + return nullptr; + } + if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != FT_Err_Ok) { + FT_Done_Face(face); + return nullptr; + } + + RefPtr<NativeFontResourceFontconfig> resource = + new NativeFontResourceFontconfig(Move(fontData), face); + return resource.forget(); +} + +already_AddRefed<ScaledFont> +NativeFontResourceFontconfig::CreateScaledFont(uint32_t aIndex, Float aGlyphSize, + const uint8_t* aInstanceData, uint32_t aInstanceDataLength) +{ + if (aInstanceDataLength < sizeof(ScaledFontFontconfig::InstanceData)) { + gfxWarning() << "Fontconfig scaled font instance data is truncated."; + return nullptr; + } + return ScaledFontFontconfig::CreateFromInstanceData( + *reinterpret_cast<const ScaledFontFontconfig::InstanceData*>(aInstanceData), + mFace, nullptr, 0, aGlyphSize); +} + +} // gfx +} // mozilla diff --git a/gfx/2d/NativeFontResourceFontconfig.h b/gfx/2d/NativeFontResourceFontconfig.h new file mode 100644 index 000000000000..e2c386198896 --- /dev/null +++ b/gfx/2d/NativeFontResourceFontconfig.h @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +#ifndef mozilla_gfx_NativeFontResourceFontconfig_h +#define mozilla_gfx_NativeFontResourceFontconfig_h + +#include "2D.h" + +#include <cairo-ft.h> + +namespace mozilla { +namespace gfx { + +class NativeFontResourceFontconfig final : public NativeFontResource +{ +public: + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(NativeFontResourceFontconfig) + + static already_AddRefed<NativeFontResourceFontconfig> + Create(uint8_t *aFontData, uint32_t aDataLength); + + already_AddRefed<ScaledFont> + CreateScaledFont(uint32_t aIndex, Float aGlyphSize, + const uint8_t* aInstanceData, uint32_t aInstanceDataLength) final; + + ~NativeFontResourceFontconfig(); + +private: + NativeFontResourceFontconfig(UniquePtr<uint8_t[]>&& aFontData, FT_Face aFace); + + UniquePtr<uint8_t[]> mFontData; + FT_Face mFace; +}; + +} // gfx +} // mozilla + +#endif // mozilla_gfx_NativeFontResourceFontconfig_h diff --git a/gfx/2d/RecordedEvent.cpp b/gfx/2d/RecordedEvent.cpp index 3bfc5c8f6333..684ce180db1e 100644 --- a/gfx/2d/RecordedEvent.cpp +++ b/gfx/2d/RecordedEvent.cpp @@ -1595,18 +1595,13 @@ RecordedFontDescriptor::~RecordedFontDescriptor() bool RecordedFontDescriptor::PlayEvent(Translator *aTranslator) const { - MOZ_ASSERT(mType == FontType::GDI); - - NativeFont nativeFont; - nativeFont.mType = (NativeFontType)mType; - nativeFont.mFont = (void*)&mData[0]; - RefPtr<ScaledFont> font = - Factory::CreateScaledFontForNativeFont(nativeFont, mFontSize); - -#ifdef USE_CAIRO_SCALED_FONT - static_cast<ScaledFontBase*>(font.get())->PopulateCairoScaledFont(); -#endif + Factory::CreateScaledFontFromFontDescriptor(mType, mData.data(), mData.size(), mFontSize); + if (!font) { + gfxDevCrash(LogReason::InvalidFont) << + "Failed creating ScaledFont of type " << int(mType) << " from font descriptor"; + return false; + } aTranslator->AddScaledFont(mRefPtr, font); return true; @@ -1620,7 +1615,7 @@ RecordedFontDescriptor::RecordToStream(std::ostream &aStream) const WriteElement(aStream, mFontSize); WriteElement(aStream, mRefPtr); WriteElement(aStream, (size_t)mData.size()); - aStream.write((char*)&mData[0], mData.size()); + aStream.write((char*)mData.data(), mData.size()); } void @@ -1646,7 +1641,7 @@ RecordedFontDescriptor::RecordedFontDescriptor(istream &aStream) size_t size; ReadElement(aStream, size); mData.resize(size); - aStream.read((char*)&mData[0], size); + aStream.read((char*)mData.data(), size); } bool diff --git a/gfx/2d/RecordedEvent.h b/gfx/2d/RecordedEvent.h index bf660ba243c4..dcf4d9e36e02 100644 --- a/gfx/2d/RecordedEvent.h +++ b/gfx/2d/RecordedEvent.h @@ -1047,7 +1047,7 @@ private: uint8_t *mData; RecordedFontDetails mFontDetails; - bool mGetFontFileDataSucceeded = false; + bool mGetFontFileDataSucceeded; MOZ_IMPLICIT RecordedFontData(std::istream &aStream); }; @@ -1055,7 +1055,7 @@ private: class RecordedFontDescriptor : public RecordedEvent { public: - static void FontDescCb(const uint8_t *aData, uint32_t aSize, + static void FontDescCb(const uint8_t* aData, uint32_t aSize, Float aFontSize, void* aBaton) { auto recordedFontDesc = static_cast<RecordedFontDescriptor*>(aBaton); @@ -1108,9 +1108,11 @@ public: RecordedScaledFontCreation(ScaledFont* aScaledFont, RecordedFontDetails aFontDetails) - : RecordedEvent(SCALEDFONTCREATION), mRefPtr(aScaledFont) + : RecordedEvent(SCALEDFONTCREATION) + , mRefPtr(aScaledFont) , mFontDataKey(aFontDetails.fontDataKey) - , mGlyphSize(aFontDetails.glyphSize) , mIndex(aFontDetails.index) + , mGlyphSize(aFontDetails.glyphSize) + , mIndex(aFontDetails.index) { aScaledFont->GetFontInstanceData(FontInstanceDataProc, this); } diff --git a/gfx/2d/ScaledFontFontconfig.cpp b/gfx/2d/ScaledFontFontconfig.cpp index d4751f86dac1..0695eebbeaa7 100644 --- a/gfx/2d/ScaledFontFontconfig.cpp +++ b/gfx/2d/ScaledFontFontconfig.cpp @@ -10,6 +10,10 @@ #include "skia/include/ports/SkTypeface_cairo.h" #endif +#include FT_TRUETYPE_TABLES_H + +#include <fontconfig/fcfreetype.h> + namespace mozilla { namespace gfx { @@ -43,5 +47,316 @@ SkTypeface* ScaledFontFontconfig::GetSkTypeface() } #endif +bool +ScaledFontFontconfig::GetFontFileData(FontFileDataOutput aDataCallback, void* aBaton) +{ + bool success = false; + // Lock the Cairo scaled font to force it to resolve the Fontconfig pattern to an FT_Face. + if (FT_Face face = cairo_ft_scaled_font_lock_face(GetCairoScaledFont())) { + FT_ULong length = 0; + // Request the SFNT file. This may not always succeed for all font types. + if (FT_Load_Sfnt_Table(face, 0, 0, nullptr, &length) == FT_Err_Ok) { + uint8_t* fontData = new uint8_t[length]; + if (FT_Load_Sfnt_Table(face, 0, 0, fontData, &length) == FT_Err_Ok) { + aDataCallback(fontData, length, 0, mSize, aBaton); + success = true; + } + delete[] fontData; + } + cairo_ft_scaled_font_unlock_face(GetCairoScaledFont()); + } + return success; +} + +ScaledFontFontconfig::InstanceData::InstanceData(cairo_scaled_font_t* aScaledFont, FcPattern* aPattern) + : mFlags(0) + , mHintStyle(FC_HINT_NONE) + , mSubpixelOrder(FC_RGBA_UNKNOWN) + , mLcdFilter(FC_LCD_LEGACY) +{ + // Record relevant Fontconfig properties into instance data. + FcBool autohint; + if (FcPatternGetBool(aPattern, FC_AUTOHINT, 0, &autohint) == FcResultMatch && autohint) { + mFlags |= AUTOHINT; + } + FcBool bitmap; + if (FcPatternGetBool(aPattern, FC_EMBEDDED_BITMAP, 0, &bitmap) == FcResultMatch && bitmap) { + mFlags |= EMBEDDED_BITMAP; + } + FcBool embolden; + if (FcPatternGetBool(aPattern, FC_EMBOLDEN, 0, &embolden) == FcResultMatch && embolden) { + mFlags |= EMBOLDEN; + } + FcBool vertical; + if (FcPatternGetBool(aPattern, FC_VERTICAL_LAYOUT, 0, &vertical) == FcResultMatch && vertical) { + mFlags |= VERTICAL_LAYOUT; + } + + FcBool antialias; + if (FcPatternGetBool(aPattern, FC_ANTIALIAS, 0, &antialias) != FcResultMatch || antialias) { + mFlags |= ANTIALIAS; + + // Only record subpixel order and lcd filtering if antialiasing is enabled. + int rgba; + if (FcPatternGetInteger(aPattern, FC_RGBA, 0, &rgba) == FcResultMatch) { + mSubpixelOrder = rgba; + } + int filter; + if (FcPatternGetInteger(aPattern, FC_LCD_FILTER, 0, &filter) == FcResultMatch) { + mLcdFilter = filter; + } + } + + cairo_font_options_t* fontOptions = cairo_font_options_create(); + cairo_scaled_font_get_font_options(aScaledFont, fontOptions); + // For printer fonts, Cairo hint metrics and hinting will be disabled. + // For other fonts, allow hint metrics and hinting. + if (cairo_font_options_get_hint_metrics(fontOptions) != CAIRO_HINT_METRICS_OFF) { + mFlags |= HINT_METRICS; + + FcBool hinting; + if (FcPatternGetBool(aPattern, FC_HINTING, 0, &hinting) != FcResultMatch || hinting) { + int hintstyle; + if (FcPatternGetInteger(aPattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) { + hintstyle = FC_HINT_FULL; + } + mHintStyle = hintstyle; + } + } + cairo_font_options_destroy(fontOptions); + + // Some fonts supply an adjusted size or otherwise use the font matrix for italicization. + // Record the scale and the skew to accomodate both of these cases. + cairo_matrix_t fontMatrix; + cairo_scaled_font_get_font_matrix(aScaledFont, &fontMatrix); + mScale = Float(fontMatrix.xx); + mSkew = Float(fontMatrix.xy); +} + +void +ScaledFontFontconfig::InstanceData::SetupPattern(FcPattern* aPattern) const +{ + if (mFlags & AUTOHINT) { + FcPatternAddBool(aPattern, FC_AUTOHINT, FcTrue); + } + if (mFlags & EMBEDDED_BITMAP) { + FcPatternAddBool(aPattern, FC_EMBEDDED_BITMAP, FcTrue); + } + if (mFlags & EMBOLDEN) { + FcPatternAddBool(aPattern, FC_EMBOLDEN, FcTrue); + } + if (mFlags & VERTICAL_LAYOUT) { + FcPatternAddBool(aPattern, FC_VERTICAL_LAYOUT, FcTrue); + } + + if (mFlags & ANTIALIAS) { + FcPatternAddBool(aPattern, FC_ANTIALIAS, FcTrue); + if (mSubpixelOrder != FC_RGBA_UNKNOWN) { + FcPatternAddInteger(aPattern, FC_RGBA, mSubpixelOrder); + } + if (mLcdFilter != FC_LCD_LEGACY) { + FcPatternAddInteger(aPattern, FC_LCD_FILTER, mLcdFilter); + } + } else { + FcPatternAddBool(aPattern, FC_ANTIALIAS, FcFalse); + } + + if (mHintStyle) { + FcPatternAddBool(aPattern, FC_HINTING, FcTrue); + FcPatternAddInteger(aPattern, FC_HINT_STYLE, mHintStyle); + } else { + FcPatternAddBool(aPattern, FC_HINTING, FcFalse); + } +} + +void +ScaledFontFontconfig::InstanceData::SetupFontOptions(cairo_font_options_t* aFontOptions) const +{ + // Try to build a sane initial set of Cairo font options based on the Fontconfig + // pattern. + if (mFlags & HINT_METRICS) { + // For regular (non-printer) fonts, enable hint metrics as well as hinting + // and (possibly subpixel) antialiasing. + cairo_font_options_set_hint_metrics(aFontOptions, CAIRO_HINT_METRICS_ON); + + cairo_hint_style_t hinting; + switch (mHintStyle) { + case FC_HINT_NONE: + hinting = CAIRO_HINT_STYLE_NONE; + break; + case FC_HINT_SLIGHT: + hinting = CAIRO_HINT_STYLE_SLIGHT; + break; + case FC_HINT_MEDIUM: + default: + hinting = CAIRO_HINT_STYLE_MEDIUM; + break; + case FC_HINT_FULL: + hinting = CAIRO_HINT_STYLE_FULL; + break; + } + cairo_font_options_set_hint_style(aFontOptions, hinting); + + if (mFlags & ANTIALIAS) { + cairo_subpixel_order_t subpixel = CAIRO_SUBPIXEL_ORDER_DEFAULT; + switch (mSubpixelOrder) { + case FC_RGBA_RGB: + subpixel = CAIRO_SUBPIXEL_ORDER_RGB; + break; + case FC_RGBA_BGR: + subpixel = CAIRO_SUBPIXEL_ORDER_BGR; + break; + case FC_RGBA_VRGB: + subpixel = CAIRO_SUBPIXEL_ORDER_VRGB; + break; + case FC_RGBA_VBGR: + subpixel = CAIRO_SUBPIXEL_ORDER_VBGR; + break; + default: + break; + } + if (subpixel != CAIRO_SUBPIXEL_ORDER_DEFAULT) { + cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_SUBPIXEL); + cairo_font_options_set_subpixel_order(aFontOptions, subpixel); + } else { + cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_GRAY); + } + } else { + cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_NONE); + } + } else { + // For printer fonts, disable hint metrics and hinting. Don't allow subpixel + // antialiasing. + cairo_font_options_set_hint_metrics(aFontOptions, CAIRO_HINT_METRICS_OFF); + cairo_font_options_set_hint_style(aFontOptions, CAIRO_HINT_STYLE_NONE); + cairo_font_options_set_antialias(aFontOptions, + mFlags & ANTIALIAS ? CAIRO_ANTIALIAS_GRAY : CAIRO_ANTIALIAS_NONE); + } +} + +void +ScaledFontFontconfig::InstanceData::SetupFontMatrix(cairo_matrix_t* aFontMatrix) const +{ + // Build a font matrix that will reproduce a possibly adjusted size + // and any italics/skew. This is just the concatenation of a simple + // scale matrix with a matrix that skews on the X axis. + cairo_matrix_init(aFontMatrix, mScale, 0, mSkew, mScale, 0, 0); +} + +bool +ScaledFontFontconfig::GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton) +{ + InstanceData instance(GetCairoScaledFont(), mPattern); + + aCb(reinterpret_cast<uint8_t*>(&instance), sizeof(instance), aBaton); + return true; +} + +bool +ScaledFontFontconfig::GetFontDescriptor(FontDescriptorOutput aCb, void* aBaton) +{ + // Check if the Fontconfig pattern uses a font file and index to specify which + // font to load. If so, record these as a font descriptor along with any instance + // data required to rebuild a scaled font from it. + FcChar8* pathname = nullptr; + if (FcPatternGetString(mPattern, FC_FILE, 0, &pathname) != FcResultMatch) { + return false; + } + int index = 0; + FcPatternGetInteger(mPattern, FC_INDEX, 0, &index); + if (index < 0) { + return false; + } + + size_t pathLength = strlen(reinterpret_cast<char*>(pathname)) + 1; + size_t dataLength = sizeof(FontDescriptor) + pathLength; + uint8_t* data = new uint8_t[dataLength]; + FontDescriptor* desc = reinterpret_cast<FontDescriptor*>(data); + desc->mPathLength = pathLength; + desc->mIndex = index; + desc->mInstanceData = InstanceData(GetCairoScaledFont(), mPattern); + memcpy(data + sizeof(FontDescriptor), pathname, pathLength); + + aCb(data, dataLength, mSize, aBaton); + return true; +} + +already_AddRefed<ScaledFont> +ScaledFontFontconfig::CreateFromInstanceData(const InstanceData& aInstanceData, + FT_Face aFace, const char* aPathname, uint32_t aIndex, + Float aSize) + +{ + FcPattern* pattern = FcPatternCreate(); + if (!pattern) { + gfxWarning() << "Failing initializing Fontconfig pattern for scaled font"; + return nullptr; + } + if (aFace) { + FcPatternAddFTFace(pattern, FC_FT_FACE, aFace); + } else { + FcPatternAddString(pattern, FC_FILE, reinterpret_cast<const FcChar8*>(aPathname)); + FcPatternAddInteger(pattern, FC_INDEX, aIndex); + } + FcPatternAddDouble(pattern, FC_PIXEL_SIZE, aSize); + aInstanceData.SetupPattern(pattern); + + cairo_font_face_t* font = cairo_ft_font_face_create_for_pattern(pattern); + if (cairo_font_face_status(font) != CAIRO_STATUS_SUCCESS) { + gfxWarning() << "Failed creating Cairo font face for Fontconfig pattern"; + FcPatternDestroy(pattern); + return nullptr; + } + + cairo_matrix_t sizeMatrix; + aInstanceData.SetupFontMatrix(&sizeMatrix); + + cairo_matrix_t identityMatrix; + cairo_matrix_init_identity(&identityMatrix); + + cairo_font_options_t *fontOptions = cairo_font_options_create(); + aInstanceData.SetupFontOptions(fontOptions); + + cairo_scaled_font_t* cairoScaledFont = + cairo_scaled_font_create(font, &sizeMatrix, &identityMatrix, fontOptions); + + cairo_font_options_destroy(fontOptions); + cairo_font_face_destroy(font); + + if (cairo_scaled_font_status(cairoScaledFont) != CAIRO_STATUS_SUCCESS) { + gfxWarning() << "Failed creating Cairo scaled font for font face"; + FcPatternDestroy(pattern); + return nullptr; + } + + RefPtr<ScaledFontFontconfig> scaledFont = + new ScaledFontFontconfig(cairoScaledFont, pattern, aSize); + + FcPatternDestroy(pattern); + + return scaledFont.forget(); +} + +already_AddRefed<ScaledFont> +ScaledFontFontconfig::CreateFromFontDescriptor(const uint8_t* aData, uint32_t aDataLength, Float aSize) +{ + if (aDataLength < sizeof(FontDescriptor)) { + gfxWarning() << "Fontconfig font descriptor is truncated."; + return nullptr; + } + const FontDescriptor* desc = reinterpret_cast<const FontDescriptor*>(aData); + if (desc->mPathLength < 1 || + desc->mPathLength > aDataLength - sizeof(FontDescriptor)) { + gfxWarning() << "Pathname in Fontconfig font descriptor has invalid size."; + return nullptr; + } + const char* pathname = reinterpret_cast<const char*>(aData + sizeof(FontDescriptor)); + if (pathname[desc->mPathLength - 1] != '\0') { + gfxWarning() << "Pathname in Fontconfig font descriptor is not terminated."; + return nullptr; + } + return CreateFromInstanceData(desc->mInstanceData, nullptr, pathname, desc->mIndex, aSize); +} + } // namespace gfx } // namespace mozilla diff --git a/gfx/2d/ScaledFontFontconfig.h b/gfx/2d/ScaledFontFontconfig.h index 4d4e8217dc1f..b24928d9db05 100644 --- a/gfx/2d/ScaledFontFontconfig.h +++ b/gfx/2d/ScaledFontFontconfig.h @@ -8,26 +8,75 @@ #include "ScaledFontBase.h" -#include <fontconfig/fontconfig.h> -#include <cairo.h> +#include <cairo-ft.h> namespace mozilla { namespace gfx { +class NativeFontResourceFontconfig; + class ScaledFontFontconfig : public ScaledFontBase { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontFontconfig) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontFontconfig, override) ScaledFontFontconfig(cairo_scaled_font_t* aScaledFont, FcPattern* aPattern, Float aSize); ~ScaledFontFontconfig(); - virtual FontType GetType() const { return FontType::FONTCONFIG; } + FontType GetType() const override { return FontType::FONTCONFIG; } #ifdef USE_SKIA - virtual SkTypeface* GetSkTypeface(); + SkTypeface* GetSkTypeface() override; #endif + bool GetFontFileData(FontFileDataOutput aDataCallback, void* aBaton) override; + + bool GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton) override; + + bool GetFontDescriptor(FontDescriptorOutput aCb, void* aBaton) override; + + static already_AddRefed<ScaledFont> + CreateFromFontDescriptor(const uint8_t* aData, uint32_t aDataLength, Float aSize); + private: + friend class NativeFontResourceFontconfig; + + struct InstanceData + { + enum { + ANTIALIAS = 1 << 0, + AUTOHINT = 1 << 1, + EMBEDDED_BITMAP = 1 << 2, + EMBOLDEN = 1 << 3, + VERTICAL_LAYOUT = 1 << 4, + HINT_METRICS = 1 << 5 + }; + + InstanceData(cairo_scaled_font_t* aScaledFont, FcPattern* aPattern); + + void SetupPattern(FcPattern* aPattern) const; + void SetupFontOptions(cairo_font_options_t* aFontOptions) const; + void SetupFontMatrix(cairo_matrix_t* aFontMatrix) const; + + uint8_t mFlags; + uint8_t mHintStyle; + uint8_t mSubpixelOrder; + uint8_t mLcdFilter; + Float mScale; + Float mSkew; + }; + + struct FontDescriptor + { + uint32_t mPathLength; + uint32_t mIndex; + InstanceData mInstanceData; + }; + + static already_AddRefed<ScaledFont> + CreateFromInstanceData(const InstanceData& aInstanceData, + FT_Face aFace, const char* aPathname, uint32_t aIndex, + Float aSize); + FcPattern* mPattern; }; diff --git a/gfx/2d/ScaledFontWin.cpp b/gfx/2d/ScaledFontWin.cpp index 2ebae21e5c04..b80bbea872e2 100644 --- a/gfx/2d/ScaledFontWin.cpp +++ b/gfx/2d/ScaledFontWin.cpp @@ -72,6 +72,23 @@ ScaledFontWin::GetFontDescriptor(FontDescriptorOutput aCb, void* aBaton) return true; } +already_AddRefed<ScaledFont> +ScaledFontWin::CreateFromFontDescriptor(const uint8_t* aData, uint32_t aDataLength, Float aSize) +{ + NativeFont nativeFont; + nativeFont.mType = NativeFontType::GDI_FONT_FACE; + nativeFont.mFont = (void*)aData; + + RefPtr<ScaledFont> font = + Factory::CreateScaledFontForNativeFont(nativeFont, aSize); + +#ifdef USE_CAIRO_SCALED_FONT + static_cast<ScaledFontBase*>(font.get())->PopulateCairoScaledFont(); +#endif + + return font.forget(); +} + AntialiasMode ScaledFontWin::GetDefaultAAMode() { diff --git a/gfx/2d/ScaledFontWin.h b/gfx/2d/ScaledFontWin.h index c07b263d7285..fe5816707d00 100644 --- a/gfx/2d/ScaledFontWin.h +++ b/gfx/2d/ScaledFontWin.h @@ -25,6 +25,10 @@ public: bool GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton) override; virtual bool GetFontDescriptor(FontDescriptorOutput aCb, void* aBaton) override; + + static already_AddRefed<ScaledFont> + CreateFromFontDescriptor(const uint8_t* aData, uint32_t aDataLength, Float aSize); + virtual AntialiasMode GetDefaultAAMode() override; #ifdef USE_SKIA diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index ad095503d97e..545ac6823390 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -91,6 +91,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): SOURCES += [ + 'NativeFontResourceFontconfig.cpp', 'ScaledFontFontconfig.cpp', ]

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23970: Printing to a file is broken with Linux content sandboxing enabled
by gk＠torproject.org 15 Dec '17

15 Dec '17

commit b23c1c6e66cfca06fb3a3c9ad370fcd466ecb963 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Nov 27 14:49:53 2017 -0800 Bug 23970: Printing to a file is broken with Linux content sandboxing enabled Ported over firefox patch 5e7872cb3b5c (Bug 1364627) --- gfx/2d/ScaledFontFontconfig.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/gfx/2d/ScaledFontFontconfig.cpp b/gfx/2d/ScaledFontFontconfig.cpp index 0695eebbeaa7..68c9a1a42c88 100644 --- a/gfx/2d/ScaledFontFontconfig.cpp +++ b/gfx/2d/ScaledFontFontconfig.cpp @@ -332,6 +332,7 @@ ScaledFontFontconfig::CreateFromInstanceData(const InstanceData& aInstanceData, RefPtr<ScaledFontFontconfig> scaledFont = new ScaledFontFontconfig(cairoScaledFont, pattern, aSize); + cairo_scaled_font_destroy(cairoScaledFont); FcPatternDestroy(pattern); return scaledFont.forget();

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23970: Printing to a file is broken with Linux content sandboxing enabled
by gk＠torproject.org 15 Dec '17

15 Dec '17

commit 9dadb90813c148d623d3bd35b629eebf499d27c4 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Nov 27 13:57:32 2017 -0800 Bug 23970: Printing to a file is broken with Linux content sandboxing enabled Ported over firefox patch 5c25a123203a (Bug 1309205 Part 1) --- gfx/2d/2D.h | 12 ++++++++++++ gfx/2d/Factory.cpp | 25 +++++++++++++++++++++++++ gfx/thebes/gfxAndroidPlatform.h | 4 +--- gfx/thebes/gfxFT2FontList.cpp | 10 +++++----- gfx/thebes/gfxFontconfigFonts.h | 5 ++--- gfx/thebes/gfxPlatform.cpp | 4 ++++ gfx/thebes/gfxPlatform.h | 5 +++++ gfx/thebes/gfxPlatformGtk.cpp | 10 ++++++++++ gfx/thebes/gfxPlatformGtk.h | 2 ++ 9 files changed, 66 insertions(+), 11 deletions(-) diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h index c1fba3463a8f..3d5fb52ad925 100644 --- a/gfx/2d/2D.h +++ b/gfx/2d/2D.h @@ -41,6 +41,9 @@ typedef _cairo_scaled_font cairo_scaled_font_t; struct _FcPattern; typedef _FcPattern FcPattern; +struct FT_LibraryRec_; +typedef FT_LibraryRec_* FT_Library; + struct ID3D11Texture2D; struct ID3D11Device; struct ID2D1Device; @@ -1483,6 +1486,15 @@ public: CreateCGGlyphRenderingOptions(const Color &aFontSmoothingBackgroundColor); #endif +#ifdef MOZ_ENABLE_FREETYPE + static void SetFTLibrary(FT_Library aFTLibrary); + static FT_Library GetFTLibrary(); + +private: + static FT_Library mFTLibrary; +public: +#endif + #ifdef WIN32 static already_AddRefed<DrawTarget> CreateDrawTargetForD3D11Texture(ID3D11Texture2D *aTexture, SurfaceFormat aFormat); diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp index 5cd5d14eaba1..ceebce690afb 100644 --- a/gfx/2d/Factory.cpp +++ b/gfx/2d/Factory.cpp @@ -156,6 +156,10 @@ namespace gfx { // In Gecko, this value is managed by gfx.logging.level in gfxPrefs. int32_t LoggingPrefs::sGfxLogLevel = LOG_DEFAULT; +#ifdef MOZ_ENABLE_FREETYPE +FT_Library Factory::mFTLibrary = nullptr; +#endif + #ifdef WIN32 ID3D11Device *Factory::mD3D11Device = nullptr; ID2D1Device *Factory::mD2D1Device = nullptr; @@ -192,6 +196,12 @@ Factory::ShutDown() delete sConfig; sConfig = nullptr; } + +#ifdef MOZ_ENABLE_FREETYPE + if (mFTLibrary) { + mFTLibrary = nullptr; + } +#endif } bool @@ -579,6 +589,21 @@ Factory::CreateDualDrawTarget(DrawTarget *targetA, DrawTarget *targetB) } +#ifdef MOZ_ENABLE_FREETYPE +void +Factory::SetFTLibrary(FT_Library aFTLibrary) +{ + mFTLibrary = aFTLibrary; +} + +FT_Library +Factory::GetFTLibrary() +{ + MOZ_ASSERT(mFTLibrary); + return mFTLibrary; +} +#endif + #ifdef WIN32 already_AddRefed<DrawTarget> Factory::CreateDrawTargetForD3D11Texture(ID3D11Texture2D *aTexture, SurfaceFormat aFormat) diff --git a/gfx/thebes/gfxAndroidPlatform.h b/gfx/thebes/gfxAndroidPlatform.h index 30e7c89babeb..889928da86a7 100644 --- a/gfx/thebes/gfxAndroidPlatform.h +++ b/gfx/thebes/gfxAndroidPlatform.h @@ -19,8 +19,6 @@ namespace mozilla { }; using mozilla::dom::FontListEntry; -typedef struct FT_LibraryRec_ *FT_Library; - class gfxAndroidPlatform : public gfxPlatform { public: gfxAndroidPlatform(); @@ -60,7 +58,7 @@ public: virtual bool FontHintingEnabled() override; virtual bool RequiresLinearZoom() override; - FT_Library GetFTLibrary(); + FT_Library GetFTLibrary() override; virtual bool CanRenderContentToDataSurface() const override { return true; diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp index 8a652df0dd34..2d9e09efe1c0 100644 --- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -13,7 +13,6 @@ #include "mozilla/UniquePtr.h" #include "mozilla/UniquePtrExtensions.h" #include "nsIInputStream.h" -#define gfxToolkitPlatform gfxAndroidPlatform #include "nsXULAppAPI.h" #include <dirent.h> @@ -85,7 +84,8 @@ public: NS_ASSERTION(!aFontEntry->mFilename.IsEmpty(), "can't use AutoFTFace for fonts without a filename"); - FT_Library ft = gfxToolkitPlatform::GetPlatform()->GetFTLibrary(); + FT_Library ft = gfxPlatform::GetPlatform()->GetFTLibrary(); + MOZ_ASSERT(ft); // A relative path (no initial "/") means this is a resource in // omnijar, not an installed font on the device. @@ -256,7 +256,7 @@ FT2FontEntry::CreateFontEntry(const nsAString& aFontName, // eventually deleted. FT_Face face; FT_Error error = - FT_New_Memory_Face(gfxToolkitPlatform::GetPlatform()->GetFTLibrary(), + FT_New_Memory_Face(gfxPlatform::GetPlatform()->GetFTLibrary(), aFontData, aLength, 0, &face); if (error != FT_Err_Ok) { free((void*)aFontData); @@ -974,7 +974,7 @@ gfxFT2FontList::AppendFacesFromFontFile(const nsCString& aFileName, return; } - FT_Library ftLibrary = gfxAndroidPlatform::GetPlatform()->GetFTLibrary(); + FT_Library ftLibrary = gfxPlatform::GetPlatform()->GetFTLibrary(); FT_Face dummy; if (FT_Err_Ok == FT_New_Face(ftLibrary, aFileName.get(), -1, &dummy)) { LOG(("reading font info via FreeType for %s", aFileName.get())); @@ -1126,7 +1126,7 @@ gfxFT2FontList::AppendFacesFromOmnijarEntry(nsZipArchive* aArchive, return; } - FT_Library ftLibrary = gfxAndroidPlatform::GetPlatform()->GetFTLibrary(); + FT_Library ftLibrary = gfxPlatform::GetPlatform()->GetFTLibrary(); FT_Face dummy; if (FT_Err_Ok != FT_New_Memory_Face(ftLibrary, buf.get(), bufSize, 0, &dummy)) { diff --git a/gfx/thebes/gfxFontconfigFonts.h b/gfx/thebes/gfxFontconfigFonts.h index cea9d0dbfaf2..cd59cfc68c62 100644 --- a/gfx/thebes/gfxFontconfigFonts.h +++ b/gfx/thebes/gfxFontconfigFonts.h @@ -55,6 +55,8 @@ public: const uint8_t* aFontData, uint32_t aLength); + static FT_Library GetFTLibrary(); + private: virtual gfxFont *GetFontAt(int32_t i, uint32_t aCh = 0x20); @@ -116,9 +118,6 @@ private: nsIAtom *aLanguage, nsTArray<nsString>& aGenericFamilies); - - friend class gfxSystemFcFontEntry; - static FT_Library GetFTLibrary(); }; #endif /* GFX_FONTCONFIG_FONTS_H */ diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 2e4ec990f8b3..4843554d655b 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -752,6 +752,10 @@ gfxPlatform::Init() NS_RUNTIMEABORT("Could not initialize gfxFontCache"); } +#ifdef MOZ_ENABLE_FREETYPE + Factory::SetFTLibrary(gPlatform->GetFTLibrary()); +#endif + /* Create and register our CMS Override observer. */ gPlatform->mSRGBOverrideObserver = new SRGBOverrideObserver(); Preferences::AddWeakObserver(gPlatform->mSRGBOverrideObserver, GFX_PREF_CMS_FORCE_SRGB); diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index 68bb99ea44e9..5ef792b67a40 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -39,6 +39,7 @@ class nsIAtom; class nsIObserver; class SRGBOverrideObserver; class gfxTextPerfMetrics; +typedef struct FT_LibraryRec_ *FT_Library; namespace mozilla { namespace gl { @@ -681,6 +682,10 @@ public: */ virtual void ImportGPUDeviceData(const mozilla::gfx::GPUDeviceData& aData); + virtual FT_Library GetFTLibrary() { + return nullptr; + } + protected: gfxPlatform(); virtual ~gfxPlatform(); diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp index 9d7f512f27a7..c8661a433111 100644 --- a/gfx/thebes/gfxPlatformGtk.cpp +++ b/gfx/thebes/gfxPlatformGtk.cpp @@ -348,6 +348,16 @@ gfxPlatformGtk::MakePlatformFont(const nsAString& aFontName, aFontData, aLength); } +FT_Library +gfxPlatformGtk::GetFTLibrary() +{ + if (sUseFcFontList) { + return gfxFcPlatformFontList::GetFTLibrary(); + } + + return gfxPangoFontGroup::GetFTLibrary(); +} + bool gfxPlatformGtk::IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags) { diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h index 982390d1867b..d0c6079bd943 100644 --- a/gfx/thebes/gfxPlatformGtk.h +++ b/gfx/thebes/gfxPlatformGtk.h @@ -95,6 +95,8 @@ public: */ virtual void FlushContentDrawing() override; + FT_Library GetFTLibrary() override; + #if (MOZ_WIDGET_GTK == 2) static void SetGdkDrawable(cairo_surface_t *target, GdkDrawable *drawable);

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23970: Printing to a file is broken with Linux content sandboxing enabled
by gk＠torproject.org 15 Dec '17

15 Dec '17

commit e1e2517a187f7a867f819c7294e62d93ad32b1ba Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Nov 27 15:04:21 2017 -0800 Bug 23970: Printing to a file is broken with Linux content sandboxing enabled Ported over firefox patch 997c6b961cd0 (Bug 1329835) --- gfx/thebes/gfxFcPlatformFontList.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 601e7a90cbd6..19471157ba84 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -768,18 +768,20 @@ PreparePattern(FcPattern* aPattern, bool aIsPrinterFont) FcPatternAddBool(aPattern, PRINTING_FC_PROPERTY, FcTrue); } else { #ifdef MOZ_WIDGET_GTK - ApplyGdkScreenFontOptions(aPattern); -#endif + ApplyGdkScreenFontOptions(aPattern); #ifdef MOZ_X11 FcValue value; int lcdfilter; - if (FcPatternGet(aPattern, FC_LCD_FILTER, 0, &value) - == FcResultNoMatch && - GetXftInt(DefaultXDisplay(), "lcdfilter", &lcdfilter)) { - FcPatternAddInteger(aPattern, FC_LCD_FILTER, lcdfilter); + if (FcPatternGet(aPattern, FC_LCD_FILTER, 0, &value) == FcResultNoMatch) { + GdkDisplay* dpy = gdk_display_get_default(); + if (GDK_IS_X11_DISPLAY(dpy) && + GetXftInt(GDK_DISPLAY_XDISPLAY(dpy), "lcdfilter", &lcdfilter)) { + FcPatternAddInteger(aPattern, FC_LCD_FILTER, lcdfilter); + } } -#endif +#endif // MOZ_X11 +#endif // MOZ_WIDGET_GTK } FcDefaultSubstitute(aPattern);

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23970: Printing to a file is broken with Linux content sandboxing enabled
by gk＠torproject.org 15 Dec '17

15 Dec '17

commit 8d7757dbd40f4619f84dc51853c81186a22b0160 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Nov 27 14:41:39 2017 -0800 Bug 23970: Printing to a file is broken with Linux content sandboxing enabled Ported over firefox patch 5b9702d8fe4e (Bug 1309205 Part 3) --- modules/libpref/init/all.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index dd78fec1ee75..198028eeb96c 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1106,7 +1106,7 @@ pref("print.print_edge_right", 0); pref("print.print_edge_bottom", 0); // Print via the parent process. This is only used when e10s is enabled. -#if defined(XP_WIN) || defined(XP_MACOSX) +#if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX) pref("print.print_via_parent", true); #else pref("print.print_via_parent", false);

1 0

[tor-browser-build/master] Bug 24561: Add our scripts to check the authenticode/mar signing
by gk＠torproject.org 14 Dec '17

14 Dec '17

commit c0915fc6a4b51418ace4d5a59f77bb63b57da3d2 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 13 10:53:26 2017 +0000 Bug 24561: Add our scripts to check the authenticode/mar signing --- tools/authenticode_check.sh | 96 +++++++++++++++++++++++++++++++++++++++ tools/marsigning_check.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+) diff --git a/tools/authenticode_check.sh b/tools/authenticode_check.sh new file mode 100755 index 0000000..c94682d --- /dev/null +++ b/tools/authenticode_check.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +# Copyright (c) 2017, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: + +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Let OSSLSIGNCODE point to your osslsigncode binary +# 2) Change into the directory containing the .exe files and the sha256sums-unsigned-build.txt +# 3) Run /path/to/authenticode_check.sh + +if [ -z "$OSSLSIGNCODE" ] +then + echo "The path to your osslsigncode binary is missing!" + exit 1 +fi + +UNSIGNED_BUNDLES=0 +BADSIGNED_BUNDLES=0 + +mkdir tmp + +for f in `ls *.exe`; do + SHA256_TXT=`grep "$f" sha256sums-unsigned-build.txt` + + # Test 1: Is the .exe file still unsigned? I.e. does its SHA-256 sum still + # match the one we had before we signed the .exe file? If so, notify us + # later and exit. + if [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f has still the SHA-256 sum of the unsigned bundle!" + UNSIGNED_BUNDLES=`expr $UNSIGNED_BUNDLES + 1` + fi + + # Test 2: Do we get the old SHA-256 sum after stripping the authenticode + # signature? If not, notify us later and exit. + if [ "$UNSIGNED_BUNDLES" = "0" ] + then + # At least we seem to have attempted to sign the bundle. Let's see if we + # succeeded by stripping the signature. This behavior is reproducible. + # Thus, we know if we don't get the same SHA-256 sum we did not sign the + # bundle correctly. + echo "Trying to strip the authenticode signature of $f..." + ${OSSLSIGNCODE} remove-signature $f tmp/$f + cd tmp + if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f does not have the SHA-256 sum of the unsigned bundle!" + BADSIGNED_BUNDLES=`expr $BADSIGNED_BUNDLES + 1` + fi + cd .. + fi +done + +rm -rf tmp/ + +if ! [ "$UNSIGNED_BUNDLES" = "0" ] +then + echo "We got $UNSIGNED_BUNDLES unsigned bundle(s), exiting..." + exit 1 +fi + +if ! [ "$BADSIGNED_BUNDLES" = "0" ] +then + echo "We got $BADSIGNED_BUNDLES badly signed bundle(s), exiting..." + exit 1 +fi + +echo "The signatures are fine." +exit 0 diff --git a/tools/marsigning_check.sh b/tools/marsigning_check.sh new file mode 100755 index 0000000..41b3b4d --- /dev/null +++ b/tools/marsigning_check.sh @@ -0,0 +1,107 @@ +#!/bin/sh + +# Copyright (c) 2016, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: + +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Let SIGNMAR point to your signmar binary +# 2) Let LD_LIBRARY_PATH point to the mar-tools directory +# 3) Change into the directory containing the MAR files and the +# sha256sums-unsigned-build.txt/sha256sums-unsigned-build.incrementals.txt. +# 4) Run /path/to/marsigning_check.sh + +if [ -z "$SIGNMAR" ] +then + echo "The path to your signmar binary is missing!" + exit 1 +fi + +if [ -z "$LD_LIBRARY_PATH" ] +then + echo "The library search path to your mar-tools directory is missing!" + exit 1 +fi + +UNSIGNED_MARS=0 +BADSIGNED_MARS=0 + +mkdir tmp + +for f in `ls *.mar`; do + case $f in + *.incremental.mar) SHA256_TXT=`grep "$f" \ + sha256sums-unsigned-build.incrementals.txt`;; + *) SHA256_TXT=`grep "$f" sha256sums-unsigned-build.txt`;; + esac + + # Test 1: Is the .mar file still unsigned? I.e. does its SHA-256 sum still + # match the one we had before we signed it? If so, notify us later and exit. + if [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f has still the SHA-256 sum of the unsigned MAR file!" + UNSIGNED_MARS=`expr $UNSIGNED_MARS + 1` + fi + + # Test 2: Do we get the old SHA-256 sum after stripping the MAR signature? If + # not, notify us later and exit. + if [ "$UNSIGNED_MARS" = "0" ] + then + # At least we seem to have attempted to sign the MAR file. Let's see if we + # succeeded by stripping the signature. This behavior is reproducible. + # Thus, we know if we don't get the same SHA-256 sum we did not sign the + # bundle correctly. + echo "Trying to strip the MAR signature of $f..." + ${SIGNMAR} -r $f tmp/$f + cd tmp + if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f does not have the SHA-256 sum of the unsigned MAR file!" + BADSIGNED_MARS=`expr $BADSIGNED_MARS + 1` + fi + cd .. + fi +done + +rm -rf tmp/ + +if ! [ "$UNSIGNED_MARS" = "0" ] +then + echo "We got $UNSIGNED_MARS unsigned MAR file(s), exiting..." + exit 1 +fi + +if ! [ "$BADSIGNED_MARS" = "0" ] +then + echo "We got $BADSIGNED_MARS badly signed MAR file(s), exiting..." + exit 1 +fi + +echo "The signatures are fine." +exit 0

1 0

[tor-launcher/master] Bug 24624: tbb-logo.svg may cause network access
by gk＠torproject.org 14 Dec '17

14 Dec '17

commit c22a773ffaeb0398d8be0119f6e89f3c8161e4aa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Dec 14 10:14:15 2017 -0500 Bug 24624: tbb-logo.svg may cause network access Remove www.w3.org DTD, unused xlink namespace declaration, and "Generator" comment. --- src/chrome/skin/tbb-logo.svg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/chrome/skin/tbb-logo.svg b/src/chrome/skin/tbb-logo.svg index 26cd158..8be32c2 100644 --- a/src/chrome/skin/tbb-logo.svg +++ b/src/chrome/skin/tbb-logo.svg @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 328.6 66.3" enable-background="new 0 0 328.6 66.3" xml:space="preserve"> <g> <g>

1 0

[tor-launcher/master] Bug 24623: revise "country that censors Tor" text
by gk＠torproject.org 14 Dec '17

14 Dec '17

commit 12baf2b089479b3e043dbfad8ac246a5226feeae Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Dec 14 09:51:11 2017 -0500 Bug 24623: revise "country that censors Tor" text List Egypt, China, Turkey as countries that may block Tor. This list was derived from data provided by OONI. --- src/chrome/locale/en/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 240154c..85645d7 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connect "Connect">

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23016: "Print to File" does not create the expected file in non-English locales
by gk＠torproject.org 14 Dec '17

14 Dec '17

commit 8ea9839478bfddd4f078f16c9268edf1755e9cb0 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Nov 15 10:48:38 2017 -0800 Bug 23016: "Print to File" does not create the expected file in non-English locales The Problem: During firefox and Web Content process startup, ::OverrideDefaultLocaleIfNeeded() is called which will conditionally ::setlocale() to "C.UTF-8" or "C" based off of the javascript.use_us_english_locale preference (to prevent fingerprinting based on how dates and what-not are formatted). Sometime after this call in the Web Content process the locale is set to the system's locale which effectively stomps over the work done by the ::OverrideDefaultLocaleIfNeeded() call. As a result, the firefox process and the Web Content process are configured to use different locales; firefox uses "C.UTF-8" while Web Content uses "" (system default). On Linux, the "Print to File" printer is a default GTK printer whose name is localized based off of the process's locale. The GTK print dialog is hosted in the firefox process and therefore the printer name will be 'Print to File.' This process sends this name over to the Web Content process, which iterates over the list of printers and finds one whose name matches. However, as the Web Content process's locale is set to system, its printer names will be localized and in the language of the system, so no printer with the name 'Print to File' will be found, and printing fails. This is why disabling javascript.use_us_english_locale fixes the issue. It also explains why disabling multi-process mode via the browser.tabs.remote.autostart.2 preference fixes the issue; one process means the printer-name is never used as a selector and also means no mismatched locale can happen. The Solution: The fix for this issue is to first check the javascript.use_us_english_locale preference each place in code where setlocale occurs, particularly in the nsLocaleService object which is the particular code path which overrides setlocale in the Web Content process. --- intl/locale/nsLocaleService.cpp | 72 +++++++++++++++++++++++++++------------ xpcom/build/XPCOMInit.cpp | 14 ++++++-- xpcom/io/nsNativeCharsetUtils.cpp | 14 ++++++-- 3 files changed, 73 insertions(+), 27 deletions(-) diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp index 6d45ec9afa2a..e89ff32346cd 100644 --- a/intl/locale/nsLocaleService.cpp +++ b/intl/locale/nsLocaleService.cpp @@ -12,6 +12,7 @@ #include "nsTArray.h" #include "nsString.h" #include "mozilla/UniquePtr.h" +#include "mozilla/Preferences.h" #include <ctype.h> @@ -93,12 +94,20 @@ protected: // nsLocaleService::nsLocaleService(void) { + // conditionally use us english locale when initialization locale objects + const auto use_us_english_locale = + mozilla::Preferences::GetBool("javascript.use_us_english_locale", false); + #ifdef XP_WIN nsAutoString xpLocale; + // 1033 is default english us locale LCID + // https://msdn.microsoft.com/en-us/library/ms912047(v=winembedded.10).aspx + const LCID en_US_lcid = 1033; + // // get the system LCID // - LCID win_lcid = GetSystemDefaultLCID(); + LCID win_lcid = use_us_english_locale ? en_US_lcid : GetSystemDefaultLCID(); NS_ENSURE_TRUE_VOID(win_lcid); nsWin32Locale::GetXPLocale(win_lcid, xpLocale); nsresult rv = NewLocale(xpLocale, getter_AddRefs(mSystemLocale)); @@ -107,7 +116,7 @@ nsLocaleService::nsLocaleService(void) // // get the application LCID // - win_lcid = GetUserDefaultLCID(); + win_lcid = use_us_english_locale ? en_US_lcid : GetUserDefaultLCID(); NS_ENSURE_TRUE_VOID(win_lcid); nsWin32Locale::GetXPLocale(win_lcid, xpLocale); rv = NewLocale(xpLocale, getter_AddRefs(mApplicationLocale)); @@ -118,7 +127,7 @@ nsLocaleService::nsLocaleService(void) NS_ENSURE_TRUE_VOID(resultLocale); // Get system configuration - const char* lang = getenv("LANG"); + const char* lang = use_us_english_locale ? "en-US" : getenv("LANG"); nsAutoString xpLocale, platformLocale; nsAutoString category, category_platform; @@ -127,7 +136,19 @@ nsLocaleService::nsLocaleService(void) for( i = 0; i < LocaleListLength; i++ ) { nsresult result; // setlocale( , "") evaluates LC_* and LANG - char* lc_temp = setlocale(posix_locale_category[i], ""); + const auto current_posix_locale_category = posix_locale_category[i]; + const char* lc_temp = nullptr; + + if (use_us_english_locale) { + lc_temp = setlocale(current_posix_locale_category, "C.UTF-8"); + if (lc_temp == nullptr) { + lc_temp = setlocale(current_posix_locale_category, "C"); + } + } + else { + lc_temp = setlocale(current_posix_locale_category, ""); + } + CopyASCIItoUTF16(LocaleList[i], category); category_platform = category; category_platform.AppendLiteral("##PLATFORM"); @@ -163,30 +184,37 @@ nsLocaleService::nsLocaleService(void) #endif // XP_UNIX #ifdef XP_MACOSX - // Get string representation of user's current locale - CFLocaleRef userLocaleRef = ::CFLocaleCopyCurrent(); - CFStringRef userLocaleStr = ::CFLocaleGetIdentifier(userLocaleRef); - ::CFRetain(userLocaleStr); - - AutoTArray<UniChar, 32> buffer; - int size = ::CFStringGetLength(userLocaleStr); - buffer.SetLength(size + 1); - CFRange range = ::CFRangeMake(0, size); - ::CFStringGetCharacters(userLocaleStr, range, buffer.Elements()); - buffer[size] = 0; - - // Convert the locale string to the format that Mozilla expects - nsAutoString xpLocale(reinterpret_cast<char16_t*>(buffer.Elements())); - xpLocale.ReplaceChar('_', '-'); + nsAutoString xpLocale; + + if (use_us_english_locale) { + xpLocale = NS_LITERAL_STRING("en-US").get(); + } + else { + // Get string representation of user's current locale + CFLocaleRef userLocaleRef = ::CFLocaleCopyCurrent(); + CFStringRef userLocaleStr = ::CFLocaleGetIdentifier(userLocaleRef); + ::CFRetain(userLocaleStr); + + AutoTArray<UniChar, 32> buffer; + int size = ::CFStringGetLength(userLocaleStr); + buffer.SetLength(size + 1); + CFRange range = ::CFRangeMake(0, size); + ::CFStringGetCharacters(userLocaleStr, range, buffer.Elements()); + buffer[size] = 0; + + // Convert the locale string to the format that Mozilla expects + xpLocale = reinterpret_cast<char16_t*>(buffer.Elements()); + xpLocale.ReplaceChar('_', '-'); + + ::CFRelease(userLocaleStr); + ::CFRelease(userLocaleRef); + } nsresult rv = NewLocale(xpLocale, getter_AddRefs(mSystemLocale)); if (NS_SUCCEEDED(rv)) { mApplicationLocale = mSystemLocale; } - ::CFRelease(userLocaleStr); - ::CFRelease(userLocaleRef); - NS_ASSERTION(mApplicationLocale, "Failed to create locale objects"); #endif // XP_MACOSX } diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index c72ea48d77c8..4fe9c93de2ec 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -11,6 +11,7 @@ #include "mozilla/Poison.h" #include "mozilla/SharedThreadPool.h" #include "mozilla/XPCOM.h" +#include "mozilla/Preferences.h" #include "nsXULAppAPI.h" #include "nsXPCOMPrivate.h" @@ -571,11 +572,18 @@ NS_InitXPCOM2(nsIServiceManager** aResult, } #ifndef ANDROID + // If the locale hasn't already been setup by our embedder, - // get us out of the "C" locale and into the system - if (strcmp(setlocale(LC_ALL, nullptr), "C") == 0) { - setlocale(LC_ALL, ""); + // get us out of the "C" locale and into the system, + // but only do so if we aren't force using english locale + if (mozilla::Preferences::GetBool("javascript.use_us_english_locale", false)) { + setlocale(LC_ALL, "C.UTF-8") || setlocale(LC_ALL, "C"); + } else { + if (strcmp(setlocale(LC_ALL, nullptr), "C") == 0) { + setlocale(LC_ALL, ""); + } } + #endif #if defined(XP_UNIX) diff --git a/xpcom/io/nsNativeCharsetUtils.cpp b/xpcom/io/nsNativeCharsetUtils.cpp index e53307af5628..f81c1179256b 100644 --- a/xpcom/io/nsNativeCharsetUtils.cpp +++ b/xpcom/io/nsNativeCharsetUtils.cpp @@ -48,6 +48,7 @@ NS_ShutdownNativeCharsetUtils() #include <stdlib.h> // mbtowc, wctomb #include <locale.h> // setlocale #include "mozilla/Mutex.h" +#include "mozilla/Preferences.h" #include "nscore.h" #include "nsAString.h" #include "nsReadableUtils.h" @@ -316,7 +317,12 @@ nsNativeCharsetConverter::LazyInit() // NS_StartupNativeCharsetUtils, assume we are called early enough that // we are the first to care about the locale's charset. if (!gLock) { - setlocale(LC_CTYPE, ""); + + if (mozilla::Preferences::GetBool("javascript.use_us_english_locale", false)) { + setlocale(LC_CTYPE, "C.UTF-8") || setlocale(LC_CTYPE, "C"); + } else { + setlocale(LC_CTYPE, ""); + } } const char* blank_list[] = { "", nullptr }; const char** native_charset_list = blank_list; @@ -884,7 +890,11 @@ NS_StartupNativeCharsetUtils() // XXX we assume that we are called early enough that we should // always be the first to care about the locale's charset. // - setlocale(LC_CTYPE, ""); + if (mozilla::Preferences::GetBool("javascript.use_us_english_locale", false)) { + setlocale(LC_CTYPE, "C.UTF-8") || setlocale(LC_CTYPE, "C"); + } else { + setlocale(LC_CTYPE, ""); + } nsNativeCharsetConverter::GlobalInit(); }

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 1372072 - Part 1: Spoofing network information API and blocking ontypechange event when 'privacy.resistFingerprinting' is true. r=arthuredelstein, baku
by gk＠torproject.org 14 Dec '17

14 Dec '17

commit a1beadc5b70e1b6e4727506656723684cf3225bf Author: Tim Huang <tihuang(a)mozilla.com> Date: Wed Dec 13 15:29:00 2017 -0200 Bug 1372072 - Part 1: Spoofing network information API and blocking ontypechange event when 'privacy.resistFingerprinting' is true. r=arthuredelstein,baku This patch makes the network information API always returns the default type 'unknown' and blocking the ontypechange event while connection type changed when 'privacy. resistFingerprinting' is true. MozReview-Commit-ID: 4eOdHgAGtyY --HG-- extra : rebase_source : 78449fb4888b787062ff2139e36c219e0eac0b2c --- dom/network/Connection.cpp | 3 ++- dom/network/Connection.h | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dom/network/Connection.cpp b/dom/network/Connection.cpp index 3bf6f40384a6..cc06b5e14b6a 100644 --- a/dom/network/Connection.cpp +++ b/dom/network/Connection.cpp @@ -78,7 +78,8 @@ Connection::Notify(const hal::NetworkInformation& aNetworkInfo) UpdateFromNetworkInfo(aNetworkInfo); - if (previousType == mType) { + if (previousType == mType || + nsContentUtils::ShouldResistFingerprinting()) { return; } diff --git a/dom/network/Connection.h b/dom/network/Connection.h index 907aea144bc0..19e00d93c907 100644 --- a/dom/network/Connection.h +++ b/dom/network/Connection.h @@ -13,6 +13,7 @@ #include "mozilla/dom/NetworkInformationBinding.h" #include "nsCycleCollectionParticipant.h" #include "nsINetworkProperties.h" +#include "nsContentUtils.h" namespace mozilla { @@ -44,7 +45,11 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override; - ConnectionType Type() const { return mType; } + ConnectionType Type() const + { + return nsContentUtils::ShouldResistFingerprinting() ? + static_cast<ConnectionType>(ConnectionType::Unknown) : mType; + } IMPL_EVENT_HANDLER(typechange)

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 1372072 - Part 2: Add a test case for check whether network information API has been spoofed correctly when 'privacy.resistFingerprinting' is true. r=arthuredelstein, baku
by gk＠torproject.org 14 Dec '17

14 Dec '17

commit a72faadea544a71ae5ca95ec816f2684c205b56a Author: Tim Huang <tihuang(a)mozilla.com> Date: Wed Dec 13 15:35:50 2017 -0200 Bug 1372072 - Part 2: Add a test case for check whether network information API has been spoofed correctly when 'privacy.resistFingerprinting' is true. r=arthuredelstein,baku This adds a test case to test that network information is correctly spoofed when 'privacy.resistFingerprinting' is true. Firefox ESR 52 does not have the navigation object inside workers. Thus, the worker test was removed. MozReview-Commit-ID: Lt6HZlFrcja --HG-- extra : rebase_source : 70d44115532549814af9fce3af9fe379e36bca80 --- .../resistfingerprinting/test/browser/browser.ini | 1 + .../test/browser/browser_netInfo.js | 32 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 4b81c91d8c6c..b596f437caa2 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -4,6 +4,7 @@ support-files = file_dummy.html head.js +[browser_netInfo.js] [browser_roundedWindow_dialogWindow.js] [browser_roundedWindow_newWindow.js] [browser_roundedWindow_open_max.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_netInfo.js b/browser/components/resistfingerprinting/test/browser/browser_netInfo.js new file mode 100644 index 000000000000..7c6114212ffd --- /dev/null +++ b/browser/components/resistfingerprinting/test/browser/browser_netInfo.js @@ -0,0 +1,32 @@ +/** + * Bug 1372072 - A test case for check whether network information API has been + * spoofed correctly when 'privacy.resistFingerprinting' is true; + */ + +const TEST_PATH = "http://example.net/browser/browser/" + + "components/resistfingerprinting/test/browser/" + +async function testWindow() { + // Open a tab to test network information in a content. + let tab = await BrowserTestUtils.openNewForegroundTab( + gBrowser, TEST_PATH + "file_dummy.html"); + + await ContentTask.spawn(tab.linkedBrowser, null, async function() { + ok("connection" in content.navigator, "navigator.connection should exist"); + + is(content.navigator.connection.type, "unknown", "The connection type is spoofed correctly"); + }); + + await BrowserTestUtils.removeTab(tab); +} + +add_task(async function runTest() { + await SpecialPowers.pushPrefEnv({"set": + [ + ["privacy.resistFingerprinting", true], + ["dom.netinfo.enabled", true] + ] + }); + + await testWindow(); +});

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 24398: Plugin-container process exhausts memory
by gk＠torproject.org 13 Dec '17

13 Dec '17

commit cef2fe28a238d7e445d7c5b4292bfe27c1b71bca Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 13 14:15:57 2017 +0000 Bug 24398: Plugin-container process exhausts memory The plugin-container process can thrash/crash due to increasing memory consumption after our workaround for bug 24052. The patch provided by a cypherpunk (bug thanks!) deals with that as far as the Developer Tools are concerned. --- devtools/shared/DevToolsUtils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js index d44184fd6b8e..926420154fe5 100644 --- a/devtools/shared/DevToolsUtils.js +++ b/devtools/shared/DevToolsUtils.js @@ -559,7 +559,8 @@ function newChannelForURL(url, { policy, window, principal }) { try { return NetUtil.newChannel(channelOptions); - } catch (e) { + } catch (e if e.name === "NS_ERROR_UNKNOWN_PROTOCOL" && + !(url.startsWith("file://"))) { // In xpcshell tests on Windows, nsExternalProtocolHandler::NewChannel() // can throw NS_ERROR_UNKNOWN_PROTOCOL if the external protocol isn't // supported by Windows, so we also need to handle the exception here if

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23104: Add a default line height compensation
by gk＠torproject.org 13 Dec '17

13 Dec '17

commit 89d8bc54cfe6a4cd999ab1f16f434c4fb809b643 Author: Igor Oliveira <igor.oliveira(a)posteo.net> Date: Sun Dec 10 18:16:59 2017 -0200 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. --- layout/generic/ReflowInput.cpp | 16 +++++++++---- tbb-tests/mochitest.ini | 1 + tbb-tests/test_tor_bug23104.html | 51 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index 42f4a24b5314..cda602c50431 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -30,6 +30,7 @@ #include "CounterStyleManager.h" #include <algorithm> #include "mozilla/dom/HTMLInputElement.h" +#include "nsContentUtils.h" #ifdef DEBUG #undef NOISY_VERTICAL_ALIGN @@ -2759,7 +2760,7 @@ ReflowInput::CalculateBlockSideMargins(nsIAtom* aFrameType) // For risk management, we use preference to control the behavior, and // eNoExternalLeading is the old behavior. static nscoord -GetNormalLineHeight(nsFontMetrics* aFontMetrics) +GetNormalLineHeight(nsIContent* aContent, nsFontMetrics* aFontMetrics) { NS_PRECONDITION(nullptr != aFontMetrics, "no font metrics"); @@ -2768,6 +2769,12 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics) nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); + + if (nsContentUtils::ShouldResistFingerprinting() && + !aContent->IsInChromeDocument()) { + return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR); + } + switch (GetNormalLineHeightCalcControl()) { case eIncludeExternalLeading: normalLineHeight = emHeight+ internalLeading + externalLeading; @@ -2786,7 +2793,8 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics) } static inline nscoord -ComputeLineHeight(nsStyleContext* aStyleContext, +ComputeLineHeight(nsIContent* aContent, + nsStyleContext* aStyleContext, nscoord aBlockBSize, float aFontSizeInflation) { @@ -2821,7 +2829,7 @@ ComputeLineHeight(nsStyleContext* aStyleContext, RefPtr<nsFontMetrics> fm = nsLayoutUtils:: GetFontMetricsForStyleContext(aStyleContext, aFontSizeInflation); - return GetNormalLineHeight(fm); + return GetNormalLineHeight(aContent, fm); } nscoord @@ -2844,7 +2852,7 @@ ReflowInput::CalcLineHeight(nsIContent* aContent, NS_PRECONDITION(aStyleContext, "Must have a style context"); nscoord lineHeight = - ComputeLineHeight(aStyleContext, aBlockBSize, aFontSizeInflation); + ComputeLineHeight(aContent, aStyleContext, aBlockBSize, aFontSizeInflation); NS_ASSERTION(lineHeight >= 0, "ComputeLineHeight screwed up"); diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini index 3d2e7c9db803..fca972a51211 100644 --- a/tbb-tests/mochitest.ini +++ b/tbb-tests/mochitest.ini @@ -10,3 +10,4 @@ support-files = [test_tor_bug2875.html] [test_tor_bug4755.html] [test_tor_bug5856.html] +[test_tor_bug23104.html] diff --git a/tbb-tests/test_tor_bug23104.html b/tbb-tests/test_tor_bug23104.html new file mode 100644 index 000000000000..ae73a3446037 --- /dev/null +++ b/tbb-tests/test_tor_bug23104.html @@ -0,0 +1,51 @@ +<!DOCTYPE HTML> +<meta charset="UTF-8"> +<html> +<head> + <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> + <style type="text/css"> + span { + background-color: #000; + color: #fff; + font-size: 16.5px; + } + </style> +</head> +<body> +<span id="test1">Test1</span> +<span id="test2">كلمة</span> +<span id="test3">ação</span> +<script type="application/javascript;version=1.7"> + +let setPref = function* (key, value) { + return new Promise(function(resolve, reject) { + SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); + }); +} + +function getStyle(el, styleprop) { + el = document.getElementById(el); + return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); +} + +function validateElement(elementName, isFingerprintResistent) { + var fontSize = getStyle(elementName, 'font-size'); + var lineHeight = getStyle(elementName, 'line-height'); + var validationCb = isFingerprintResistent ? is : isnot; + validationCb(parseFloat(lineHeight), parseFloat(fontSize) * 1.2, 'Line Height validation'); +} + +add_task(function* () { + for (let resistFingerprintingValue of [true, false]) { + yield setPref("privacy.resistFingerprinting", resistFingerprintingValue); + for (let elementId of ['test1', 'test2', 'test3']) { + validateElement(elementId, resistFingerprintingValue); + } + } +}); + +</script> +</body> +</html>

1 0

[tor-browser-build/master] Update OpenSSL to 1.0.2n
by gk＠torproject.org 13 Dec '17

13 Dec '17

commit 813aefd174f31ddbbc473be64aa66f7fbc08e301 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 13 11:47:14 2017 +0000 Update OpenSSL to 1.0.2n --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 8c6ccbf..378ee53 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2l +version: 1.0.2n filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -25,4 +25,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c + sha256sum: 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe

1 0

[tor-browser-build/master] Bug 24475: Add support for Windows 64 to update-responses
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit 5a274fb97d317860e59592ec37a6ce9f3a007fd9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 6 13:38:49 2017 +0100 Bug 24475: Add support for Windows 64 to update-responses --- projects/release/update_responses_config.yml | 4 +++- tools/update-responses/update_responses | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 8d945dc..01c6950 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -3,7 +3,8 @@ tmp_dir: '[% c("tmp_dir") %]' appname_marfile: tor-browser appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser -appname_bundle_win: torbrowser-install +appname_bundle_win32: torbrowser-install +appname_bundle_win64: torbrowser-install-win64 releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser @@ -17,6 +18,7 @@ build_targets: - WINNT_x86-gcc3 - WINNT_x86-gcc3-x86 - WINNT_x86-gcc3-x64 + win64: WINNT_x86_64-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 9303ed1..b68e46a 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -136,7 +136,9 @@ sub get_version_downloads { ($os, $lang) = ('osx64', $1); } elsif ($file =~ m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) { ($os, $lang) = ($1, $2); - } elsif ($file =~ m/^$config->{appname_bundle_win}-${version}_(.+).exe$/) { + } elsif ($file =~ m/^$config->{appname_bundle_win64}-${version}_(.+).exe$/) { + ($os, $lang) = ('win64', $1); + } elsif ($file =~ m/^$config->{appname_bundle_win32}-${version}_(.+).exe$/) { ($os, $lang) = ('win32', $1); } else { next;

1 0

[tor-browser-build/master] Release preparations for 7.5a9 (build4)
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit 66f424078b1971d393406165f79d050e78d574f2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:51:42 2017 +0000 Release preparations for 7.5a9 (build4) Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index d3cc063..4821baf 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 57e1338..34947db 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.11.21 +version: 2017.12.6 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c92b0c0..092d36e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,8 @@ -Tor Browser 7.5a9 -- December 08 2017 +Tor Browser 7.5a9 -- December 09 2017 * All Platforms * Update Firefox to 52.5.2esr * Update Tor to 0.3.2.6-alpha - * Update HTTPS-Everywhere to 2017.11.21 + * Update HTTPS-Everywhere to 2017.12.6 * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 diff --git a/rbm.conf b/rbm.conf index 504c20b..5714e1f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Revert "Getting 7.5a9 built earlier using the 52.5.1esr lang packs"
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit 69b54fd0e9ed1a806b33ffe47108c4ae59fd2034 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:37:33 2017 +0000 Revert "Getting 7.5a9 built earlier using the 52.5.1esr lang packs" This reverts commit 1ea5f33989925e3cc0217b45623f7044461a7972. No need anymore for this hack, we use the 52.5.2esr ones provided. --- projects/firefox-langpacks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index c5384e3..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -3,7 +3,7 @@ version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' var: - ff_version: 52.5.1esr + ff_version: '[% pc("firefox", "var/firefox_version") %]' ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.11
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit e66f55b7aebe0536299dada5882acaffb6dbe3ad Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:04:25 2017 +0000 Release preparations for 7.0.11 Updated again Changelog, versions file, and config.yml --- Bundle-Data/Docs/ChangeLog.txt | 10 +++++----- gitian/versions | 14 +++++++------- tools/update-responses/config.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1abe1ba..12dc24f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,9 @@ -Tor Browser 7.0.11 -- November 30 2017 +Tor Browser 7.0.11 -- December 09 2017 * All Platforms - * Update Firefox to 52.5.1esr - * Bug 24040: Tor Browser crashes at riot.im/app - * Update HTTPS-Everywhere to 2017.11.21 - * Update NoScript to 5.1.7 + * Update Firefox to 52.5.2esr + * Update Tor to 0.3.1.9 + * Update HTTPS-Everywhere to 2017.12.6 + * Update NoScript to 5.1.8.1 Tor Browser 7.0.10 -- November 14 2017 * All Platforms diff --git a/gitian/versions b/gitian/versions index 26545b9..b3295ca 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.5.1esr +FIREFOX_VERSION=52.5.2esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.1.8 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2-build1 +TOR_TAG=tor-0.3.1.9 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.10 -HTTPSE_TAG=2017.11.21 +HTTPSE_TAG=2017.12.6 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.7-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b +NOSCRIPT_HASH=8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index dda82ef..735b713 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -23,7 +23,7 @@ channels: release: 7.0.11 versions: 7.0.11: - platformVersion: 52.5.1 + platformVersion: 52.5.2 detailsURL: https://blog.torproject.org/tor-browser-7011-released incremental_from: - 7.0.10

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-1] Bug 24478: Enable debug assertions and tests in our ASan builds
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit e17e2c643eea02103a25470b946e9e6c4c11b24c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 1 12:50:57 2017 +0000 Bug 24478: Enable debug assertions and tests in our ASan builds --- .mozconfig-asan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 096bcc6ef634..18d334e90507 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -34,8 +34,8 @@ ac_add_options --enable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug +ac_add_options --enable-tests +ac_add_options --enable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_21998_v4'
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit d0f2bcf4697fe06cb034e412bd6d262ac12d3a3e Merge: 826d27b 055e751 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:55:46 2017 +0000 Merge remote-tracking branch 'boklm/bug_21998_v4' Makefile | 12 ++++++++++++ README.MAKEFILE | 4 ++++ projects/firefox/build | 6 ++++++ projects/release/config | 6 +++++- projects/tor-browser/RelativeLink/start-tor-browser | 7 +++++++ projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 4 +++- projects/tor/build | 1 + rbm.conf | 7 +++++++ 9 files changed, 49 insertions(+), 2 deletions(-) diff --cc projects/tor-browser/config index 9aff47d,42f77e4..d2085b0 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@@ -66,10 -66,12 +66,12 @@@ input_files name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b + sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 - - filename: RelativeLink + - filename: 'RelativeLink/start-tor-browser.desktop' + enable: '[% c("var/linux") %]' + - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg

1 0

[tor-browser-build/master] Bug 21998: add option for debug builds
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 055e751493bedd4914605f418aee590ba79f96d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 23 14:47:13 2017 +0100 Bug 21998: add option for debug builds --- Makefile | 12 ++++++++++++ README.MAKEFILE | 4 ++++ projects/firefox/build | 6 ++++++ projects/release/config | 6 +++++- projects/tor-browser/RelativeLink/start-tor-browser | 7 +++++++ projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 4 +++- projects/tor/build | 1 + rbm.conf | 7 +++++++ 9 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 54965ef..2707d41 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ release: submodule-update release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 +release-linux-x86_64-debug: submodule-update + $(rbm) build release --target release --target torbrowser-linux-x86_64-debug + release-linux-i686: submodule-update $(rbm) build release --target release --target torbrowser-linux-i686 @@ -26,6 +29,9 @@ alpha: submodule-update alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 +alpha-linux-x86_64-debug: submodule-update + $(rbm) build release --target alpha --target torbrowser-linux-x86_64-debug + alpha-linux-i686: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-i686 @@ -44,6 +50,9 @@ nightly: submodule-update nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 +nightly-linux-x86_64-debug: submodule-update + $(rbm) build release --target nightly --target torbrowser-linux-x86_64-debug + nightly-linux-i686: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-i686 @@ -80,6 +89,9 @@ testbuild: submodule-update testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 +testbuild-linux-x86_64-debug: submodule-update + $(rbm) build release --target testbuild --target torbrowser-linux-x86_64-debug + testbuild-linux-i686: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-i686 diff --git a/README.MAKEFILE b/README.MAKEFILE index 98137b2..8094651 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -50,6 +50,10 @@ locale is created, without mar files. By default it is based on the alpha channel, but you can change that by editing rbm.conf.local. The resulting build can be found in directory testbuild. +{release,alpha,nightly,testbuild}-linux-x86_64-debug +---------------------------------------------------- +Create a debug build for Linux x86_64 with debug features such as ASan. + fetch ----- Fetch new commits from all components. This is useful when you want to diff --git a/projects/firefox/build b/projects/firefox/build index 13142e0..ed559b0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -49,6 +49,12 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c("version") %] mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig +[% IF c("var/asan") -%] + mv -f .mozconfig-asan .mozconfig + # Without disabling LSan our build is blowing up: + # https://bugs.torproject.org/10599#comment:52 + export ASAN_OPTIONS="detect_leaks=0" +[% END -%] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt)) if [ -z $MOZ_BUILD_DATE ] diff --git a/projects/release/config b/projects/release/config index 674ec80..e53ea43 100644 --- a/projects/release/config +++ b/projects/release/config @@ -17,6 +17,10 @@ targets: torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 + torbrowser-linux-x86_64-debug: + var: + torbrowser-linux-x86_64: 1 + debug-build: '-debug' torbrowser-linux-i686: var: torbrowser-linux-i686: 1 @@ -77,7 +81,7 @@ input_files: enable: '[% c("var/torbrowser-linux-x86_64") %]' target: - '[% c("var/build_target") %]' - - torbrowser-linux-x86_64 + - 'torbrowser-linux-x86_64[% c("var/debug-build") %]' - name: sandbox-linux-x86_64 project: sandbox diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 2dd40fc..94a8c99 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -272,6 +272,13 @@ LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH export SELFRANDO_write_layout_file= +[% IF c("var/asan") -%] +# We need to disable LSan which is enabled by default now. Otherwise we'll get +# a crash during shutdown: https://bugs.torproject.org/10599#comment:59 +ASAN_OPTIONS="detect_leaks=0" +export ASAN_OPTIONS +[% END -%] + function setControlPortPasswd() { local ctrlPasswd=$1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 56d6294..f8f1356 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -70,6 +70,10 @@ tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_f [% IF c("var/linux") %] cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ cp RelativeLink/start-tor-browser.desktop ${TB_STAGE_DIR}/ + cat > ${TB_STAGE_DIR}/Browser/start-tor-browser << 'RBM_TB_EOF' +[% INCLUDE 'RelativeLink/start-tor-browser' -%] +RBM_TB_EOF + chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index eb0a5d0..42f77e4 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -69,7 +69,9 @@ input_files: - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b - - filename: RelativeLink + - filename: 'RelativeLink/start-tor-browser.desktop' + enable: '[% c("var/linux") %]' + - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg diff --git a/projects/tor/build b/projects/tor/build index 24617ce..ac51782 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -57,6 +57,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ + [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] diff --git a/rbm.conf b/rbm.conf index 4f74450..5abc5ff 100644 --- a/rbm.conf +++ b/rbm.conf @@ -130,6 +130,10 @@ targets: torbrowser-linux-x86_64: - linux-x86_64 - linux + torbrowser-linux-x86_64-debug: + - linux-debug + - linux-x86_64 + - linux torbrowser-linux-i686: - linux-i686 - linux @@ -171,6 +175,9 @@ targets: - libtool - zip - unzip + linux-debug: + var: + asan: 1 torbrowser-windows-i686: - windows-i686

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-1] Bug 21925: Don't compile with ASan and FORTIFY_SOURCE
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 1b16d85c3fb36565a8f36bb7c9e4a5890b65c143 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 5 19:35:47 2017 +0000 Bug 21925: Don't compile with ASan and FORTIFY_SOURCE ASan and FORTIFY_SOURCE are not compatible with each other right now. Thus, we make sure that we have FORTIFY_SOURCE disabled in case the sanitizer is used. See #21925 for more details. --- build/autoconf/sanitize.m4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/autoconf/sanitize.m4 b/build/autoconf/sanitize.m4 index 3193d5c624cc..272bf0cda69a 100644 --- a/build/autoconf/sanitize.m4 +++ b/build/autoconf/sanitize.m4 @@ -32,8 +32,10 @@ if test -n "$MOZ_ASAN"; then CXXFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CXXFLAGS" fi fi - CFLAGS="-fsanitize=address $CFLAGS" - CXXFLAGS="-fsanitize=address $CXXFLAGS" + # ASan and FORTIFY_SOURCE are not compatible yet. Let's make sure we are + # compiling without FORTIFY_SOURCE if ASan is enabled, see #21925. + CFLAGS="-fsanitize=address $CFLAGS -U_FORTIFY_SOURCE" + CXXFLAGS="-fsanitize=address $CXXFLAGS -U_FORTIFY_SOURCE" if test -z "$CLANG_CL"; then LDFLAGS="-fsanitize=address $LDFLAGS" fi

1 0

[tor-browser-build/master] Update NoScript
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 90fc7e48dcda13988516e83ff9bfb16939472804 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:26:27 2017 +0000 Update NoScript --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index eb0a5d0..9aff47d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b + sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-build/master] Preparing build3 for 7.5a9
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 826d27b49fb16d0188efedd6bca7962d14abba16 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:27:58 2017 +0000 Preparing build3 for 7.5a9 Changelog update to pick up new release date and newer NoScript version. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c7ac62f..c92b0c0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,9 @@ -Tor Browser 7.5a9 -- December 05 2017 +Tor Browser 7.5a9 -- December 08 2017 * All Platforms * Update Firefox to 52.5.2esr * Update Tor to 0.3.2.6-alpha * Update HTTPS-Everywhere to 2017.11.21 - * Update NoScript to 5.1.7 + * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 Tor Browser 7.5a8 -- November 15 2017 diff --git a/rbm.conf b/rbm.conf index 4f74450..6e0790a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Getting 7.5a9 built earlier using the 52.5.1esr lang packs
by gk＠torproject.org 02 Dec '17

02 Dec '17

commit 1ea5f33989925e3cc0217b45623f7044461a7972 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:23:30 2017 +0000 Getting 7.5a9 built earlier using the 52.5.1esr lang packs --- projects/firefox-langpacks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..c5384e3 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -3,7 +3,7 @@ version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' var: - ff_version: '[% pc("firefox", "var/firefox_version") %]' + ff_version: 52.5.1esr ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

1 0

[tor-browser-build/master] Preparing build2 for 7.5a9
by gk＠torproject.org 02 Dec '17

02 Dec '17

commit a718f53f4667e679cabf5d9bc42a0f6a75c3127d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:24:41 2017 +0000 Preparing build2 for 7.5a9 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- projects/tor/config | 2 +- rbm.conf | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0123357..d3cc063 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.1 + firefox_platform_version: 52.5.2 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9d9a975..c7ac62f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,7 @@ -Tor Browser 7.5a9 -- November 30 2017 +Tor Browser 7.5a9 -- December 05 2017 * All Platforms - * Update Firefox to 52.5.1esr - * Bug 24040: Tor Browser crashes at riot.im/app - * Update Tor to 0.3.2.5-alpha + * Update Firefox to 52.5.2esr + * Update Tor to 0.3.2.6-alpha * Update HTTPS-Everywhere to 2017.11.21 * Update NoScript to 5.1.7 * Update sandboxed-tor-browser to 0.0.16 diff --git a/projects/tor/config b/projects/tor/config index c49ebb5..f662561 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.5-alpha +version: 0.3.2.6-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index 62b7902..4f74450 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 24477: Fix generation of Windows 64 mar files
by gk＠torproject.org 01 Dec '17

01 Dec '17

commit 0abccfe4258218612f38ac1c2d762c319781386f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 1 00:48:20 2017 +0100 Bug 24477: Fix generation of Windows 64 mar files --- projects/tor-browser/build | 5 +++++ projects/tor-browser/config | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 022d6e9..56d6294 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions # Extract the MAR tools. unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip MARTOOLS=$rootdir/mar-tools +[% IF c("var/windows-x86_64") -%] + # Workaround for bug 24477 + rm -Rf $MARTOOLS + unzip -d $rootdir $rootdir/mar-tools-linux32.zip +[% END -%] mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c00af05..eb0a5d0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -85,3 +85,9 @@ input_files: enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' + # Workaround for bug 24477 + - URL: https://archive.torproject.org/tor-package-archive/torbrowser/7.5a7/mar-too… + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: torbrowser.gpg + enable: '[% c("var/windows-x86_64") %]'

1 0

[tor-browser-build/master] Release preparations for 7.5a9
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit 9d501237c3f8269ce7ea97787bf5773d452c3e5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 08:57:10 2017 +0000 Release preparations for 7.5a9 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/sandbox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 7 +++---- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 5b64726..0123357 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.0 + firefox_platform_version: 52.5.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 237272b..57e1338 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.10.30 +version: 2017.11.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/sandbox/config b/projects/sandbox/config index 03b6f6d..a7ed768 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.15 +version: 0.0.16 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e458f61..9d9a975 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 7.5a9 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update Tor to 0.3.2.5-alpha + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + * Update sandboxed-tor-browser to 0.0.16 + Tor Browser 7.5a8 -- November 15 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 06400be..c00af05 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c + sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor/config b/projects/tor/config index e704f13..c49ebb5 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.4-alpha +version: 0.3.2.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index f4fbb08..62b7902 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a8' - torbrowser_build: 'build3' + torbrowser_version: '7.5a9' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a6 - - 7.5a7 + - 7.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.11
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit fd56a5b5d2c822166baaf8bfb7baeef404e6b51a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 07:47:32 2017 +0000 Release preparations for 7.0.11 Versions bump, changelog update, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cecf4e9..1abe1ba 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 7.0.11 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + Tor Browser 7.0.10 -- November 14 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/gitian/versions b/gitian/versions index 1f08327..26545b9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.5.0esr +FIREFOX_VERSION=52.5.1esr TORBROWSER_UPDATE_CHANNEL=release @@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.8 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.10 -HTTPSE_TAG=2017.10.30 +HTTPSE_TAG=2017.11.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.7-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c +NOSCRIPT_HASH=617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 628b131..dda82ef 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.10 + release: 7.0.11 versions: - 7.0.10: - platformVersion: 52.5.0 - detailsURL: https://blog.torproject.org/tor-browser-7010-released + 7.0.11: + platformVersion: 52.5.1 + detailsURL: https://blog.torproject.org/tor-browser-7011-released incremental_from: - - 7.0.8 - - 7.0.9 + - 7.0.10 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-build/master] Bug 24361: Bump rbm commit to pick up a fixup for 24361
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 57b65bcc24372b0d7eaff35bd8cf5089fd33b035 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:46:01 2017 +0000 Bug 24361: Bump rbm commit to pick up a fixup for 24361 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a5a1748..5c89374 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88 +Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438

1 0

[rbm/master] fixup! Bug 24361: use Path::Tiny instead of File::Slurp
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 5c89374df7957238a9565c0b938ee3f30f880438 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:41:34 2017 +0000 fixup! Bug 24361: use Path::Tiny instead of File::Slurp --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b2ef57f..73b7d6c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -707,7 +707,7 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && $input_file->{sha256sum} - && $t->('sha256sum') ne sha256_hex(read_file($fname))) { + && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { $fname = undef; } if ($action eq 'input_files_id') {

1 0

[tor-browser-build/master] Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny)
by boklm＠torproject.org 27 Nov '17

27 Nov '17

commit 39b88a7e8b03877bf478cafd1b72e9abc5694ca6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 27 12:33:05 2017 +0100 Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny) --- README | 4 ++-- tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 9639d2e..a449f9d 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ You also need a few perl modules installed: - IO::Handle - IO::CaptureOutput - File::Temp -- File::Tiny +- Path::Tiny - File::Path - File::Copy::Recursive - String::ShellQuote @@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libfile-tiny-perl \ + libio-captureoutput-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index de8cce3..f27c6cf 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -12,7 +12,7 @@ - libio-handle-util-perl - libio-all-perl - libio-captureoutput-perl - - libfile-tiny-perl + - libpath-tiny-perl - libstring-shellquote-perl - libsort-versions-perl - libdigest-sha-perl

1 0

[tor-browser-build/master] Bug 24361: Bump rbm commit
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit a6d54303ad89af777a4994dc27d0ae90945f090c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:17:30 2017 +0000 Bug 24361: Bump rbm commit Furthermore we adapt the README and our ansible main.yml to take care of removing File::Slurp from our build dependencies and replacing it with Path::Tiny --- README | 4 ++-- rbm | 2 +- tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 5b4a2bc..9639d2e 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ You also need a few perl modules installed: - IO::Handle - IO::CaptureOutput - File::Temp -- File::Slurp +- File::Tiny - File::Path - File::Copy::Recursive - String::ShellQuote @@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libfile-slurp-perl \ + libio-captureoutput-perl libfile-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc diff --git a/rbm b/rbm index 236fcaa..a5a1748 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 236fcaac2012531330f21d2e9cce49a534a03b60 +Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88 diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index f3a857c..de8cce3 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -12,7 +12,7 @@ - libio-handle-util-perl - libio-all-perl - libio-captureoutput-perl - - libfile-slurp-perl + - libfile-tiny-perl - libstring-shellquote-perl - libsort-versions-perl - libdigest-sha-perl

1 0

[rbm/master] Bug 24361: fix handling of wide characters in sha256
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 134cad4e79471d7baa82f00b4a6e2d7f7d11868a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 20 17:55:23 2017 +0100 Bug 24361: fix handling of wide characters in sha256 The sha256_hex function gives an error if a string contains wide characters. To avoid this we first encode the string to utf8 (which transforms it to a sequence of octets), before passing it to sha256_hex. --- lib/RBM.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 96a1b9b..3134efe 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -2,6 +2,7 @@ package RBM; use warnings; use strict; +use Encode qw(encode); use Cwd qw(getcwd); use YAML::XS qw(LoadFile); use Template; @@ -639,7 +640,9 @@ sub process_template { tmpl => sub { process_template($project, $_[0], $dest_dir) }, shell_quote => \&shell_quote, versioncmp => \&versioncmp, - sha256 => \&sha256_hex, + sha256 => sub { + return sha256_hex(encode("utf8", $_[0])); + }, sha256file => \&sha256file, fileparse => \&fileparse, ENV => \%ENV,

1 0

[rbm/master] Merge remote-tracking branch 'boklm/bug_24361'
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit a5a1748894ae3e84cb81467b972010969f1b5c88 Merge: 6406e06 8b6831b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:06:25 2017 +0000 Merge remote-tracking branch 'boklm/bug_24361' lib/RBM.pm | 69 ++++++++++++++++++++++++++++++++------------------------------ test.pl | 4 ++-- 2 files changed, 38 insertions(+), 35 deletions(-) diff --cc lib/RBM.pm index 7850817,9080ccf..b2ef57f --- a/lib/RBM.pm +++ b/lib/RBM.pm @@@ -836,10 -832,12 +839,10 @@@ sub input_files if $input_file->{project}; exit_error("Missing filename:\n" . pp($input_file)) unless $name; my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir); - $need_dl = input_file_id_need_dl($input_file, $t, $fname) - if $action eq 'input_files_id'; my $file_gpg_id = gpg_id($t->('file_gpg_id')); - if ($need_dl && (!$fname || $t->('refresh_input'))) { + if (input_file_need_dl($input_file, $t, $fname, $action)) { if ($t->('content')) { - write_file("$proj_out_dir/$name", $t->('content')); + path("$proj_out_dir/$name")->spew_utf8($t->('content')); } elsif ($t->('URL')) { urlget($project, {%$input_file, filename => $name}, 1); } elsif ($t->('exec')) {

1 0

[rbm/master] Bug 24361: use Path::Tiny instead of File::Slurp
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 8b6831b36becc697fc53e61cac058d18096ea4b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 21 17:13:01 2017 +0100 Bug 24361: use Path::Tiny instead of File::Slurp When a build script contains some wide character, rbm fails with an error: Wide character in syswrite at /usr/share/perl5/File/Slurp.pm line 506. This is because write_file from File::Slurp which we use to write the build scripts is encoding files to latin-1 by default. While fixing this, switching to Path::Tiny instead of File::Slurp seems like a good idea: http://blogs.perl.org/users/leon_timmermans/2015/08/fileslurp-is-broken-and… Switching to Path::Tiny is also improving performance: When using File::Slurp: $ time ./rbm/rbm showconf --target alpha --target torbrowser-linux-x86_64 tor-browser var/build_id 82b8cb real 0m28.543s user 0m24.448s sys 0m3.956s When using Path::Tiny: $ time ~/rbm/rbm showconf --target alpha --target torbrowser-linux-x86_64 tor-browser var/build_id 82b8cb real 0m15.745s user 0m13.940s sys 0m1.940s The path function in lib/RBM.pm is conflicting with the path constructor from Path::Tiny, so we rename it to rbm_path. --- lib/RBM.pm | 64 +++++++++++++++++++++++++++++++------------------------------- test.pl | 4 ++-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 3134efe..9080ccf 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -2,6 +2,7 @@ package RBM; use warnings; use strict; +use Path::Tiny; use Encode qw(encode); use Cwd qw(getcwd); use YAML::XS qw(LoadFile); @@ -12,7 +13,6 @@ use IO::CaptureOutput qw(capture_exec); use File::Temp; use File::Copy; use File::Copy::Recursive qw(fcopy); -use File::Slurp; use File::Path qw(make_path); use File::Basename; use String::ShellQuote; @@ -50,7 +50,7 @@ sub load_config { $config->{step} = 'rbm_init'; $config->{opt} = {}; my $pdir = $config->{projects_dir} || $config->{default}{projects_dir}; - foreach my $p (glob path($pdir) . '/*') { + foreach my $p (glob rbm_path($pdir) . '/*') { next unless -f "$p/config"; $config->{projects}{basename($p)} = load_config_file("$p/config"); } @@ -65,7 +65,7 @@ sub load_system_config { sub load_local_config { my ($project) = @_; my $cfile = project_config($project ? $project : 'undef', 'localconf_file'); - $cfile = path($cfile); + $cfile = rbm_path($cfile); $config->{local} = -f $cfile ? load_config_file($cfile) : {}; } @@ -80,7 +80,7 @@ sub set_default_env { %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH'; } -sub path { +sub rbm_path { my ($path, $basedir) = @_; $basedir //= $config->{basedir}; return ( $path =~ m|^/| ) ? $path : "$basedir/$path"; @@ -271,7 +271,7 @@ sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); - write_file($tmp, $w); + path($tmp)->spew_utf8($w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 || exit_error 'Error setting gpg.program'; @@ -322,7 +322,7 @@ sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => get_tmp_dir($project, $options)); - write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', $options)); + path($gpg_wrapper)->spew_utf8(project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = capture_exec($gpg_wrapper, '--verify', @@ -377,7 +377,7 @@ sub git_need_fetch { sub git_clone_fetch_chdir { my ($project, $options) = @_; - my $clonedir = create_dir(path(project_config($project, + my $clonedir = create_dir(rbm_path(project_config($project, 'git_clone_dir', $options))); my $git_url = project_config($project, 'git_url', $options) || exit_error "git_url is undefined"; @@ -387,7 +387,7 @@ sub git_clone_fetch_chdir { @clone_submod = ('--recurse-submodules'); @fetch_submod = ('--recurse-submodules=on-demand'); } - if (!chdir path("$clonedir/$project")) { + if (!chdir rbm_path("$clonedir/$project")) { chdir $clonedir || exit_error "Can't enter directory $clonedir: $!"; if (system('git', 'clone', @clone_submod, $git_url, $project) != 0) { exit_error "Error cloning $git_url"; @@ -429,12 +429,12 @@ sub hg_need_fetch { sub hg_clone_fetch_chdir { my ($project, $options) = @_; my $hg = project_config($project, 'hg', $options); - my $clonedir = create_dir(path(project_config($project, + my $clonedir = create_dir(rbm_path(project_config($project, 'hg_clone_dir', $options))); my $hg_url = shell_quote(project_config($project, 'hg_url', $options)) || exit_error "hg_url is undefined"; my $sq_project = shell_quote($project); - if (!chdir path("$clonedir/$project")) { + if (!chdir rbm_path("$clonedir/$project")) { chdir $clonedir || exit_error "Can't enter directory $clonedir: $!"; if (system("$hg clone -q $hg_url $sq_project") != 0) { exit_error "Error cloning $hg_url"; @@ -453,7 +453,7 @@ sub run_script { my @res; if ($cmd =~ m/^#/) { my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); - write_file($tmp, $cmd); + path($tmp)->spew_utf8($cmd); chmod 0700, $tmp; @res = $f->($tmp); unlink $tmp; @@ -505,7 +505,7 @@ sub gpg_id { sub maketar { my ($project, $options, $dest_dir) = @_; - $dest_dir //= create_dir(path(project_config($project, 'output_dir'))); + $dest_dir //= create_dir(rbm_path(project_config($project, 'output_dir'))); valid_project($project); my $old_cwd = getcwd; my $commit_hash; @@ -592,9 +592,9 @@ sub maketar { sub sha256file { CORE::state %res; - my $f = path(shift); + my $f = rbm_path(shift); return $res{$f} if exists $res{$f}; - return $res{$f} = -f $f ? sha256_hex(scalar read_file($f)) : ''; + return $res{$f} = -f $f ? sha256_hex(path($f)->slurp_raw) : ''; } sub process_template_opt { @@ -617,8 +617,8 @@ sub process_template { } return $res; } - $dest_dir //= path(project_config($project, 'output_dir')); - my $projects_dir = path(project_config($project, 'projects_dir')); + $dest_dir //= rbm_path(project_config($project, 'output_dir')); + my $projects_dir = rbm_path(project_config($project, 'projects_dir')); my $template = Template->new( ENCODING => 'utf8', INCLUDE_PATH => "$projects_dir/$project:$projects_dir/common", @@ -636,7 +636,7 @@ sub process_template { dest_dir => $dest_dir, exit_error => \&exit_error, exec => sub { execute($project, @_) }, - path => \&path, + path => \&rbm_path, tmpl => sub { process_template($project, $_[0], $dest_dir) }, shell_quote => \&shell_quote, versioncmp => \&versioncmp, @@ -655,12 +655,12 @@ sub process_template { sub rpmspec { my ($project, $dest_dir) = @_; - $dest_dir //= create_dir(path(project_config($project, 'output_dir'))); + $dest_dir //= create_dir(rbm_path(project_config($project, 'output_dir'))); valid_project($project); my $timestamp = project_config($project, 'timestamp'); my $rpmspec = project_config($project, 'rpmspec') || exit_error "Undefined config for rpmspec"; - write_file("$dest_dir/$project.spec", $rpmspec); + path("$dest_dir/$project.spec")->spew_utf8($rpmspec); utime $timestamp, $timestamp, "$dest_dir/$project.spec" if $timestamp; } @@ -673,7 +673,7 @@ sub copy_files { my @r; my $copy_files = project_config($project, 'copy_files'); return unless $copy_files; - my $proj_dir = path(project_config($project, 'projects_dir')); + my $proj_dir = rbm_path(project_config($project, 'projects_dir')); my $src_dir = "$proj_dir/$project"; foreach my $file (@$copy_files) { copy("$src_dir/$file", "$dest_dir/$file"); @@ -719,8 +719,8 @@ sub input_file_id_hash { my ($fname, $filename) = @_; return $filename . ':' . sha256file($fname) if -f $fname; return $filename . ':' . sha256file(readlink $fname) if -l $fname; - my @hashes = map { input_file_id_hash("$fname/$_", "$filename/$_") } - sort(read_dir($fname)); + my @subdirs = sort(map { $_->basename } path($fname)->children); + my @hashes = map { input_file_id_hash("$fname/$_", "$filename/$_") } @subdirs; return join("\n", @hashes); } @@ -742,7 +742,7 @@ sub recursive_copy { } my @copied; mkdir "$dest_dir/$name"; - foreach my $f (read_dir($fname)) { + foreach my $f (map { $_->basename } path($fname)->children) { push @copied, recursive_copy("$fname/$f", "$name/$f", $dest_dir); } return @copied; @@ -759,7 +759,7 @@ sub input_files { $options = {$options ? %$options : ()}; my $input_files = project_config($project, 'input_files', $options); goto RETURN_RES unless $input_files; - my $proj_dir = path(project_config($project, 'projects_dir', $options)); + my $proj_dir = rbm_path(project_config($project, 'projects_dir', $options)); my $src_dir = "$proj_dir/$project"; my $old_cwd = getcwd; chdir $src_dir || exit_error "cannot chdir to $src_dir"; @@ -813,12 +813,12 @@ sub input_files { } my $proj_out_dir; if ($input_file->{project}) { - $proj_out_dir = path(project_step_config($t->('project'), 'output_dir', + $proj_out_dir = rbm_path(project_step_config($t->('project'), 'output_dir', { %$options, step => $t->('pkg_type'), origin_project => $project, output_dir => undef, %$input_file })); } else { - $proj_out_dir = path(project_config($project, 'output_dir', + $proj_out_dir = rbm_path(project_config($project, 'output_dir', { %$input_file, output_dir => undef })); } create_dir($proj_out_dir); @@ -837,7 +837,7 @@ sub input_files { my $file_gpg_id = gpg_id($t->('file_gpg_id')); if ($need_dl && (!$fname || $t->('refresh_input'))) { if ($t->('content')) { - write_file("$proj_out_dir/$name", $t->('content')); + path("$proj_out_dir/$name")->spew_utf8($t->('content')); } elsif ($t->('URL')) { urlget($project, {%$input_file, filename => $name}, 1); } elsif ($t->('exec')) { @@ -889,7 +889,7 @@ sub input_files { } exit_error "Missing file $name" unless $fname; if ($t->('sha256sum') - && $t->('sha256sum') ne sha256_hex(read_file($fname))) { + && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { exit_error "Can't have sha256sum on directory: $fname" if -d $fname; exit_error "Wrong sha256sum for $fname.\n" . "Expected sha256sum: " . $t->('sha256sum'); @@ -954,7 +954,7 @@ sub build_run { $config->{step} = $script_name; $options //= {}; my $error; - my $dest_dir = create_dir(path(project_config($project, 'output_dir', $options))); + my $dest_dir = create_dir(rbm_path(project_config($project, 'output_dir', $options))); valid_project($project); $options = { %$options, build_id => Data::UUID->new->create_str }; my $old_cwd = getcwd; @@ -1023,16 +1023,16 @@ sub build_run { @scripts = grep { $build_script{$_} } @scripts; push @cfiles, @scripts unless $use_srcdir; foreach my $s (@scripts) { - write_file("$srcdir/$s", $build_script{$s}); + path("$srcdir/$s")->spew_utf8($build_script{$s}); chmod 0700, "$srcdir/$s"; } my $build_log = project_config($project, "build_log", $options); if ($build_log ne '-') { my $append = project_config($project, "build_log_append", $options); - $build_log = path($build_log); + $build_log = rbm_path($build_log); make_path(dirname($build_log)); my $now = localtime; - write_file($build_log, {append => $append}, "Starting build: $now\n"); + path($build_log)->append_utf8("Starting build: $now\n"); print "Build log: $build_log\n"; } chdir $srcdir; diff --git a/test.pl b/test.pl index 8e842e7..dfca8ee 100755 --- a/test.pl +++ b/test.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use File::Slurp; +use Path::Tiny; use Test::More tests => 29; use lib 'lib/'; @@ -207,7 +207,7 @@ foreach my $test (@tests) { if ($test->{build}) { unlink keys %{$test->{files}}; RBM::build_run(@{$test->{build}}); - my $res = grep { read_file($_) ne $test->{files}{$_} } keys %{$test->{files}}; + my $res = grep { path($_)->slurp_utf8 ne $test->{files}{$_} } keys %{$test->{files}}; ok(!$res, $test->{name}); } }

1 0

[tor-browser-build/master] Bug 24179: Use HTTPS-Everywhere release for nightly builds
by boklm＠torproject.org 27 Nov '17

27 Nov '17

commit ef2487d3aae2adff9d42a850c39d15e055c6735e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 09:49:03 2017 +0000 Bug 24179: Use HTTPS-Everywhere release for nightly builds --- projects/https-everywhere/config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 5225bbc..237272b 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -32,8 +32,3 @@ var: input_files: - project: container-image - -targets: - nightly: - version: master - tag_gpg_id: 0

1 0

[rbm/master] Bug 24180: Make 'rbm fetch' accept options
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 6406e0684a379d13188886f747ed57060925efaf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 8 14:32:04 2017 +0100 Bug 24180: Make 'rbm fetch' accept options --- doc/rbm-fetch.asc | 7 ++++++- rbm | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/rbm-fetch.asc b/doc/rbm-fetch.asc index 17a41e6..f0da55e 100644 --- a/doc/rbm-fetch.asc +++ b/doc/rbm-fetch.asc @@ -9,7 +9,7 @@ rbm-fetch - Fetch commits from remote git or mercurial repository SYNOPSIS -------- [verse] -'rbm fetch' [project] +'rbm fetch' [options] [project] DESCRIPTION ----------- @@ -23,6 +23,11 @@ fetched, so there is no need to use this command. Alternatively, the '--fetch' option can be used on other commands. +COMMAND LINE OPTIONS +-------------------- + +See link:rbm_cli.html[rbm_cli(7)] for options. + SEE ALSO -------- link:rbm.html[rbm(1)] diff --git a/rbm b/rbm index 2c4ad0d..5d6417b 100755 --- a/rbm +++ b/rbm @@ -131,7 +131,8 @@ sub show_conf { sub fetch { shift; $RBM::config->{run}{fetch} = 1; - my @l = @_ ? @_ : (RBM::projectslist()); + my $args = set_options(@_); + my @l = @$args ? @$args : (RBM::projectslist()); foreach my $project (@l) { RBM::valid_project($project); if (RBM::project_config($project, 'git_url')) {

1 0

[tor-browser-build/master] Bumping build tag
by gk＠torproject.org 12 Nov '17

12 Nov '17

commit ac750e79461e75b6e29448f866fd78af2ae47d28 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 12 19:28:04 2017 +0000 Bumping build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index e412023..f4fbb08 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a8' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a6 - 7.5a7

1 0

[tor-browser-build/master] --remove-update-channel breaks HTTPS-Everywhere
by gk＠torproject.org 12 Nov '17

12 Nov '17

commit 72c12814f95f7b7f417f9330aa5cc4e931ed69b0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 12 19:27:12 2017 +0000 --remove-update-channel breaks HTTPS-Everywhere We can't use the --remove-update-channel option as we envisioned in #10394 as this throws an error in the WebExtensions context in Tor Browser. Falling back to regular EFF updates for now. --- projects/https-everywhere/build | 3 +-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 49018af..10dd4bf 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -2,8 +2,7 @@ [% c("var/set_default_env") -%] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] -# Bug 10394: We don't want to autoupdate HTTPS Everywhere anymore. -./make.sh --remove-update-channel +./make.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm pkg/*-amo.xpi mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1b5baf3..e458f61 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,7 +15,6 @@ Tor Browser 7.5a8 -- November 15 2017 * Update NoScript to 5.1.5 * Bug 23968: NoScript icon jumps to the right after update * Update sandboxed-tor-browser to 0.0.15 - * Bug 10394: Don't autoupdate HTTPS Everywhere anymore * Windows * Bug 20636+10026: Create 64bit Tor Browser for Windows * Bug 24052: Block file:// redirects early

1 0

[tor-browser-build/master] Preparing 7.5a8 build2
by gk＠torproject.org 10 Nov '17

10 Nov '17

commit 79f8335e306735566157c995ab7f147473958725 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 10 09:43:34 2017 +0000 Preparing 7.5a8 build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 394be49..e412023 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a8' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a6 - 7.5a7

1 0

[tor-browser-build/master] Picking up Tor Launcher 0.2.14.1
by gk＠torproject.org 10 Nov '17

10 Nov '17

commit 67d7917fef47710309cee0b3eb32ab61fbe4d089 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 10 09:42:18 2017 +0000 Picking up Tor Launcher 0.2.14.1 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- projects/tor-launcher/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a7d273a..1b5baf3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,7 @@ Tor Browser 7.5a8 -- November 15 2017 * Bug 23949: Fix donation banner display * Update locales with translated banner * Translations update - * Update Tor Launcher to 0.2.14 + * Update Tor Launcher to 0.2.14.1 * Bug 23262: Implement integrated progress bar * Bug 23261: implement configuration portion of new Tor Launcher UI * Translations update diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 69da745..587c257 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14 +version: 0.2.14.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 10 Nov '17

10 Nov '17

commit c008baacb9fab32ba34d08ab683bbe6a53be8307 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 10 08:26:42 2017 +0000 Translations update --- src/chrome/locale/ach/network-settings.dtd | 58 ++++------ src/chrome/locale/ach/torlauncher.properties | 3 +- src/chrome/locale/ady/network-settings.dtd | 58 ++++------ src/chrome/locale/ady/torlauncher.properties | 3 +- src/chrome/locale/af/network-settings.dtd | 58 ++++------ src/chrome/locale/af/torlauncher.properties | 3 +- src/chrome/locale/ak/network-settings.dtd | 58 ++++------ src/chrome/locale/ak/torlauncher.properties | 3 +- src/chrome/locale/am-ET/network-settings.dtd | 3 - src/chrome/locale/am/network-settings.dtd | 58 ++++------ src/chrome/locale/am/torlauncher.properties | 3 +- src/chrome/locale/ar/network-settings.dtd | 60 ++++------ src/chrome/locale/ar/torlauncher.properties | 3 +- src/chrome/locale/arn/network-settings.dtd | 58 ++++------ src/chrome/locale/arn/torlauncher.properties | 3 +- src/chrome/locale/ast/network-settings.dtd | 58 ++++------ src/chrome/locale/ast/torlauncher.properties | 3 +- src/chrome/locale/az/network-settings.dtd | 58 ++++------ src/chrome/locale/az/torlauncher.properties | 3 +- src/chrome/locale/be/network-settings.dtd | 58 ++++------ src/chrome/locale/be/torlauncher.properties | 3 +- src/chrome/locale/bg/network-settings.dtd | 60 ++++------ src/chrome/locale/bg/torlauncher.properties | 3 +- src/chrome/locale/bn-BD/network-settings.dtd | 58 ++++------ src/chrome/locale/bn-BD/torlauncher.properties | 3 +- src/chrome/locale/bn-IN/network-settings.dtd | 58 ++++------ src/chrome/locale/bn-IN/torlauncher.properties | 3 +- src/chrome/locale/bn/network-settings.dtd | 58 ++++------ src/chrome/locale/bn/torlauncher.properties | 3 +- src/chrome/locale/bo/network-settings.dtd | 58 ++++------ src/chrome/locale/bo/torlauncher.properties | 3 +- src/chrome/locale/br/network-settings.dtd | 58 ++++------ src/chrome/locale/br/torlauncher.properties | 3 +- src/chrome/locale/bs/network-settings.dtd | 58 ++++------ src/chrome/locale/bs/torlauncher.properties | 3 +- src/chrome/locale/ca/network-settings.dtd | 60 ++++------ src/chrome/locale/ca/torlauncher.properties | 3 +- src/chrome/locale/ca(a)valencia/network-settings.dtd | 3 - src/chrome/locale/cs-CZ/network-settings.dtd | 3 - src/chrome/locale/cs/network-settings.dtd | 60 ++++------ src/chrome/locale/cs/torlauncher.properties | 3 +- src/chrome/locale/csb/network-settings.dtd | 58 ++++------ src/chrome/locale/csb/torlauncher.properties | 3 +- src/chrome/locale/cv/network-settings.dtd | 58 ++++------ src/chrome/locale/cv/torlauncher.properties | 3 +- src/chrome/locale/cy/network-settings.dtd | 58 ++++------ src/chrome/locale/cy/torlauncher.properties | 3 +- src/chrome/locale/da/network-settings.dtd | 60 ++++------ src/chrome/locale/da/torlauncher.properties | 3 +- src/chrome/locale/de/network-settings.dtd | 60 ++++------ src/chrome/locale/de/torlauncher.properties | 3 +- src/chrome/locale/dz/network-settings.dtd | 58 ++++------ src/chrome/locale/dz/torlauncher.properties | 3 +- src/chrome/locale/el/network-settings.dtd | 61 ++++------- src/chrome/locale/el/torlauncher.properties | 3 +- src/chrome/locale/en-GB/network-settings.dtd | 58 ++++------ src/chrome/locale/en-GB/torlauncher.properties | 3 +- src/chrome/locale/eo/network-settings.dtd | 58 ++++------ src/chrome/locale/eo/torlauncher.properties | 3 +- src/chrome/locale/es-AR/network-settings.dtd | 60 ++++------ src/chrome/locale/es-AR/torlauncher.properties | 3 +- src/chrome/locale/es-CL/network-settings.dtd | 58 ++++------ src/chrome/locale/es-CL/torlauncher.properties | 3 +- src/chrome/locale/es-CO/network-settings.dtd | 58 ++++------ src/chrome/locale/es-CO/torlauncher.properties | 3 +- src/chrome/locale/es-MX/network-settings.dtd | 60 ++++------ src/chrome/locale/es-MX/torlauncher.properties | 3 +- src/chrome/locale/es/network-settings.dtd | 61 ++++------- src/chrome/locale/es/torlauncher.properties | 3 +- src/chrome/locale/et/network-settings.dtd | 60 ++++------ src/chrome/locale/et/torlauncher.properties | 5 +- src/chrome/locale/eu/network-settings.dtd | 60 ++++------ src/chrome/locale/eu/torlauncher.properties | 3 +- src/chrome/locale/fa/network-settings.dtd | 61 ++++------- src/chrome/locale/fa/torlauncher.properties | 3 +- src/chrome/locale/fi/network-settings.dtd | 60 ++++------ src/chrome/locale/fi/torlauncher.properties | 3 +- src/chrome/locale/fil/network-settings.dtd | 60 ++++------ src/chrome/locale/fil/torlauncher.properties | 3 +- src/chrome/locale/fo/network-settings.dtd | 58 ++++------ src/chrome/locale/fo/torlauncher.properties | 3 +- src/chrome/locale/fr-CA/network-settings.dtd | 66 ++++------- src/chrome/locale/fr-CA/torlauncher.properties | 43 ++++---- src/chrome/locale/fr/network-settings.dtd | 66 ++++------- src/chrome/locale/fr/torlauncher.properties | 43 ++++---- src/chrome/locale/fur/network-settings.dtd | 58 ++++------ src/chrome/locale/fur/torlauncher.properties | 3 +- src/chrome/locale/fy/network-settings.dtd | 58 ++++------ src/chrome/locale/fy/torlauncher.properties | 3 +- src/chrome/locale/ga/network-settings.dtd | 100 +++++++---------- src/chrome/locale/ga/torlauncher.properties | 121 +++++++++++---------- src/chrome/locale/gl/network-settings.dtd | 58 ++++------ src/chrome/locale/gl/torlauncher.properties | 3 +- src/chrome/locale/gu-IN/network-settings.dtd | 58 ++++------ src/chrome/locale/gu-IN/torlauncher.properties | 3 +- src/chrome/locale/gu/network-settings.dtd | 58 ++++------ src/chrome/locale/gu/torlauncher.properties | 3 +- src/chrome/locale/gun/network-settings.dtd | 58 ++++------ src/chrome/locale/gun/torlauncher.properties | 3 +- src/chrome/locale/ha/network-settings.dtd | 58 ++++------ src/chrome/locale/ha/torlauncher.properties | 3 +- src/chrome/locale/he/network-settings.dtd | 92 ++++++---------- src/chrome/locale/he/torlauncher.properties | 77 ++++++------- src/chrome/locale/hi/network-settings.dtd | 60 ++++------ src/chrome/locale/hi/torlauncher.properties | 3 +- src/chrome/locale/hr-HR/network-settings.dtd | 62 ++++------- src/chrome/locale/hr-HR/torlauncher.properties | 3 +- src/chrome/locale/hr/network-settings.dtd | 60 ++++------ src/chrome/locale/hr/torlauncher.properties | 3 +- src/chrome/locale/ht/network-settings.dtd | 58 ++++------ src/chrome/locale/ht/torlauncher.properties | 3 +- src/chrome/locale/hu/network-settings.dtd | 60 ++++------ src/chrome/locale/hu/torlauncher.properties | 3 +- src/chrome/locale/hy-AM/network-settings.dtd | 3 - src/chrome/locale/hy/network-settings.dtd | 58 ++++------ src/chrome/locale/hy/torlauncher.properties | 3 +- src/chrome/locale/ia/network-settings.dtd | 58 ++++------ src/chrome/locale/ia/torlauncher.properties | 3 +- src/chrome/locale/id/network-settings.dtd | 60 ++++------ src/chrome/locale/id/torlauncher.properties | 3 +- src/chrome/locale/is/network-settings.dtd | 60 ++++------ src/chrome/locale/is/torlauncher.properties | 11 +- src/chrome/locale/it/network-settings.dtd | 60 ++++------ src/chrome/locale/it/torlauncher.properties | 3 +- src/chrome/locale/ja/network-settings.dtd | 60 ++++------ src/chrome/locale/ja/torlauncher.properties | 3 +- src/chrome/locale/jv/network-settings.dtd | 58 ++++------ src/chrome/locale/jv/torlauncher.properties | 3 +- src/chrome/locale/ka/network-settings.dtd | 58 ++++------ src/chrome/locale/ka/torlauncher.properties | 3 +- src/chrome/locale/kk/network-settings.dtd | 58 ++++------ src/chrome/locale/kk/torlauncher.properties | 3 +- src/chrome/locale/km/network-settings.dtd | 58 ++++------ src/chrome/locale/km/torlauncher.properties | 3 +- src/chrome/locale/kn/network-settings.dtd | 58 ++++------ src/chrome/locale/kn/torlauncher.properties | 3 +- src/chrome/locale/ko-KR/network-settings.dtd | 58 ++++------ src/chrome/locale/ko-KR/torlauncher.properties | 3 +- src/chrome/locale/ko/network-settings.dtd | 60 ++++------ src/chrome/locale/ko/torlauncher.properties | 3 +- src/chrome/locale/ku/network-settings.dtd | 58 ++++------ src/chrome/locale/ku/torlauncher.properties | 3 +- src/chrome/locale/kw/network-settings.dtd | 58 ++++------ src/chrome/locale/kw/torlauncher.properties | 3 +- src/chrome/locale/ky/network-settings.dtd | 58 ++++------ src/chrome/locale/ky/torlauncher.properties | 3 +- src/chrome/locale/lb/network-settings.dtd | 58 ++++------ src/chrome/locale/lb/torlauncher.properties | 3 +- src/chrome/locale/lg/network-settings.dtd | 58 ++++------ src/chrome/locale/lg/torlauncher.properties | 3 +- src/chrome/locale/ln/network-settings.dtd | 58 ++++------ src/chrome/locale/ln/torlauncher.properties | 3 +- src/chrome/locale/lo/network-settings.dtd | 60 ++++------ src/chrome/locale/lo/torlauncher.properties | 3 +- src/chrome/locale/lt/network-settings.dtd | 60 ++++------ src/chrome/locale/lt/torlauncher.properties | 3 +- src/chrome/locale/lv/network-settings.dtd | 60 ++++------ src/chrome/locale/lv/torlauncher.properties | 3 +- src/chrome/locale/mg/network-settings.dtd | 58 ++++------ src/chrome/locale/mg/torlauncher.properties | 3 +- src/chrome/locale/mi/network-settings.dtd | 58 ++++------ src/chrome/locale/mi/torlauncher.properties | 3 +- src/chrome/locale/mk/network-settings.dtd | 58 ++++------ src/chrome/locale/mk/torlauncher.properties | 3 +- src/chrome/locale/ml/network-settings.dtd | 58 ++++------ src/chrome/locale/ml/torlauncher.properties | 5 +- src/chrome/locale/mn/network-settings.dtd | 58 ++++------ src/chrome/locale/mn/torlauncher.properties | 3 +- src/chrome/locale/mr/network-settings.dtd | 58 ++++------ src/chrome/locale/mr/torlauncher.properties | 3 +- src/chrome/locale/ms-MY/network-settings.dtd | 58 ++++------ src/chrome/locale/ms-MY/torlauncher.properties | 3 +- src/chrome/locale/mt/network-settings.dtd | 58 ++++------ src/chrome/locale/mt/torlauncher.properties | 3 +- src/chrome/locale/my/network-settings.dtd | 58 ++++------ src/chrome/locale/my/torlauncher.properties | 3 +- src/chrome/locale/nah/network-settings.dtd | 58 ++++------ src/chrome/locale/nah/torlauncher.properties | 3 +- src/chrome/locale/nap/network-settings.dtd | 58 ++++------ src/chrome/locale/nap/torlauncher.properties | 3 +- src/chrome/locale/nb/network-settings.dtd | 61 ++++------- src/chrome/locale/nb/torlauncher.properties | 5 +- src/chrome/locale/nds/network-settings.dtd | 58 ++++------ src/chrome/locale/nds/torlauncher.properties | 3 +- src/chrome/locale/ne/network-settings.dtd | 58 ++++------ src/chrome/locale/ne/torlauncher.properties | 3 +- src/chrome/locale/nl-BE/network-settings.dtd | 58 ++++------ src/chrome/locale/nl-BE/torlauncher.properties | 5 +- src/chrome/locale/nl/network-settings.dtd | 60 ++++------ src/chrome/locale/nl/torlauncher.properties | 3 +- src/chrome/locale/nn/network-settings.dtd | 58 ++++------ src/chrome/locale/nn/torlauncher.properties | 3 +- src/chrome/locale/nso/network-settings.dtd | 58 ++++------ src/chrome/locale/nso/torlauncher.properties | 3 +- src/chrome/locale/oc/network-settings.dtd | 58 ++++------ src/chrome/locale/oc/torlauncher.properties | 3 +- src/chrome/locale/or/network-settings.dtd | 58 ++++------ src/chrome/locale/or/torlauncher.properties | 3 +- src/chrome/locale/pa/network-settings.dtd | 58 ++++------ src/chrome/locale/pa/torlauncher.properties | 3 +- src/chrome/locale/pap/network-settings.dtd | 58 ++++------ src/chrome/locale/pap/torlauncher.properties | 3 +- src/chrome/locale/pl-PL/network-settings.dtd | 3 - src/chrome/locale/pl/network-settings.dtd | 60 ++++------ src/chrome/locale/pl/torlauncher.properties | 3 +- src/chrome/locale/pms/network-settings.dtd | 58 ++++------ src/chrome/locale/pms/torlauncher.properties | 3 +- src/chrome/locale/ps/network-settings.dtd | 58 ++++------ src/chrome/locale/ps/torlauncher.properties | 3 +- src/chrome/locale/pt-BR/network-settings.dtd | 60 ++++------ src/chrome/locale/pt-BR/torlauncher.properties | 3 +- src/chrome/locale/pt/network-settings.dtd | 60 ++++------ src/chrome/locale/pt/torlauncher.properties | 3 +- src/chrome/locale/ro/network-settings.dtd | 60 ++++------ src/chrome/locale/ro/torlauncher.properties | 3 +- src/chrome/locale/ru/network-settings.dtd | 60 ++++------ src/chrome/locale/ru/torlauncher.properties | 3 +- src/chrome/locale/ru(a)petr1708/network-settings.dtd | 58 ++++------ .../locale/ru(a)petr1708/torlauncher.properties | 3 +- src/chrome/locale/sco/network-settings.dtd | 58 ++++------ src/chrome/locale/sco/torlauncher.properties | 3 +- src/chrome/locale/si-LK/network-settings.dtd | 58 ++++------ src/chrome/locale/si-LK/torlauncher.properties | 3 +- src/chrome/locale/sk-SK/network-settings.dtd | 60 ++++------ src/chrome/locale/sk-SK/torlauncher.properties | 3 +- src/chrome/locale/sk/network-settings.dtd | 58 ++++------ src/chrome/locale/sk/torlauncher.properties | 3 +- src/chrome/locale/sl-SI/network-settings.dtd | 58 ++++------ src/chrome/locale/sl-SI/torlauncher.properties | 3 +- src/chrome/locale/sl/network-settings.dtd | 58 ++++------ src/chrome/locale/sl/torlauncher.properties | 3 +- src/chrome/locale/sn/network-settings.dtd | 58 ++++------ src/chrome/locale/sn/torlauncher.properties | 3 +- src/chrome/locale/so/network-settings.dtd | 58 ++++------ src/chrome/locale/so/torlauncher.properties | 3 +- src/chrome/locale/son/network-settings.dtd | 58 ++++------ src/chrome/locale/son/torlauncher.properties | 3 +- src/chrome/locale/sq-AL/network-settings.dtd | 3 - src/chrome/locale/sq/network-settings.dtd | 60 ++++------ src/chrome/locale/sq/torlauncher.properties | 3 +- src/chrome/locale/sr/network-settings.dtd | 58 ++++------ src/chrome/locale/sr/torlauncher.properties | 3 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 58 ++++------ src/chrome/locale/sr(a)latin/torlauncher.properties | 3 +- src/chrome/locale/st/network-settings.dtd | 58 ++++------ src/chrome/locale/st/torlauncher.properties | 3 +- src/chrome/locale/su/network-settings.dtd | 58 ++++------ src/chrome/locale/su/torlauncher.properties | 3 +- src/chrome/locale/sv-SE/network-settings.dtd | 3 - src/chrome/locale/sv/network-settings.dtd | 60 ++++------ src/chrome/locale/sv/torlauncher.properties | 3 +- src/chrome/locale/sw/network-settings.dtd | 58 ++++------ src/chrome/locale/sw/torlauncher.properties | 3 +- src/chrome/locale/szl/network-settings.dtd | 58 ++++------ src/chrome/locale/szl/torlauncher.properties | 3 +- src/chrome/locale/ta/network-settings.dtd | 58 ++++------ src/chrome/locale/ta/torlauncher.properties | 3 +- src/chrome/locale/te-IN/network-settings.dtd | 58 ++++------ src/chrome/locale/te-IN/torlauncher.properties | 3 +- src/chrome/locale/te/network-settings.dtd | 58 ++++------ src/chrome/locale/te/torlauncher.properties | 3 +- src/chrome/locale/tg/network-settings.dtd | 58 ++++------ src/chrome/locale/tg/torlauncher.properties | 5 +- src/chrome/locale/th/network-settings.dtd | 58 ++++------ src/chrome/locale/th/torlauncher.properties | 3 +- src/chrome/locale/ti/network-settings.dtd | 58 ++++------ src/chrome/locale/ti/torlauncher.properties | 3 +- src/chrome/locale/tk/network-settings.dtd | 58 ++++------ src/chrome/locale/tk/torlauncher.properties | 3 +- src/chrome/locale/tr/network-settings.dtd | 60 ++++------ src/chrome/locale/tr/torlauncher.properties | 3 +- src/chrome/locale/uk/network-settings.dtd | 60 ++++------ src/chrome/locale/uk/torlauncher.properties | 3 +- src/chrome/locale/ur-PK/network-settings.dtd | 58 ++++------ src/chrome/locale/ur-PK/torlauncher.properties | 3 +- src/chrome/locale/ur/network-settings.dtd | 58 ++++------ src/chrome/locale/ur/torlauncher.properties | 3 +- src/chrome/locale/uz/network-settings.dtd | 58 ++++------ src/chrome/locale/uz/torlauncher.properties | 3 +- src/chrome/locale/ve/network-settings.dtd | 58 ++++------ src/chrome/locale/ve/torlauncher.properties | 3 +- src/chrome/locale/vi/network-settings.dtd | 60 ++++------ src/chrome/locale/vi/torlauncher.properties | 3 +- src/chrome/locale/wa/network-settings.dtd | 58 ++++------ src/chrome/locale/wa/torlauncher.properties | 3 +- src/chrome/locale/wo/network-settings.dtd | 58 ++++------ src/chrome/locale/wo/torlauncher.properties | 3 +- src/chrome/locale/zh-CN/network-settings.dtd | 60 ++++------ src/chrome/locale/zh-CN/torlauncher.properties | 3 +- src/chrome/locale/zh-HK/network-settings.dtd | 60 ++++------ src/chrome/locale/zh-HK/torlauncher.properties | 3 +- src/chrome/locale/zh-TW/network-settings.dtd | 60 ++++------ src/chrome/locale/zh-TW/torlauncher.properties | 3 +- src/chrome/locale/zu/network-settings.dtd | 58 ++++------ src/chrome/locale/zu/torlauncher.properties | 3 +- 295 files changed, 3256 insertions(+), 6023 deletions(-) diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ach/torlauncher.properties +++ b/src/chrome/locale/ach/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ady/torlauncher.properties +++ b/src/chrome/locale/ady/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index ff231bb..e953e63 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Poort:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Hierdie rekenaar gaan deur 'n firewall wat slegs konneksies na sekere poorte toelaat"> <!ENTITY torsettings.firewall.allowedPorts "Toegelate Poorte:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Diensverskaffer (IDV) blok konneksies na die Tor netwerk"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Deur die Web"> -<!ENTITY torsettings.bridgeHelp2 "Gebruik 'n webblaaier om https://bridges.torproject.org te besoek"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Stuur 'n epos aan bridges(a)torproject.org met die lyn 'get bridges' by homself in die liggaam van die boodskap.  Maar, om dit moeiliker vir 'n aanvaller te maak om baie 'bridge' adresse te leer, moet jy hierdie versoek vanaf een van die volgende epos verskaffers stuur (gelys in volgorde van voorkeur): "> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index 7bb0013..b09753e 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(aanbeveel) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ak/torlauncher.properties +++ b/src/chrome/locale/ak/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd index 003e255..23aae0a 100644 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ b/src/chrome/locale/am-ET/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index b6d2e03..4d9c2f1 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "አዎ"> -<!ENTITY torSettings.no "አይደለም "> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "አገናኝ"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index 7ec7730..784e61a 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(የሚመከር) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=አገናኝ torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index cd31eed..86e64fb 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "إعدادات شبكة تور"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "لغة متصفح تور"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "عليك توفير معلومات حول اتصال هذا الحاسب بالإنترنت قبل أن تحاول الاتصال بشبكة تور."> - -<!ENTITY torSettings.yes "نعم"> -<!ENTITY torSettings.no "لا"> - -<!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> -<!ENTITY torSettings.configurePrompt1 "اتصال هذا الحاسب بالإنترنت محجوب أو له بروكسي."> -<!ENTITY torSettings.configurePrompt2 "احتاج الى موافقه جسر او إعدادات بروكسي موضعي قبل الاتصال بشبكه  تور"> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "تكوين"> -<!ENTITY torSettings.connectPrompt2 "اود انشاء اتصال مباشر بشبكه تور."> -<!ENTITY torSettings.connectPrompt3 "سيصلح هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> -<!ENTITY torSettings.proxyPageTitle "إعداد البروكسي المحلّي"> -<!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت؟"> - -<!ENTITY torSettings.proxyExplanation1 "في معضم الحالات لايوجب استخدام بروكسي محلي، ولكننى نوصي باستخدامه عند انشاء اتصال من شبكه شركه، مدرسه، او جامعه."> -<!ENTITY torSettings.proxyExplanation2 "في حاله عدم معرفتك عن كيفيه اجابه هذا السؤال، يمكنك الاطلاع على متصفح آخر او اعدادات الشبكه لنظام التشغيل لمعرفه فيما اذا كان استخدام بروكسي مطلوب."> -<!ENTITY torSettings.enterProxy "أدخل إعدادات البروكسي."> -<!ENTITY torSettings.bridgePageTitle "إعداد جسور تور."> -<!ENTITY torSettings.bridgeQuestion "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> -<!ENTITY torSettings.bridgeExplanation1 "اذا لم تكن متاكدا على كيفيه اجابه هذا السؤال، الرجاء اختيار لا( اذا لم تتمكن من الاتصال بشبكه تور بدون جسر، يمكنك اضافه جسر لاحق)"> -<!ENTITY torSettings.bridgeExplanation2 "اذا قمت باختيار نعم، سيتم سؤالك عن اعدادات جسر تور، حيث انها مرحلات غير مدرجة تصعب عمليه حجب الاتصال بشبكه تور."> -<!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور."> -  <!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "اختياري"> -<!ENTITY torsettings.useProxy.checkbox "يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "نوع البروكسي:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "العنوان:"> <!ENTITY torsettings.useProxy.address.placeholder "عنوان الإنترنت IP أو اسم المضيف"> <!ENTITY torsettings.useProxy.port "المنفذ:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> -<!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> -<!ENTITY torsettings.useBridges.default "الاتصال بالجسور المتوفرة"> -<!ENTITY torsettings.useBridges.note "كل جسر يستخدم طريقه مختلفه لتجنب الحجب.  في حاله عدم نجاح احد الجسور في العمل، قم بتجربه جسر مختلف."> -<!ENTITY torsettings.useBridges.type "نوع النقل:"> -<!ENTITY torsettings.useBridges.custom "إدخال جسور مخصصة"> -<!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> -<!ENTITY torsettings.useBridges.placeholder "اكتب العنوان:المنفذ"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> -<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> -<!ENTITY torsettings.bridgeHelp1B "تستطيع استخدام مجموعة من عناوين الجسور المتوفرة، والمكونة مسبقا، أو يمكنك الحصول على مجموعة من عناوين مخصصة باستخدام أحد هذه الأساليب:"> -<!ENTITY torsettings.bridgeHelp2Heading "من خلال الويب"> -<!ENTITY torsettings.bridgeHelp2 "استخدم متصفح ويب لزيارة https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "من خلال المستجيب التلقائي للبريد الإلكتروني"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "ارسل رساله الى bridges(a)torproject.org مع العباره "get bridges" في وسط الصفحه .&#160 , ولكن بأمكانك ان تجعل الرساله اكثر امناً و مستصعبه للمخترق (الهاكر) ان يراها عن طريق استخدام من المواقع الريد المشهوره Gmail و Yahoo "> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net او https://mail.google.com, او https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "من خلال مكتب المساعدة"> -<!ENTITY torsettings.bridgeHelp4 "يمكنك طلب عناوين الجسر، كحل أخير، من خلال إرسال رسالة بريد إلكتروني مهذبة إلى help(a)rt.torproject.org.  يرجى ملاحظة أنه يجب أن يرد شخص ما على كل طلب."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 4c73702..a7f14b5 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. -torlauncher.recommended_bridge=(موصى به) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=اتصل torlauncher.restart_tor=إعادة تشغيل تور diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/arn/torlauncher.properties +++ b/src/chrome/locale/arn/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index e85cb26..240154c 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "Non"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ast/torlauncher.properties +++ b/src/chrome/locale/ast/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 7ef8cd1..4d99e28 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor şəbəkə paramertləri"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor şəbəkəsinə qoşulmaq üçün, kompüterin intrenet bağlantısı haqqında bəzi məlumatları verməlisiniz."> - -<!ENTITY torSettings.yes "Bəli"> -<!ENTITY torSettings.no "Xeyr"> - -<!ENTITY torSettings.firstQuestion "Aşağıdakılardan hansı sizin vəziyyətinizi tam təsvir edir?"> -<!ENTITY torSettings.configurePrompt1 "Bu kompüterin internet şəbəkəsi senzorlu vəya proksilidir."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Quraşdır"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Bu əksər hallarda işləyir."> <!ENTITY torSettings.connect "Qoşul"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Proksy parametrlərini daxil edin"> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Sizin internet provayderiniz(İSP) Tor şəbəkəsinə hər-hansı qadağa qoyub?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Siz təmin olunmuş körpü dəstindən istifadə edə, və ya özünüz şəxsi körpü dəsti daxil edə bilərsiz."> -  <!ENTITY torsettings.startingTor "Torun açılması üçün gözləyin..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Əlavə"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Tipi:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Ünvan:"> <!ENTITY torsettings.useProxy.address.placeholder "İP ünvanı və ya anakompüterin adı"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu kompüter yalnız müəyyən portlarla əlaqəyə icazə verən təhlükəsizlik divarindan keçir"> <!ENTITY torsettings.firewall.allowedPorts "İczaə verilən portlar:"> -<!ENTITY torsettings.useBridges.checkbox "Mənim İnternet provayderim(İSP) Tor şəbəkəsinə qoşulmağı qadağan edir"> -<!ENTITY torsettings.useBridges.default "Təmin olunmuş köpüdən istifadə et"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Nəqliyyat tipi:"> -<!ENTITY torsettings.useBridges.custom "Körpü daxil edin"> -<!ENTITY torsettings.useBridges.label "Bir və ya daha çox Körpü qoşqusu daxil edin (hər sətirə ancaq bir dənə)"> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Tor bort jurnalını panoya kopyalayın"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Körpü Keçid Dəstəyi"> -<!ENTITY torsettings.bridgeHelp1 "Əgər sən Tor şəbəkəsinə qoşula bilmirsənsə, ola bilsin ki, sənin İnternet Xidmət Provayderin (İXP) və ya digər agentlik Tor-la əlaqəni bloklayır.  Çox hallarda sən bu problemdən qaçınmaq üçün Tor Körpülərini istifadə edə bilərsən. Onların tapılıb bloklanması qat-qat çətin başa gəlir. "> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Bilavasitə web ilə"> -<!ENTITY torsettings.bridgeHelp2 "web brauzer istifadə edərək bu səhifəni ziyarət edin https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Email Avtocavablayıcı Vasitəsilə"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Mətnində 'körpü əldə et' yazaraq bridges(a)torproject.org ünvanına email göndər.  Casus və ya hücumçunun körpü ünvanlarını aşkarlamasının qarşısını almaq üçün aşağıda sıralanmış email ünvanlardan (üstünlüyə uyğun sıralanmışdır) bu tələbi göndərməlisən:"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, və ya https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Dəstək Masası Vasitəsilə"> -<!ENTITY torsettings.bridgeHelp4 "Son çarə olaraq körpü ünvanlarını help(a)rt.torproject.org ünvanına mədəni tələb emaili göndərməklə əldə edə bilərsən.  Lütfən, unutma ki, yazdığın insan hər bir tələbə ayrı ayrı cavab yazacaq."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index fef4504..f0d85f4 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Sən bir və ya daha çox körpü seçməlisə torlauncher.error_default_bridges_type_missing=Təqdim edilmiş körpülər üçün nəqliyyat növünü seçməlisən. torlauncher.error_bridge_bad_default_type=%S növ nəqliyyata sahib olan təqdim edilmiş körpü yoxdur. Lütfən, parametrlərini quraşdır. -torlauncher.recommended_bridge=(məsləhət edilən) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Qoşul torlauncher.restart_tor=Tor`u yenidən başlat diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index c235b1c..258e915 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Налады сеткі Тор"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Перад тым як падключыцца да сеткі Тор, вам трэба падаць инфармацыю аб злучэнні гэтага капутара з інтэрнэтам."> - -<!ENTITY torSettings.yes "Так"> -<!ENTITY torSettings.no "Не"> - -<!ENTITY torSettings.firstQuestion "Што з прыведзеннага ніжэй лепш апісвае вашу сітуацыю?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Наладзіць"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Гэта будзе працаваць у большасці выпадкаў."> <!ENTITY torSettings.connect "Злучэнне"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Ці патрабуе гэты капутар выкарыстоўвання лакальнага проксі-сервера для доступа ў інтэрнэт?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index a1926d6..25fd663 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Злучэнне torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index ce13b61..929acfe 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Настройки на Tor мрежата"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Език на Tor браузъра"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Преди да се свържете към Tor мрежата, Вие трябва да ни предоставите информация относно интернет връзката на този компютър"> - -<!ENTITY torSettings.yes "Да"> -<!ENTITY torSettings.no "Не"> - -<!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> -<!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурират bridge или proxy настройки преди свързване към Tor мрежата."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Конфигурирай"> -<!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> -<!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> -<!ENTITY torSettings.proxyPageTitle "Локални прокси настройки"> -<!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?"> - -<!ENTITY torSettings.proxyExplanation1 "В повечето случаи не е необходима локално прокси, но то може да се изисква, когато се свързвате от корпоративна, училищна или университетска мрежа."> -<!ENTITY torSettings.proxyExplanation2 "Ако не сте сигурни как да отговорите на този въпрос, погледнете настройките на Интернет в друг браузър или проверете мрежовите настройки на вашата система, за да видите дали е необходимо локално прокси."> -<!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> -<!ENTITY torSettings.bridgePageTitle "Настройки на Тор бриджове"> -<!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "Ако не сте сигурни как да отговори на този въпрос, изберете Не (ако не сте в състояние да се свържете с Tor мрежата без bridge, може да го добавите по-късно)."> -<!ENTITY torSettings.bridgeExplanation2 "Ако изберете Да, ще бъдете помолени да изберете Tor Bridges, които са неофициални relays, което прави по-трудно да се блокира връзката към Tor мрежата."> -<!ENTITY torSettings.bridgeSettingsPrompt "Вие може да използвате предложените комплекти от bridges или може да изисквате персонализиран комплект от тях."> -  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "Необходимо е използването на локален прокси сървър за достъп до Интернет"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Прокси Тип:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Този компютър се свързва през firewall,който позволява връзки само към определени портове."> <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> -<!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> -<!ENTITY torsettings.useBridges.default "Свържи се с предоставените bridges"> -<!ENTITY torsettings.useBridges.note "Всеки вид bridge използва различен метод, за да се избегне цензурата.  Ако един bridge не работи, опитайте отново като използвате друг."> -<!ENTITY torsettings.useBridges.type "Тип транспортиране:"> -<!ENTITY torsettings.useBridges.custom "Въведи персонални bridges"> -<!ENTITY torsettings.useBridges.label "Въведи един или повече bridge relays (по един на линия)."> -<!ENTITY torsettings.useBridges.placeholder "въведете адрес:порт"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Копирай Tor лога в клипборда"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay помощ"> -<!ENTITY torsettings.bridgeHelp1 "Ако не може да се свържете към Tor network, причината може да бъде във вашия Интернет доставчик (ISP) или определена агенция интернет наблюдение блокира Tor.  Често, вие може да заобиколите този проблем с използване на Tor Bridges, които са непубликувани relays и са много по трудни за блокиране."> -<!ENTITY torsettings.bridgeHelp1B "Може да използвате преконфигуриран, предоставен комплект от bridge адреси, или да получите персонализиран комплект от адреси, като използвате един от следните методи:"> -<!ENTITY torsettings.bridgeHelp2Heading "През Web"> -<!ENTITY torsettings.bridgeHelp2 "Използвайте уеб браузър за да посетите https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "През автоматично отговарящия имейл"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Пратете имейл до bridges(a)torproject.org с ред 'get bridges' в съдържанието на съобщението.  Така или иначе за да направите по трудно за атакуващия да научи повече от bridge адреса, вие трябва да пратите молба от един от следните и-мейл доставчици (подредени по реда на предпочитания):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "През бюрото за помощ"> -<!ENTITY torsettings.bridgeHelp4 "Като последна стъпка, вие може да изисквате адреси чрез пращане на учтив имейл до help(a)rt.torproject.org.  Моля обърнете внимание, че на всяка молба за bridge се отговаря персонално."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index 2ffafa2..a2ab92b 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Трябва да зададете един и torlauncher.error_default_bridges_type_missing=Трябва да избереш вид транспорт за избраните мостове. torlauncher.error_bridge_bad_default_type=Никой от избраните мостове няма траспорт от типса %S в наличност. Моля, нагласи настройките си. -torlauncher.recommended_bridge=(препоръчително) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Свържи се torlauncher.restart_tor=Рестартирайте Тор diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/bn-IN/torlauncher.properties +++ b/src/chrome/locale/bn-IN/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index db4e635..2988f47 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "হ্যা"> -<!ENTITY torSettings.no "না"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "সংযোগ করুন"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "পোর্ট:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index b1ce003..c4a630e 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=( সুপারিশকৃত ) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=সংযোগ করুন torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/bo/torlauncher.properties +++ b/src/chrome/locale/bo/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index 30310bc..b09753e 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(erbedet) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index 2a7e408..f542b8c 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/bs/torlauncher.properties +++ b/src/chrome/locale/bs/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 9eb7945..65e8947 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuració de la xarxa Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Llengua del navegador Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Abans de connectar-vos a la xarxa Tor, heu d'introduir informació sobre la connexió a internet de l'ordinador que feu servir. "> - -<!ENTITY torSettings.yes "Sí"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Quina de les situacions següents descriu millor la teva?"> -<!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un servidor intermediari."> -<!ENTITY torSettings.configurePrompt2 "He de configurar el pont o el servidor intermediari local abans de connectar a la red Tor&#160"> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "Vull connectar-me directament a la xarxa Tor."> -<!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> <!ENTITY torSettings.connect "Conecta't"> -<!ENTITY torSettings.proxyPageTitle "Configuració del servidor intermediari local"> -<!ENTITY torSettings.proxyQuestion "Aquest ordinador ha de fer servir un servidor intermediari local per accedir a internet?"> - -<!ENTITY torSettings.proxyExplanation1 "En la majoria dels casos, un servidor intermediari local no és necessari, però pot ser que ho sigui quan la connexió és a través d'una xarxa d'empresa, d'una escola, o d'una universitat."> -<!ENTITY torSettings.proxyExplanation2 "Si no sabeu com respondre aquesta pregunta, mireu les preferències d'internet d'un altre navegador o reviseu la configuració de xarxa del vostre sistema per veure si cal un servidor intermediari local."> -<!ENTITY torSettings.enterProxy "Introdueix les opcions del servidor intermediari local."> -<!ENTITY torSettings.bridgePageTitle "Configuració dels ponts Tor"> -<!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si no sabeu com respondre aquesta pregunta, escolliu No (si no podeu connectar-vos a la xarxa Tor sense un pont, podeu afegir-lo després)."> -<!ENTITY torSettings.bridgeExplanation2 "Si escolliu Sí, se us demanarà que configureu els ponts Tor, que són repetidors no llistats que fan que sigui més difícil bloquejar les connexions a la xarxa Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Podeu utilitzar el joc de repetidors aportat o fer-vos-en un de personalitzat. "> -  <!ENTITY torsettings.startingTor "Esperant a Tor per començar..."> @@ -43,8 +26,9 @@ <!ENTITY torsettings.optional "Opcional "> -<!ENTITY torsettings.useProxy.checkbox "Aquest ordinador ha de fer servir un servidor intermediari local per accedir a internet. "> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adreça:"> <!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -55,25 +39,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> -<!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> -<!ENTITY torsettings.useBridges.default "Connecta't amb els ponts predefinits."> -<!ENTITY torsettings.useBridges.note "Cada tipus de pont fa servir un mètode diferent per evitar la censura.  Si un pont no funciona, intenteu-ho amb un altre."> -<!ENTITY torsettings.useBridges.type "Tipus de transport:"> -<!ENTITY torsettings.useBridges.custom "Entra els ponts propis"> -<!ENTITY torsettings.useBridges.label "Entra un o més repetidor de pont (un per línia)."> -<!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copia el registre de Tor al porta-retalls"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Ajuda per als repetidors de pont"> -<!ENTITY torsettings.bridgeHelp1 "Si no podeu connectar-vos a la xarxa Tor, pot ser que el vostre proveidor d'internet (ISP) o alguna altra agència estigui bloquejant Tor.  En principi, podeu evitar aquest problema fent servir Ponts Tor, que son repetidors no llistats més difícils de bloquejar. "> -<!ENTITY torsettings.bridgeHelp1B "Podeu fer servir el joc de ponts preconfigurat o podeu fer-vos en un de propi mitjançant aquests tres mètodes:"> -<!ENTITY torsettings.bridgeHelp2Heading "A través del web"> -<!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web per visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "A través del correu d'autorresposta."> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envieu un correu electrònic a bridges(a)torproject.org només amb el text 'get bridges' al cos del missatge.  No obstant, per fer més difícil que l'atacant esbrini moltes adreces pont, heu d'enviar aquesta petició des d'un dels proveïdors de correu següents (llistats en ordre de preferència):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "A través de l'Escriptori d'Ajuda"> -<!ENTITY torsettings.bridgeHelp4 "Com a última opció, podeu demanar adreces de pont enviant un missatge a help(a)rt.torproject.org.  Una persona respondrà cada petició."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 4200b76..6a35ee5 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Has d'especificar un o mes repetidors. torlauncher.error_default_bridges_type_missing=Heu de seleccionar un tipus de transport per als ponts subministrats. torlauncher.error_bridge_bad_default_type=No hi ha ponts subministrats que tinguin el tipus de transport %S disponible. Si us plau canvieu la configuració. -torlauncher.recommended_bridge=(recomanat) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectar torlauncher.restart_tor=Reinicia Tor diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index e666423..0458e75 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -52,6 +52,3 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> - - -<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd index 9c78c3c..75ece3b 100644 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ b/src/chrome/locale/cs-CZ/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index d5241e1..9ed2a46 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Síťové nastavení TORu"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Jazyk Tor Prohlížeče"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Než se připojíte s síti TORu je potřeba poskytnout údaje o internetovém připojení tohoto počítače."> - -<!ENTITY torSettings.yes "Ano"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> -<!ENTITY torSettings.configurePrompt1 "Připojení k internetu u tohoto pořítače je cenzorováno nebo proxováno."> -<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit most, nebo lokální proxy, než se k síti Tor&#160 připojím."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurovat"> -<!ENTITY torSettings.connectPrompt2 "Rád bych se k síti Tor připojil přímo."> -<!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> -<!ENTITY torSettings.proxyPageTitle "Konfigurace místní proxy"> -<!ENTITY torSettings.proxyQuestion "Potřebuje tento počítač zapnutí lokální proxy, aby se připojil k internetu?"> - -<!ENTITY torSettings.proxyExplanation1 "Ve většině případů lokální proxy není potřeba, ale může být nutná při připojování z firemní, nebo školní sítě."> -<!ENTITY torSettings.proxyExplanation2 "Pokud nevíte, jak na tuto otázku odpovědět, podívejte se na nastavení internetu v jiném prohlížeči, nebo na síťové nastavení na Vašem počítači, aby jste určili, zda je potřeba lokální proxy."> -<!ENTITY torSettings.enterProxy "Zadejte nastavení serveru proxy."> -<!ENTITY torSettings.bridgePageTitle "Konfigurace Tor přemostění"> -<!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> -<!ENTITY torSettings.bridgeExplanation1 "Pokud si nejste jisti, jak na tuto otázku odpovědět, tak zvolte NE (v případě, že se k síti Tor bez mostu nebudete moct připojit, tak most můžete přidat později)."> -<!ENTITY torSettings.bridgeExplanation2 "Pokud zvolíte ANO, budete muset nastavit mosty Toru, což jsou nezveřejněné přenašeče, které zabraňují blokaci připojení k síti Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Můžete použít poskytnutou sadu síťových mostů nebo můžete získat a zadat vlastní sadu."> -  <!ENTITY torsettings.startingTor "Čekání na start TORu"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Volitelný"> -<!ENTITY torsettings.useProxy.checkbox "Tento počítač potřebuje použití proxy, aby se připojil k internetu."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Můj internetový poskytovatel (ISP) blokuje připojení k Tor síti"> -<!ENTITY torsettings.useBridges.default "Připojit pomocí poskytnuté sady mostů"> -<!ENTITY torsettings.useBridges.note "Každý druh mostu používá jiný způsob obcházení cenzury.  Pokud vám nefunguje, zkuste to s jiným."> -<!ENTITY torsettings.useBridges.type "Typ přenosu:"> -<!ENTITY torsettings.useBridges.custom "Zadejete vlastní mosty"> -<!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek)."> -<!ENTITY torsettings.useBridges.placeholder "zadej adresu:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> -<!ENTITY torsettings.bridgeHelp1 "Pokud nejste schopni se připojit k síti TORu, může to být způsobeno tím, že váš posktytovatel internetu (ISP) nebo nějaká jiná služba blokuje Tor.  Většinou můžete obejít tento problém použitím Mostů TORu, což jsou přenašeče neuvedené v seznamu, které je složitější zablokovat."> -<!ENTITY torsettings.bridgeHelp1B "Můžete použít předem nakonfigurovanou, dodanou sadu adres přemostění, nebo můžete získat vlastní sadu adres pomocí jedné z těchto metod:"> -<!ENTITY torsettings.bridgeHelp2Heading "Přes síť"> -<!ENTITY torsettings.bridgeHelp2 "Použijte internetový prohlížeč k návštěvě https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Přes automatický e-mailový odpovídač"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošlete e-mail na bridges(a)torproject.org s větou 'get bridges' jako takovou v těle zprávy.  Nicméně abychom ztížili útočníkovi zjištění spousty adres, musíte tento požadavek poslat z e-mailové adresy gmail.com nebo yahoo.com."> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nebo https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> -<!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 55142dd..78b8217 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Musíte specifikovat jeden nebo více mostů. torlauncher.error_default_bridges_type_missing=Pro zadané bridge musíte zadat typ transportu. torlauncher.error_bridge_bad_default_type=Nejsou zadané žádné bridge, které by měly ty transportu %S. Změňte prosím nastavení. -torlauncher.recommended_bridge=(doporučeno) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Připojit torlauncher.restart_tor=Restartovat Tor diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/csb/torlauncher.properties +++ b/src/chrome/locale/csb/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index 6a95899..a9dfcdf 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Çапла"> -<!ENTITY torSettings.no "Çук"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Çыхăнтар"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Прокси:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Адрĕс:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Порчĕ:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties index bdb9ccd..1b31f1b 100644 --- a/src/chrome/locale/cv/torlauncher.properties +++ b/src/chrome/locale/cv/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Çыхăнтар torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index 2ed3e89..ccabb74 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Gosodiadau Rhwydwaith Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Iaith Porwr Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Cyn cysylltu â rhwydwaith Tor, mae angen i chi roi gwybodaeth am gysylltiad y cyfrifiadur hwn â'r rhyngrwyd."> - -<!ENTITY torSettings.yes "Ie"> -<!ENTITY torSettings.no "Na"> - -<!ENTITY torSettings.firstQuestion "Pa un o'r canlynol sy'n disgrifio'ch sefyllfa orau?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Ffurfweddu"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Cysylltu"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Rhowch osodiadau'r dirprwy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwyn…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Dewisiol"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Math Dirprwy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Cyfeiriad:"> <!ENTITY torsettings.useProxy.address.placeholder "Cyfeiriad IP neu enw gwesteiwr"> <!ENTITY torsettings.useProxy.port "Porth:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Pyrth a ganiateir:"> -<!ENTITY torsettings.useBridges.checkbox "Mae fy Narparydd Gwasanaeth Rhyngrwyd (ISP) yn atal cysylltiadau â rhwydwaith Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copio Cofnod Tor i'r Clipfwrdd"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Cymorth Pont Relái"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index 529152b..b56e43b 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Dylech benodi un neu mwy o bontydd. torlauncher.error_default_bridges_type_missing=Mae'n rhaid i chi dewis fath o cludiant ar cyfer y pontiau a ddatparwyd. torlauncher.error_bridge_bad_default_type=Does ddim pontiau a ddatparwyd gyda'r fath cludiant %S ar gael. Addaswch eich osodiadau, os gwelwch yn dda. -torlauncher.recommended_bridge=(awgrymwyd) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Cysylltu torlauncher.restart_tor=Ailgychwyn Tor diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 4257722..6ca365b 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Før du opretter forbindelse til Tor-netværket, skal du indtaste information om denne computers internetforbindelse."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nej"> - -<!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> -<!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy."> -<!ENTITY torSettings.configurePrompt2 "Jeg skal konfigurerer bro- og lokal proxyindstillinger før jeg opretter forbindelse til Tor-netværket."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Indstil"> -<!ENTITY torSettings.connectPrompt2 "Jeg vil foretage en direkte forbindelse til Tor-netværket."> -<!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> <!ENTITY torSettings.connect "Tilslut"> -<!ENTITY torSettings.proxyPageTitle "Lokale proxy indstillinger"> -<!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå internettet?"> - -<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfælde er en lokal proxy ikke nødvendig, men det kan være krævet når der oprettes forbindelse gennem netværket i en virksomhed, skole eller universitet."> -<!ENTITY torSettings.proxyExplanation2 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så kig i internetindstillingerne i en anden browser og tjek dit systems netværksindstillinger, for at se hvorvidt det er nødvendigt med en lokal proxy."> -<!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger."> -<!ENTITY torSettings.bridgePageTitle "Tor bridge konfiguration"> -<!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor-netværket?"> -<!ENTITY torSettings.bridgeExplanation1 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så vælg Nej (hvis du ikke er i stand til at oprette forbindelse til Tor-netværket gennem en bro, så kan du tilføje en senere)."> -<!ENTITY torSettings.bridgeExplanation2 "Hvis du vælger Ja, så vil du blive spurgt om at konfigurere Tor-broer, hvilket er ulistede relæer som gøre det svære at blokere forbindelser til Tor-netværket."> -<!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sæt broer eller du kan hente og indtaste et skræddersyet sæt broer."> -  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Valgfri"> -<!ENTITY torsettings.useProxy.checkbox "Denne computer skal bruge en lokal proxy for at tilgå internettet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox "Min internetudbyder (ISP) blokerer forbindelser til Tor-netværket"> -<!ENTITY torsettings.useBridges.default "Forbind med tildelte broer"> -<!ENTITY torsettings.useBridges.note "Hver type bro bruger forskellige metoder for at undgå censurering.  Hvis en bro ikke virker, så prøv igen med en anden."> -<!ENTITY torsettings.useBridges.type "Transporttype:"> -<!ENTITY torsettings.useBridges.custom "Indtast skræddersyede broer"> -<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et pr. linje)"> -<!ENTITY torsettings.useBridges.placeholder "type adresse:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan oprette forbindelse til Tor-netværket er det muligt at din internetudbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at omgå problemet ved at bruge Tor-broer. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> -<!ENTITY torsettings.bridgeHelp1B "Du kan bruge de prækonfigurerede, tildelte sæt af broadresser eller du kan få fat i et tilpasset sæt af adresser, ved at bruge en af disse metoder:"> -<!ENTITY torsettings.bridgeHelp2Heading "Gennem webbet"> -<!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske e-mailservice"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen "get bridges" som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 14ec412..f0ae6c1 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. -torlauncher.recommended_bridge=(anbefalet) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index d976ea2..534b17d 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor-Netzwerkeinstellungen"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor-Browser-Sprache"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Bevor Sie sich zum Tor-Netzwerk verbinden können, müssen Sie Informationen über den Internetanschluss Ihres Rechners bereitstellen."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nein"> - -<!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?"> -<!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert oder vermittelt."> -<!ENTITY torSettings.configurePrompt2 "Ich muss eine Netzwerkbrücke oder lokale Proxy-Einstellungen konfigurieren, bevor ich mich mit dem Tor Netzwerk verbinde."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurieren"> -<!ENTITY torSettings.connectPrompt2 "Ich würde gerne eine direkte Verbindung mit dem Tor-Netzwerk herstellen"> -<!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren."> <!ENTITY torSettings.connect "Verbinden"> -<!ENTITY torSettings.proxyPageTitle "Lokale Proxy-Konfiguration"> -<!ENTITY torSettings.proxyQuestion "Benötigt dieser Rechner einen lokalen Proxy um auf das Internet zuzugreifen?"> - -<!ENTITY torSettings.proxyExplanation1 "In den meisten Fällen ist ein lokaler Proxy nicht nötig, er könnte aber notwendig werden, falls eine Verbindung durch ein Firmen-, Schul- oder Universitätsnetzwerk aufgebaut werden soll."> -<!ENTITY torSettings.proxyExplanation2 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, sehen Sie sich die Interneteinstellungen in einem anderen Browser an oder überprüfen Sie die Netzwerkeinstellungen des Systems um zu bestimmen, ob sie einen lokalen Proxyserver benötigen."> -<!ENTITY torSettings.enterProxy "Proxy-Einstellungen eingeben."> -<!ENTITY torSettings.bridgePageTitle "Torbrücken-Konfiguration"> -<!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wählen Sie nein (falls Sie nicht in der Lage sind, sich ohne Brücke mit dem Tor-Netzwerk zu verbinden, können Sie sie später hinzufügen)."> -<!ENTITY torSettings.bridgeExplanation2 "Wenn Sie Ja wählen, werden sie gebeten, Tor-Brücken zu konfigurieren. Tor-Brücken sind nicht gelistete Relais, die es erschweren, Verbindungen zum Tor-Netzwerk zu blockieren."> -<!ENTITY torSettings.bridgeSettingsPrompt "Sie könne den bereitgestellten Satz an Brücken verwenden oder Sie können welche erhalten, und geben einen benutzerdefinierten Satz an Brücken ein."> -  <!ENTITY torsettings.startingTor "Auf den Start von Tor wird gewartet …"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "Dieser Rechner benötigt einen lokalen Proxy um auf das Internet zuzugreifen"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy-Typ:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-Adresse oder Rechnername"> <!ENTITY torsettings.useProxy.port "Anschluss:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte Anschlüsse zulässt"> <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:"> -<!ENTITY torsettings.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk"> -<!ENTITY torsettings.useBridges.default "Mit bereitgestellten Brücken verbinden "> -<!ENTITY torsettings.useBridges.note "Jede Art von Brücke verwendet eine andere Methode um Zensur zu umgehen. Wenn eine Brücke nicht funktioniert, versuchen Sie es erneut, unter Verwendung einer anderen Brücke."> -<!ENTITY torsettings.useBridges.type "Übertragungstyp:"> -<!ENTITY torsettings.useBridges.custom "Benutzerdefinierte Brücken eingeben"> -<!ENTITY torsettings.useBridges.label "Ein oder mehrere Brückenrelais eingeben (eins pro Zeile)."> -<!ENTITY torsettings.useBridges.placeholder "Typ Adresse:Anschluss"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> -<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.  Dieses Problem kann meist mit der Benutzung von Torbrücken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken."> -<!ENTITY torsettings.bridgeHelp1B "Sie können den vorkonfigurierten Standardsatz von Brückenadressen benutzen oder Sie können einen angepassten Satz an Adresse mit Hilfe einer der folgenden Methoden erhalten:"> -<!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet"> -<!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Schicken Sie eine E-Mail mit dem Text 'get bridges' an bridges(a)torproject.org. Um Missbrauch durch das Auslesen großer Mengen an Brücken zu erschweren, muss Ihre Anfrage jedoch von einem der folgenden E-Mail-Anbieter kommen (aufgelistet in der Reihenfolge der Präferenz):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle"> -<!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help(a)rt.torproject.org angefordert werden.  Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 8406776..c198101 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Sie müssen eine oder mehrere Brücken eingebe torlauncher.error_default_bridges_type_missing=Sie müssen eine Transporttyp für die bereitgestellten Brücken auswählen. torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten Brücken verfügbar, die den Transporttyp %S haben. Bitte passen Sie Ihre Einstellungen an. -torlauncher.recommended_bridge=(empfohlen) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Verbinden torlauncher.restart_tor=Tor neustarten diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/dz/torlauncher.properties +++ b/src/chrome/locale/dz/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 85d7b78..f089eae 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου "> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Γλώσσα του Tor Browser"> @@ -6,32 +9,11 @@  -<!ENTITY torsettings.prompt "Πριν συνδεθείτε στο δίκτυο Tor, θα χρειαστούμε λίγες πληροφορίες για το πώς συνδέεστε στο Internet."> - -<!ENTITY torSettings.yes "Ναι"> -<!ENTITY torSettings.no "Οχι"> - -<!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> -<!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> -<!ENTITY torSettings.configurePrompt2 "Πριν συνδεθώ στο δίκτυο Tor πρέπει να προσαρμοσθούν οι γέφυρες ή οι ρυθμίσεις του τοπικού ενδιάμεσου."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Ρύθμιση "> -<!ENTITY torSettings.connectPrompt2 "Θέλω να συνδεθώ απ'ευθείας στο δίκτυο Tor."> -<!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση"> -<!ENTITY torSettings.proxyPageTitle "Τοπική διαμόρφωση Proxy"> -<!ENTITY torSettings.proxyQuestion "Μήπως αυτός ο υπολογιστής πρέπει να χρησιμοποιήσει ένα τοπικό proxy για την πρόσβαση στο Διαδίκτυο;"> - -<!ENTITY torSettings.proxyExplanation1 "Στις περισσότερες περιπτώσεις δε χρειάζεται κάποιος τοπικός ενδιάμεσος διακομιστής, ίσως όμως είναι αναγκαίος όταν συνδέεστε μέσω κάποιας εταιρίας, σχολείου ή πανεπιστημιακού δικτύου."> -<!ENTITY torSettings.proxyExplanation2 "Αν δεν είστε βέβαιοι/ες για την απάντηση σε αυτό το ερώτημα και για να διαπιστώσετε αν είναι αναγκαίος ένας τοπικός ενδιάμεσος, ελέγξτε τις ρυθμίσεις Διαδικτύου σε κάποιον άλλο περιηγητή ή τις ρυθμίσεις δικτύωσης του υπολογιστή σας ."> -<!ENTITY torSettings.enterProxy "Εισάγωγη των ρυθμίσεων διακομιστή μεσολάβησης."> -<!ENTITY torSettings.bridgePageTitle "Διαμόρφωση Γεφυρών Tor"> -<!ENTITY torSettings.bridgeQuestion "Γνωρίζετε αν ο πάροχος (ISP) σας μπλοκάρει ή με οποιοδήποτε τρόπο ελέγχει συνδέσεις -στο δίκτυο Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Αν δεν γνωρίζετε πως να απαντήσετε σε αυτή την ερώτηση, επιλέξτε Όχι (αν δεν μπορείτε να συνδεθείτε στο δίκτυο Tor χωρίς την χρήση κάποιας γέφυρας, μπορείτε να προσθέσετε αργότερα μια)."> -<!ENTITY torSettings.bridgeExplanation2 "Αν επιλέξετε Ναι θα σας ζητηθεί να ρυθμίσετε τις Γέφυρες Tor, οι οποίες είναι ακαταχώριστοι αναμεταδότες που δυσκολεύουν την παρεμπόδιση σύνδεσης στο Δίκτυο Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Μπορείτε να χρησιμοποιήσετε τις προκαθορισμένες γέφυρες, ή να αποκτήσετε και εισάγετε νέες διευθύνσεις γεφυρών."> -  <!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... "> @@ -43,8 +25,9 @@ <!ENTITY torsettings.optional "Προεραιτικα"> -<!ENTITY torsettings.useProxy.checkbox "Αυτός ο υπολογιστής χρειάζεται να χρησιμοποιήσει ένα τοπικό proxy για την πρόσβαση στο Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Διεύθυνση:"> <!ENTITY torsettings.useProxy.address.placeholder "Διεύθυνση ΙΡ η όνομα υπολογιστή "> <!ENTITY torsettings.useProxy.port "Θύρα συστήματος:"> @@ -55,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> -<!ENTITY torsettings.useBridges.checkbox "Ο πάροχος διαδικτυου (ISP) μπλοκάρει τις συνδέσεις στο δίκτυο του Tor"> -<!ENTITY torsettings.useBridges.default "Σύνδεση με προκαθορισμένες γέφυρες"> -<!ENTITY torsettings.useBridges.note "Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο αποφυγής της λογοκρισίας.  Αν δεν λειτουργεί κάποια γέφυρα, προσπαθήστε και πάλι χρησιμοποιώντας κάποια άλλη, διαφορετική."> -<!ENTITY torsettings.useBridges.type "Τύπος μεταφοράς:"> -<!ENTITY torsettings.useBridges.custom "Εισαγωγή άλλων γεφυρών"> -<!ENTITY torsettings.useBridges.label "Εισάγετε μια ή περισσότερες διευθύνσεις γεφυρών (μία ανά γραμμή)."> -<!ENTITY torsettings.useBridges.placeholder "τύπος διεύθυνση:πόρτα"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> -<!ENTITY torsettings.bridgeHelp1 "Αν δε μπορείτε να συνδεθείτε στο δίκτυο Tor, ίσως ο πάροχός (ISP) σας ή κάποιος τρίτος μπλοκάρει το Tor .  Αυτό το πρόβλημα συνήθως λύνεται με τη χρήση Tor Bridges (γέφυρες), που είναι μη δημοσιευμένες διευθύνσεις από τις οποίες μπορείτε να μπείτε στο δίκτυο Tor, συνεπώς πιο δύσκολο να μπλοκαριστούν."> -<!ENTITY torsettings.bridgeHelp1B "Μπορείτε να χρησιμοποιήσετε το προδιαμορφωμένο παρεχόμενο σετ διευθύνσεων γ'έφυρων ή να με την προϋπόθεση σύνολο των διευθύνσεων γέφυρας ή να αποκτήσετε ένα προσαρμοσμένο σύνολο διευθύνσεων, χρησιμοποιώντας μία από αυτές τις μεθόδους:"> -<!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> -<!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Αποστολή email στο bridges(a)torproject.org με τη γραμμή «λήψη γεφυρών» από μόνη της στο σώμα του μηνύματος.  Ωστόσο, για να γίνει πιο δύσκολο για έναν εισβολέα να μάθει πολλά από τις διευθύνσεις γεφυρών, θα πρέπει να στείλετε αυτό το αίτημα από ένα από τους επόμενους πάροχους υπηρεσιών ηλεκτρονικού ταχυδρομείου (αναφέρονται κατά σειρά προτίμησης):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> -<!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index 9536914..53e6db2 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Πρέπει να καθορίσετε μια torlauncher.error_default_bridges_type_missing=Πρέπει να επιλέξετε έναν τύπο μεταφοράς για τις παρεχόμενες γέφυρες. torlauncher.error_bridge_bad_default_type=Δεν υπάρχουν γέφυρες που έχουν το είδος μεταφοράς %S διαθέσιμες. Παρακαλούμε να προσαρμόσετε τις ρυθμίσεις σας. -torlauncher.recommended_bridge=(συνιστάται) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Σύνδεση torlauncher.restart_tor=Eπανεκκίνηση Tor diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/en-GB/torlauncher.properties +++ b/src/chrome/locale/en-GB/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index f6d763a..6030497 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Jes"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Konekti"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adreso:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Pordo:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index a3cae92..625c9b3 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Vi devas specifi unu aŭ pli da pontojn. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(rekomendita) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Konekti torlauncher.restart_tor=Restartigi Tor diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 5be6fa5..5cb2dda 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuraciones de la red Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Antes de que te conectes a la red Tor, es necesario que proveas información acerca de como se conecta esta computadora a Internet"> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes opciones describe mejor su situación?"> -<!ENTITY torSettings.configurePrompt1 "La conexión a Internet de esta computadora esta censurada o utiliza un proxy"> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar un puente o proxy local anntes de conectarme a la red Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Me gustaría conectarme directamente a la red Tor."> -<!ENTITY torSettings.connectPrompt3 "Esto debería funcionar en la mayoría de situaciones."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Configuracion del Proxy Local"> -<!ENTITY torSettings.proxyQuestion "¿Esta computadora necesita un proxy local para acceder a internet?"> - -<!ENTITY torSettings.proxyExplanation1 "En la mayoria de los casos un proxy local no es necesario, pero puede ser requerido cuando se conecta desde la red de una empresa, escuela o universidad."> -<!ENTITY torSettings.proxyExplanation2 "Si no estas segura como contestar esta respuesta, revisa la configuracion de otro navegadoro chequea la configuracion de red del sistema para ver si es necesario un proxy local."> -<!ENTITY torSettings.enterProxy "Ingresa la configuracion del proxy"> -<!ENTITY torSettings.bridgePageTitle "Configuracion del Punte de Tor"> -<!ENTITY torSettings.bridgeQuestion "¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algún modo censura conexiones a la red Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si no estas segura como contestar esta respuesta, elegí No ( si no te podes conectar a la red Tor sin un puente, podes agrega uno luego)."> -<!ENTITY torSettings.bridgeExplanation2 "Si elegís Si, se te preguntara para configurar puentes Tor, que son relés no listados que permiten dificultar el bloqueo de conexiones a la red Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Dirección:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Puerto:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "A través de la Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index b7af741..aeea231 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Debes especificar uno o más puentes. torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. -torlauncher.recommended_bridge=(recomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar Tor diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 30d3940..0ead399 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuracion De Internet Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index b44f8d9..a45aaa4 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index 4a458a0..2aa5251 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuraciones de red de Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer información acerca de la conexión de internet de este computador."> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties index 15da429..91e854e 100644 --- a/src/chrome/locale/es-CO/torlauncher.properties +++ b/src/chrome/locale/es-CO/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 85b97c0..4128c81 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuración de red Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Lenguaje en el explorador de Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Antes de conectarte a la red de Tor, necesitas proveer información sobre la conexión de Internet de esta computadora. "> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Que describe mejor tu situación? Elige las opciones que apliquen. "> -<!ENTITY torSettings.configurePrompt1 "La conexión de Internet de esta computadora esta censurada o en un proxy"> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar un puente o ajustes del proxy local antes de que me conecte a la red Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Me gustaría realizar una conexión directa a la red Tor. "> -<!ENTITY torSettings.connectPrompt3 "Esto funcionara en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Configuración del Proxy Local"> -<!ENTITY torSettings.proxyQuestion "Esta computadora necesita usar un proxy local para accesar el Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "La mayoría de los casos no requieren un proxy local, pero si podría ser requerido cuando te conectas por medio de una compañia, escuela, o red universitaria."> -<!ENTITY torSettings.proxyExplanation2 "Si no estas seguro de como contestar esta pregunta, ve tu configuración de Internet en otro explorador o checa tu configuración de red del sistema para ver si necesitas un proxy local o no. "> -<!ENTITY torSettings.enterProxy "Introduce la configuración de proxy"> -<!ENTITY torSettings.bridgePageTitle "Configuracion de puentes Tor"> -<!ENTITY torSettings.bridgeQuestion "Tu proveedor de servicio de Internet (ISP) bloquea o censura conexiones a la red de Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si no estas seguro de como contestar la pregunta, escoge No (si no puedes conectarte a la red Tor sin un puente, puedes agregar uno despues)."> -<!ENTITY torSettings.bridgeExplanation2 "Si escoges Si, se te pedira configurar puentes Tor, los cuales son relés no registrados que hace que sea mas dificil bloquear las conexiones de la red Tor. "> -<!ENTITY torSettings.bridgeSettingsPrompt "Puedes usar el conjunto de puentes o puedes obtener e introducir un conjunto personalizado de puentes."> -  <!ENTITY torsettings.startingTor "Esperando a que Tor inicie..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Puerto:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index ed9c85d..f836917 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Debes especificar uno o más puentes torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los puentes proporcionados. torlauncher.error_bridge_bad_default_type=Ningún puente proporcionado que tenga el tipo de transporte %S está disponibole. Por favor, ajuste su configuración. -torlauncher.recommended_bridge=(recomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar Tor diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 45ff7f0..143ac6c 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configuración de la red Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Antes de que se conecte a la red Tor, necesita proporcionar información sobre la conexión a Internet de este equipo."> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes opciones describe mejor su situación?"> -<!ENTITY torSettings.configurePrompt1 "La conexión a Internet de este equipo está censurada o proxificada."> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar puentes de red o proxy local antes de conectar a la red Tor. "> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> -<!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Configuración del proxy local"> -<!ENTITY torSettings.proxyQuestion "¿Necesita mi computadora utilizar un proxy local para acceder a Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "En la mayoría de los casos no se requiere un proxy (interpuesto) local, pero puede ser necesario al realizar una conexión a través de una red de empresa, de escuela, o universitaria. "> -<!ENTITY torSettings.proxyExplanation2 "Si no estás seguro de cómo responder a esta pregunta mira la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema para ver si necesitas un proxy local."> -<!ENTITY torSettings.enterProxy "Introduce los ajustes del proxy."> -<!ENTITY torSettings.bridgePageTitle "Configuración de puentes de red Tor"> -<!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si no estás seguro de cómo responder a esta pregunta elige No (si no puedes conectarte a la red Tor sin un puente de red o bridge, puedes añadir uno más adelante)."> -<!ENTITY torSettings.bridgeExplanation2 "Si eliges Sí se te pedirá que configures los puentes de red (bridges) de Tor, que son repetidores no listados que dificultan el bloqueo de conexiones hacia la red Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Puedes utilizar el grupo de puentes de red (bridges) proporcionado, o puedes obtener e introducir un grupo de puentes propio."> -  <!ENTITY torsettings.startingTor "Esperando a que Tor se inicie..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Esta computadora necesita utilizar un proxy local para acceder a Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Dirección:"> <!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de máquina (host)"> <!ENTITY torsettings.useProxy.port "Puerto:"> @@ -54,26 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos(firewall) que sólo permite conexiones a ciertos puertos"> <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> -<!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor"> -<!ENTITY torsettings.useBridges.default "Conectar con los puentes proporcionados"> -<!ENTITY torsettings.useBridges.note "Cada tipo de puente de red usa un método diferente para evitar la censura.  Si un puente no funciona, inténtalo de nuevo utilizando otro."> -<!ENTITY torsettings.useBridges.type "Tipo de transporte:"> -<!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados"> -<!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente(uno por línea)."> -<!ENTITY torsettings.useBridges.placeholder "introduzca dirección:puerto"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> -<!ENTITY torsettings.bridgeHelp1 "Si no puede conectarse a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.  A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son públicos, y es más difícil que sean bloqueados."> -<!ENTITY torsettings.bridgeHelp1B "Puedes usar grupo de direcciones de puentes de red proporcionado aquí, o puedes obtener un nuevo grupo de direcciones usando uno de estos métodos:"> -<!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> -<!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envía un correo electrónico a bridges(a)torproject.org únicamente con la línea 'get bridges' en el cuerpo del mensaje.  Para que sea más difícil para un atacante adquirir muchas direcciones de puentes, tienes que enviar esta petición desde uno de los siguientes proveedores de correo electrónico (listados en orden de preferencia):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com o https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario"> -<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help(a)rt.torproject.org .  -Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.  Esto puede llevar varios minutos."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index d414c01..085285c 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges' torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados. torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias. -torlauncher.recommended_bridge=(recomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar Tor diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index 35b5fe3..4559d19 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Jah"> -<!ENTITY torSettings.no "Ei"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configure "Häälesta"> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 57528a5..039ff73 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -28,12 +28,13 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(soovitatud) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=Välju torlauncher.done=Valmis torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 9753df9..886d888 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor sare ezarpenak"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor nabigatzailearen hizkuntza"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor sarera konektatu baino lehen, ordenagailu honen Interneteko konexioari buruzko informazioa eman behar duzu."> - -<!ENTITY torSettings.yes "Bai"> -<!ENTITY torSettings.no "Ez"> - -<!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> -<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> -<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy lokalaren ezarpenak konfiguratu behar ditut Tor sarera konektatu baino lehen."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguratu"> -<!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> -<!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> <!ENTITY torSettings.connect "Konektatu"> -<!ENTITY torSettings.proxyPageTitle "Proxy lokalaren konfigurazioa"> -<!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxy lokalen bat erabili behar al du?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi taldea erabili dezakezu edo zubi talde pertsonalizatua eskuratu eta sar dezakezu."> -  <!ENTITY torsettings.startingTor "Tor abiarazi dadin itxaroten..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Hautazkoa"> -<!ENTITY torsettings.useProxy.checkbox "Ordenagailu honek proxy lokal bat erabili behar du Internetera sartzeko"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy mota:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Helbidea:"> <!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena"> <!ENTITY torsettings.useProxy.port "Ataka:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa"> <!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:"> -<!ENTITY torsettings.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit."> -<!ENTITY torsettings.useBridges.default "Emandako zubiekin konektatu"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Garraio mota:"> -<!ENTITY torsettings.useBridges.custom "Sartu zubi pertsonalizatuak"> -<!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko)."> -<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> -<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> -<!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> -<!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.  Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu (lehentasunaren arabera zerrendatuta):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> -<!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 8c49224..aa75407 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu. torlauncher.error_default_bridges_type_missing=Emandako zubietarako garraio mota bat hautatu behar duzu. torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota duten emandako zubirik. Mesedez doitu zure ezarpenak. -torlauncher.recommended_bridge=(gomendatuta) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Konektatu torlauncher.restart_tor=Tor berrabiarazi diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 76cb386..3f189a3 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "تنظیمات شبکه تور"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "زبان مرورگر تور"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "قبل از اتصال به شبکه تور، باید اطلاعاتی از نحوه اتصال این کامپیوتر به اینترنت فراهم کنید."> - -<!ENTITY torSettings.yes "بله"> -<!ENTITY torSettings.no "نه"> - -<!ENTITY torSettings.firstQuestion "کدام یک از موارد زیر وضعیت شما را بهتر بیان می‌کند؟"> -<!ENTITY torSettings.configurePrompt1 "اتصال به اینترنت این کامپیوتر یا فیلترینگ شدید دارد و یا پراکسی دارد."> -<!ENTITY torSettings.configurePrompt2 "نیاز به تنظیم bridge یا پروکسی داخلی پیش از ارتباط با شبکه تٌر  دارم."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "پیکربندی"> -<!ENTITY torSettings.connectPrompt2 "می خواهم اتصال مستقیم با شبکه تٌر برقرار کنم."> -<!ENTITY torSettings.connectPrompt3 "این در بیشتر مواقع کار خواهد کرد."> <!ENTITY torSettings.connect "اتصال"> -<!ENTITY torSettings.proxyPageTitle "پیکربندی پراکسی محلی"> -<!ENTITY torSettings.proxyQuestion "آیا این کامپیوتر نیاز به استفاده از یک پروکسی محلی برای دسترسی به اینترنت دارد؟"> - -<!ENTITY torSettings.proxyExplanation1 "در بیشتر موارد نیازی به پروکسی محلی نمی باشد. با این حال ممکن است برای اتصال از طریق شبکه شرکت، مدرسه، یا دانشگاه مورد نیاز باشد."> -<!ENTITY torSettings.proxyExplanation2 "اگر مطمئن نیستید چگونه به این سوال پاسخ دهید، به تنظیمات اینترنت خود در مرورگر دیگری و یا تنظیمات شبکه کامپیوتر خود رجوع کنید تا ببینید آیا به پروکسی محلی نیاز دارید یا خیر."> -<!ENTITY torSettings.enterProxy "تنظیمات پراکسی را وارد کنید."> -<!ENTITY torSettings.bridgePageTitle "پیکربندی پل تور"> -<!ENTITY torSettings.bridgeQuestion "آیا شرکتی که از آن اینترنت گرفته اید (ISP)، دسترسی به شبکه تور را فیلتر، سانسور و یا مسدود می کند؟"> -<!ENTITY torSettings.bridgeExplanation1 "اگر مطمئن نیستید چگونه به این سوال پاسخ دهید، گزینه 'نه' را انتخاب کنید (در صورتی که نتوانستید بدون استفاده از یک bridge به شبکه تٌر متصل شویدِ، می توانید در هر زمان یک bridge اضافه کنید)."> -<!ENTITY torSettings.bridgeExplanation2 "در صورتی که 'بله' را انتخاب کنید، از شما درخواست خواهد شد که bridge های تٌر را تنظیم کنید. bridge ها رله هایی هستند که در هیچ کجا لیست نشده و به همین جهت مسدود کردن ارتباط با شبکه تٌر را سخت تر می کنند."> -<!ENTITY torSettings.bridgeSettingsPrompt "شما می‌توانید از مجموعه‌ای از پل‌های آماده و یا پل‌های شخصی خودتان استفاده کنید."> -  <!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "اختیاری"> -<!ENTITY torsettings.useProxy.checkbox "این کامپیوتر نیاز به استفاده از یک پروکسی محلی برای دسترسی به اینترنت دارد"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "نوع پراکسی:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "آدرس:"> <!ENTITY torsettings.useProxy.address.placeholder "آدرس آی‌پی یا نام میزبان"> <!ENTITY torsettings.useProxy.port "پورت:"> @@ -54,26 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد."> <!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:"> -<!ENTITY torsettings.useBridges.checkbox "‫سرویس دهنده اینترنت (ISP) من اتصال به شبکه تور را مسدود می‌کند."> -<!ENTITY torsettings.useBridges.default "اتصال از طریق پل‌های انتخاب شده"> -<!ENTITY torsettings.useBridges.note "هر یک از انواع bridge از روشی متفاوت برای دورزدن سانسور اینترنت استفاده می کنند.  اگر یکی از bridge ها برای شما کار نکرد، bridge دیگری را انتخاب کنید و دوباره سعی کنید."> -<!ENTITY torsettings.useBridges.type "نوع انتقال:"> -<!ENTITY torsettings.useBridges.custom "پل‌های شخصی را وارد کنید"> -<!ENTITY torsettings.useBridges.label "یک یا چند پل ارتباطی را وارد نمایید. (در هر خط یکی)"> -<!ENTITY torsettings.useBridges.placeholder "آدرس آی‌پی:پورت را وارد کنید"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> -<!ENTITY torsettings.bridgeHelp1 "اگر نمی توانید به شبکه تور متصل شوید، ممکن است به این دلیل باشد که شرکت ارایه کننده اینترنت شما(ISP) و یا سازمان های دیگر شبکه تور را بسته اند.  -غالباً می توانید این محدودیت را با استفاده از «پل» های تور دور بزنید. پل ها مسیرهای اضافی دور زدن فیلتر هستند که لیست آن در دسترس نیست و فیلتر کردن آن ها بسیار مشکل است."> -<!ENTITY torsettings.bridgeHelp1B "شما می توانید از مجموعه فراهم شده و از پیش تنظیم شده آدرسهای bridge ها استفاده کنید و یا می توانید یک مجموعه آدرس سفارشی با استفاده از یکی از این روشهای تهیه کنید:"> -<!ENTITY torsettings.bridgeHelp2Heading "از طریق اینترنت"> -<!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید."> -<!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "یک ایمیل حاوی عبارت 'get bridges' به آدرس bridges(a)torproject.org ارسال کنید.  هر چند ، برای اینکه بتوانیم یادگیری آدرس بسیاری از پل‌ها را برای مهاجم سخت‌تر کنیم ، می‌بایست این درخواست را از یکی از سرویس دهنده‌های ایمیل زیر بفرستید ( ذکر شده به ترتیب اولویت ) :"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, یا https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> -<!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index 8a827b5..f03be2f 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=شما باید یک یا پل های بیشت torlauncher.error_default_bridges_type_missing=نوع انتقال باید برای پل‌ها مشخص گردد. torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجود نیست. لطفا تنظیمات را اصلاح کنید. -torlauncher.recommended_bridge=(توصیه شده) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=اتصال torlauncher.restart_tor=تور را ریستارت کنید. diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index bbd6db8..deaba69 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor-verkkoasetukset"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor-selaimen kieli"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Ennen kuin voit yhdistää Tor-verkkoon, sinun on annettava tietoja tietokoneesi internet-yhteydestä."> - -<!ENTITY torSettings.yes "Kyllä"> -<!ENTITY torSettings.no "Ei"> - -<!ENTITY torSettings.firstQuestion "Mikä seuraavista kuvailee parhaiten tilannettasi?"> -<!ENTITY torSettings.configurePrompt1 "Tämän tietokoneen internet-yhteys on sensuroitu tai kulkee välityspalvelimen kautta."> -<!ENTITY torSettings.configurePrompt2 "Minun täytyy configuroida joko silta- tai paikallinen välityspalvelimen asetukset ennen kuin yhdistän Tor verkkoon."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Määritä"> -<!ENTITY torSettings.connectPrompt2 "Haluan tehdä suoran yhteyden Tor-verkkoon."> -<!ENTITY torSettings.connectPrompt3 "Tämä toimii useimmissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> -<!ENTITY torSettings.proxyPageTitle "Paikallisen välityspalvelimen määritys"> -<!ENTITY torSettings.proxyQuestion "Tarvitseeko tämän tietokoneen käyttää paikallista välityspalvelinta Internet-pääsyyn?"> - -<!ENTITY torSettings.proxyExplanation1 "Yleensä paikallista välityspalvelinta ei tarvita mutta se voidaan tarvia jos yhdistetään yrityksen, koulun tai yliopistpjen verkon kautta."> -<!ENTITY torSettings.proxyExplanation2 "Jos et ole varma, kuinka vastata tähän kysymykseen, katso toisen selaimen Internet-asetuksista tai järjestelmäsi verkkoasetuksista, tarvitaanko paikallista välityspalvelinta."> -<!ENTITY torSettings.enterProxy "Kirjoita välityspalvelinasetukset."> -<!ENTITY torSettings.bridgePageTitle "Tor-siltojen määritys"> -<!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estääkö sinun operaattorisi (ISP) yhteydet Tor-verkkoon?"> -<!ENTITY torSettings.bridgeExplanation1 "Jos et ole varma, kuinka vastata tähän kysymykseen, valitse Ei (jos et voi yhdistää Tor-verkkoon ilman siltaa, voit lisätä sellaisen myöhemmin)."> -<!ENTITY torSettings.bridgeExplanation2 "Jos valitset Kyllä, sinua pyydetään määrittämään Tor-sillat, jotka ovat listaamattomia välityspalvelimia, jotta yhteyksiä olisi vaikeampi estää Tor-verkkoon yhdistettäessä."> -<!ENTITY torSettings.bridgeSettingsPrompt "Voit käyttää tarjottua siltajoukkoa tai voit hankkia ja kirjoittaa oman siltojen joukon."> -  <!ENTITY torsettings.startingTor "Odotetaan Tor-sovelluksen käynnistymistä..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Vaihtoehtoinen"> -<!ENTITY torsettings.useProxy.checkbox "Tämä tietokone tarvitsee paikallisen välityspalvelimen Internet-pääsyyn"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Välityspalvelintyyppi:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Osoite:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-osoite tai palvelinnimi"> <!ENTITY torsettings.useProxy.port "Portti:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta"> <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:"> -<!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoajani (ISP) estää yhteydet Tor-verkkoon"> -<!ENTITY torsettings.useBridges.default "Yhdistä tarjotuilla silloilla"> -<!ENTITY torsettings.useBridges.note "Jokainen siltatyyppi käyttää eri tapaa sensuurin välttämiseksi.  Jos yksi silta ei toimi, kokeile uudelleen käyttäen toista siltaa."> -<!ENTITY torsettings.useBridges.type "Siirtotyyppi:"> -<!ENTITY torsettings.useBridges.custom "Kirjoita omat sillat"> -<!ENTITY torsettings.useBridges.label "Kirjoita yksi tai useampi siltavälityspalvelin (yksi per rivi)."> -<!ENTITY torsettings.useBridges.placeholder "kirjoita osoite:portti"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopioi Tor-loki leikepöydälle"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Siltavälityspalvelinopaste"> -<!ENTITY torsettings.bridgeHelp1 "Jos et pysty yhdistämään Tor-verkkoon, syy voi olla, että Internet palveluntarjoajasi (ISP) tai muu taho estää Tor-sovelluksen.  Usein voit kiertää tämän ongelman käyttämällä Tor-siltoja, jotka ovat listaamattomia välityspalvelimia, joita on vaikeampi estää."> -<!ENTITY torsettings.bridgeHelp1B "Voit käyttää ennalta määritettyä, tarjottua siltajoukkoa tai voit hankkia oman osoitejoukon jollakin näistä tavoista:"> -<!ENTITY torsettings.bridgeHelp2Heading "Verkon yli"> -<!ENTITY torsettings.bridgeHelp2 "Käytä internet-selainta vieraillaksesi osoitteessa: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Sähköpostin automaattivastaajan läpi"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Lähetä sähköpostia osoitteeseen bridges(a)torproject.org käyttäen viestissä tekstiä 'get bridges' pelkästään viestin rungossa.  Jotta hyökkääjälle olisi kuitenkin vaikeampaa monien siltaosoiteiden oppiminen, sinun on lähetettävä pyyntö yhden seuraavan sähköpostitarjoajan kautta (lueteltu suosion mukaisessa järjestyksessä):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com tai https:://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen läpi"> -<!ENTITY torsettings.bridgeHelp4 "Viimeisenä keinona voit pyytää siltaosoitteita lähettämällä kohteliaan viestin osoitteeseen: help(a)rt.torproject.org.  Huomioi, että henkilön tulee vastata kuhunkin pyyntöön."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index ebe5251..0a50300 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Määrittele yksi tai useampi silta. torlauncher.error_default_bridges_type_missing=Sinun täytyy valita siirtotyyppi tarjotuille silloille. torlauncher.error_bridge_bad_default_type=Tarjolla olevissa silloissa ei ole saatavilla siirtotyyppiä %S. Mukauta asetuksiasi. -torlauncher.recommended_bridge=(suositeltu) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Yhdistä torlauncher.restart_tor=Käynnistä Tor uudelleen diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index b73700b..bade2fe 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Bago ka maka-connect sa Tor network, kailangan mong mag-bigay ng impormasyon tungkol sa koneksyon sa Internet ng kompyuter na ito. "> - -<!ENTITY torSettings.yes "Oo"> -<!ENTITY torSettings.no "Wala"> - -<!ENTITY torSettings.firstQuestion "Alin dito ang pinaka angkop na nagsasaad ng iyong sitwasyon?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Makipag-ugnay"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index 120c7d7..280ab87 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Kailangan mong tukuyin ang isa o higit pang mg torlauncher.error_default_bridges_type_missing=Dapat kang pumili ng uri ng transportasyon para sa mga ibinigay na tulay. torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibinigay na uri ng transportasyong tulay %S. Mangyaring ayusin ang iyong mga setting. -torlauncher.recommended_bridge=(rekomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Kumonekta torlauncher.restart_tor=I-restart ang Tor diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index bf6c933..240154c 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nei"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index a2726de..b09753e 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(viðmælt) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index af3ea91..063e803 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Paramètres du réseau Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Avant de vous connecter au réseau Tor, vous devez fournir des informations sur la connexion Internet de cet ordinateur."> - -<!ENTITY torSettings.yes "Oui"> -<!ENTITY torSettings.no "Non"> - -<!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation?"> -<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> -<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> -<!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> -<!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> -<!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> -<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> -<!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> -<!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> -<!ENTITY torSettings.bridgeQuestion "Votre fournisseur de services Internet (FSI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> -<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> -<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> -  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> @@ -42,37 +25,34 @@ <!ENTITY torsettings.optional "Facultatif"> -<!ENTITY torsettings.useProxy.checkbox "Cet ordinateur doit utiliser un mandataire local pour accéder à Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresse :"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> <!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur de services Internet (FSI) bloque les connexions vers le réseau Tor"> -<!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> -<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> -<!ENTITY torsettings.useBridges.type "Type de transport :"> -<!ENTITY torsettings.useBridges.custom "Saisir des ponts personnalisés"> -<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne)."> -<!ENTITY torsettings.useBridges.placeholder "type adresse:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur de services Internet (FSI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> -<!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> -<!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index e213ea0..9d60972 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -3,32 +3,33 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s'est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu'à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s'est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l'équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera par les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. +torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l'exécutable Tor. -torlauncher.torrc_missing=Le fichier torrc manque et n'a pas pu être créé. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas et n'a pas pu être créé. -torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. +torlauncher.tor_missing=Il manque l’exécutable Tor. +torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. +torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S -torlauncher.failed_to_save_settings=Impossible d'enregistrer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez choisir un type de transport pour les ponts fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. -torlauncher.recommended_bridge=(recommandé) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor @@ -36,28 +37,28 @@ torlauncher.quit=Quitter torlauncher.quit_win=Sortie torlauncher.done=Terminé -torlauncher.forAssistance=Pour de l'assistance, contacter %S -torlauncher.forAssistance2=Pour de l'assistance, visiter %S +torlauncher.forAssistance=Pour de l’assistance, contacter %S +torlauncher.forAssistance2=Pour de l’assistance, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrée à l'annuaire -torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau -torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité -torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais +torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire +torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes -torlauncher.bootstrapWarning.identity=mauvaise concordance de l'identité +torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité torlauncher.bootstrapWarning.timeout=expiration du temps de connexion -torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte +torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 5cdbd06..6a7c2ca 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Paramètres du réseau Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Avant de vous connecter au réseau Tor, vous devez fournir des informations sur la connexion Internet de cet ordinateur."> - -<!ENTITY torSettings.yes "Oui"> -<!ENTITY torSettings.no "Non"> - -<!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation ?"> -<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> -<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont (Bridge) ou un mandataire local avant de me connecter au réseau Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> -<!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> -<!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> -<!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet ?"> - -<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> -<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> -<!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> -<!ENTITY torSettings.bridgePageTitle "Configuration des ponts (Bridges) Tor"> -<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> -<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts (Bridges) Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts (Bridges) fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> -  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> @@ -42,37 +25,34 @@ <!ENTITY torsettings.optional "Facultatif"> -<!ENTITY torsettings.useProxy.checkbox "Cet ordinateur doit utiliser un mandataire local pour accéder à Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresse :"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> <!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions vers le réseau Tor"> -<!ENTITY torsettings.useBridges.default "Se connecter avec les ponts (Bridges) fournis"> -<!ENTITY torsettings.useBridges.note "Chaque type de pont (Bridge) utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> -<!ENTITY torsettings.useBridges.type "Type de transport :"> -<!ENTITY torsettings.useBridges.custom "Saisir des ponts (Bridges) personnalisés"> -<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (Bridge Relays) (un par ligne)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts ((Bridges Relays)"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> -<!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> -<!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 8a5f37f..7754ca3 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,32 +3,33 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s'est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu'à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s'est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l'équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. +torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l'exécutable Tor. -torlauncher.torrc_missing=Le fichier torrc manque et n'a pas pu être créé. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas et n'a pas pu être créé. -torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. +torlauncher.tor_missing=Il manque l’exécutable Tor. +torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. +torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S -torlauncher.failed_to_save_settings=Impossible d'enregistrer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts (Bridges). torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts (Bridges) fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. -torlauncher.recommended_bridge=(recommandé) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor @@ -36,28 +37,28 @@ torlauncher.quit=Quitter torlauncher.quit_win=Sortie torlauncher.done=Terminé -torlauncher.forAssistance=Pour de l'assistance, contacter %S -torlauncher.forAssistance2=Pour de l'assistance, visiter %S +torlauncher.forAssistance=Pour de l’assistance, contacter %S +torlauncher.forAssistance2=Pour de l’assistance, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrée à l'annuaire -torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau -torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité -torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais +torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire +torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor ! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes -torlauncher.bootstrapWarning.identity=mauvaise concordance de l'identité +torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité torlauncher.bootstrapWarning.timeout=expiration du temps de connexion -torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte +torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/fur/torlauncher.properties +++ b/src/chrome/locale/fur/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 1753adb..e89bea9 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nee"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index 57a3e37..790a8f1 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(oanbefelle) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index e28f84e..f9a2a91 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -1,78 +1,58 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Socruithe Líonra Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Teanga Bhrabhsálaí Tor"> +<!ENTITY torlauncher.localePicker.prompt "Roghnaigh teanga.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configure "Cumraigh"> +<!ENTITY torSettings.connect "Ceangail">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "An fanacht go dtosóidh Tor..."> +<!ENTITY torsettings.restartTor "Atosaigh Tor"> +<!ENTITY torsettings.reconfigTor "Athchumraigh"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Chumraigh tú droichid Tor nó shocraigh tú seachfhreastalaí áitiúil roimhe seo.&160; Chun ceangal díreach le líonra Tor a bhunú, caithfidh tú na socruithe seo a scriosadh."> +<!ENTITY torsettings.discardSettings.proceed "Scrios na Socruithe agus Ceangail"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Roghnach"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.address "Seoladh:"> +<!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "Ainm úsáideora:"> +<!ENTITY torsettings.useProxy.password "Focal faire:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe"> +<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe:"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> + +<!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + +<!ENTITY torsettings.bridgeHelpTitle "Cabhair le Droichid"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 24bb4d6..cccb746 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -1,63 +1,64 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.error_title=Tosaitheoir Tor + +torlauncher.tor_exited_during_startup=Stop Tor le linn tosaithe. Seans gur tharla sé seo mar gheall ar earráid i do chomhad torrc, fabht i Tor nó i bhfeidhmchlár eile ar do chóras, nó crua-earra lochtach. Go dtí go mbeidh tú in ann an bhunfhadhb a réiteach agus Tor a atosú, ní thosóidh Brabhsálaí Tor. +torlauncher.tor_exited=Stop Tor go tobann. Seans gur tharla sé seo mar gheall ar fhabht i Tor féin nó i bhfeidhmchlár eile ar do chóras, nó mar gheall ar chrua-earra lochtach. Go dtí go dtosóidh tú Tor arís, ní bheidh Brabhsálaí Tor in ann aon suíomh Gréasáin a bhaint amach. Má mhaireann an fhadhb, seol cóip de do logchomhad Tor chuig an bhfoireann tacaíochta. +torlauncher.tor_exited2=Má atosaíonn tú Tor, ní dhúnfaidh do chuid cluaisíní brabhsálaí. +torlauncher.tor_controlconn_failed=Níorbh fhéidir ceangal le port rialaithe Tor. +torlauncher.tor_failed_to_start=Níor thosaigh Tor. +torlauncher.tor_control_failed=Níorbh fhéidir seilbh a ghabháil ar Tor. +torlauncher.tor_bootstrap_failed=Ní raibh Tor in ann ceangal le líonra Tor. +torlauncher.tor_bootstrap_failed_details=Theip ar %1$S (%2$S). + +torlauncher.unable_to_start_tor=Níorbh fhéidir Tor a thosú.\n\n%S +torlauncher.tor_missing=Tá an clár inrite Tor ar iarraidh. +torlauncher.torrc_missing=Tá an comhad torrc ar iarraidh agus níorbh fhéidir é a chruthú. +torlauncher.datadir_missing=Níl comhadlann sonraí Tor ann agus níorbh fhéidir é a chruthú. +torlauncher.password_hash_missing=Níl aon fháil ar an bhfocal faire haiseáilte. + +torlauncher.failed_to_get_settings=Ní féidir socruithe Tor a fháil.\n\n%S +torlauncher.failed_to_save_settings=Ní féidir socruithe Tor a shábháil.\n\n%S +torlauncher.ensure_tor_is_running=Ba cheart duit deimhniú go bhfuil Tor ar siúl. + +torlauncher.error_proxy_addr_missing=Caithfidh tú seoladh IP nó óstainm agus uimhir phoirt a sholáthar más mian leat seachfhreastalaí a úsáid chun teacht ar an Idirlíon trí Tor. +torlauncher.error_proxy_type_missing=Caithfidh tú cineál an tseachfhreastalaí a roghnú. +torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú. +torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. +torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. + +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) + +torlauncher.connect=Ceangail +torlauncher.restart_tor=Atosaigh Tor +torlauncher.quit=Éirigh as +torlauncher.quit_win=Scoir +torlauncher.done=Déanta + +torlauncher.forAssistance=Déan teagmháil le %S le cúnamh a fháil +torlauncher.forAssistance2=Tabhair cuairt ar %S le cúnamh a fháil + +torlauncher.copiedNLogMessages=Cóipeáílte. Tá %S teachtaireacht ón logchomhad Tor réidh le greamú in eagarthóir téacs nó i dteachtaireacht rphoist. + +torlauncher.bootstrapStatus.conn_dir=Ag ceangal le heolaire athsheachadán +torlauncher.bootstrapStatus.handshake_dir=Ceangal criptithe le heolaire á bhunú +torlauncher.bootstrapStatus.requesting_status=Stádas an líonra á fháil +torlauncher.bootstrapStatus.loading_status=Stádas an líonra á lódáil +torlauncher.bootstrapStatus.loading_keys=Teastais an údaráis á lódáil +torlauncher.bootstrapStatus.requesting_descriptors=Eolas faoin athsheachadán á iarraidh +torlauncher.bootstrapStatus.loading_descriptors=Eolas faoin athsheachadán á lódáil +torlauncher.bootstrapStatus.conn_or=Ag ceangal le líonra Tor +torlauncher.bootstrapStatus.handshake_or=Ciorcad Tor á bhunú +torlauncher.bootstrapStatus.done=Tá tú ceangailte le líonra Tor! + +torlauncher.bootstrapWarning.done=críochnaithe +torlauncher.bootstrapWarning.connectrefused=diúltaíodh an ceangal +torlauncher.bootstrapWarning.misc=éagsúil +torlauncher.bootstrapWarning.resourcelimit=easpa acmhainní +torlauncher.bootstrapWarning.identity=aitheantas mícheart +torlauncher.bootstrapWarning.timeout=ceangal thar am +torlauncher.bootstrapWarning.noroute=níl aon bhealach chuig an óstach +torlauncher.bootstrapWarning.ioerror=earráid léite/scríofa +torlauncher.bootstrapWarning.pt_missing=córas iompair ionphlugáilte ar iarraidh diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index 20c000f..46c5c63 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Axustes da rede Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "Non"> - -<!ENTITY torSettings.firstQuestion "Cal das seguintes alternativas describe mellor a súa situación?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Introduza a configuración do proxy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Á espera de que Tor comece ..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Enderezo:"> <!ENTITY torsettings.useProxy.address.placeholder "Enderezo IP ou nome da máquina"> <!ENTITY torsettings.useProxy.port "Porto:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador pasa por un firewall que só permite conexións a certos portos"> <!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:"> -<!ENTITY torsettings.useBridges.checkbox "O meu Provedor Servizos de Internet (ISP) bloquea as conexións á rede Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copia o rexistro do Tor ao portapapeis"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Axuda do Repetidor Ponte"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties index cde159a..fa5c200 100644 --- a/src/chrome/locale/gl/torlauncher.properties +++ b/src/chrome/locale/gl/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Debe especificar unha ou máis pontes. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectar torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/gu-IN/torlauncher.properties +++ b/src/chrome/locale/gu-IN/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index d5bf712..ee4dc05 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "પોર્ટ:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties index 3088fc6..b09753e 100644 --- a/src/chrome/locale/gu/torlauncher.properties +++ b/src/chrome/locale/gu/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(સૂચવેલ) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/gun/torlauncher.properties +++ b/src/chrome/locale/gun/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ha/torlauncher.properties +++ b/src/chrome/locale/ha/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index cf3887c..24f3411 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -1,82 +1,58 @@ <!ENTITY torsettings.dialog.title "הגדרות רשת Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "שפת דפדפן Tor"> +<!ENTITY torlauncher.localePicker.prompt "אנא בחר שפה.">  -<!ENTITY torsettings.prompt "לפני שתתחבר לרשת Tor, עליך לספק מידע על חיבור האינטרנט של מחשב זה."> - -<!ENTITY torSettings.yes "כן"> -<!ENTITY torSettings.no "לא"> - -<!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את מצבך בצורה המדויקת ביותר?"> -<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של מחשב זה מסונן או עובר דרך שרת פרוקסי."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "הגדר"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "דבר זה יעבוד במרבית המקרים."> <!ENTITY torSettings.connect "התחבר"> -<!ENTITY torSettings.proxyPageTitle "הגדרות שרת פרוקסי מקומי"> -<!ENTITY torSettings.proxyQuestion "האם מחשב זה מוכרח להשתמש בשרת פרוקסי מקומי כדי לקבל גישה לאינטרנט?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "הזן את הגדרות הפרוקסי."> -<!ENTITY torSettings.bridgePageTitle "הגדרת גשרים ל-Tor"> -<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מסנן חיבורים לרשת Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "באפשרותך להשתמש ברשימת הגשרים המוכנה או להשיג בעצמך ולהזין רשימת גשרים חדשה."> -  -<!ENTITY torsettings.startingTor "ממתין כעת עבור Tor כדי להתחיל…"> -<!ENTITY torsettings.restartTor "התחל מחדש את Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "ממתין אל Tor להתחיל..."> +<!ENTITY torsettings.restartTor "הפעל מחדש את Tor"> +<!ENTITY torsettings.reconfigTor "הגדר מחדש"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "הגדרת גשרי Tor או הכנסת הגדרות ייפוי-כוח מקומי.  כדי לעשות חיבור ישיר לרשת Tor, הגדרות אלו חייבות להיות מוסרות."> +<!ENTITY torsettings.discardSettings.proceed "הסר הגדרות והתחבר"> -<!ENTITY torsettings.optional "אופציונלי"> +<!ENTITY torsettings.optional "רשותי"> -<!ENTITY torsettings.useProxy.checkbox "מחשב זה חייב להשתמש בשרת פרוקסי מקומי על מנת להתחבר לאינטרנט"> -<!ENTITY torsettings.useProxy.type "סוג פרוקסי:"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.type "סוג ייפוי-כוח:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "כתובת:"> <!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח"> -<!ENTITY torsettings.useProxy.port "פורט:"> +<!ENTITY torsettings.useProxy.port "פתחה:"> <!ENTITY torsettings.useProxy.username "שם משתמש:"> <!ENTITY torsettings.useProxy.password "סיסמה:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "מחשב זה מחובר לאינטרנט דרך חומת אש המאפשר חיבורים רק לפורטים מסויימים "> -<!ENTITY torsettings.firewall.allowedPorts "פורטים מורשים:"> -<!ENTITY torsettings.useBridges.checkbox "ספק האינטרנט שלי (ISP) חוסם חיבורים לרשת Tor"> -<!ENTITY torsettings.useBridges.default "התחבר באמצעות הגשרים המוכנים מראש"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "סוג מסווה תעבורה:"> -<!ENTITY torsettings.useBridges.custom "הזן רשימת גשרים חדשה"> -<!ENTITY torsettings.useBridges.label "הזן פרטי גשר אחד לפחות (אחד לכל שורה)"> -<!ENTITY torsettings.useBridges.placeholder "הזן כתובת:פורט address:port"> - -<!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה"> -<!ENTITY torsettings.bridgeHelpTitle "עזרה בנוגע לגשרים"> -<!ENTITY torsettings.bridgeHelp1 "אם אין באפשרותך להתחבר לרשת Tor, ייתכן שהסיבה לכך היא שספק האינטרנט שלך או גורם אחר חוסמים את Tor. לעתים קרובות, ניתן להתגבר על בעיה זו באמצעות שימוש בגשרים, שהם שרתים חסויים שקשה יותר לחסום אותם."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "באמצעות רשת האינטרנט"> -<!ENTITY torsettings.bridgeHelp2 "היעזר בדפדפן אינטרנט על מנת לבקר באתר https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "דרך שירות הדואל האוטומטי"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "שלח דואל לכתובת bridges(a)torproject.org עם השורה "get bridges" ללא גרשיים בתוך גוף ההודעה. אולם, כדי להקשות עוד יותר על תוקפים לצבור מאגר כתובות של גשרים, עליך לשלוח בקשה זו מתוך אחד מספקי הדואל הבאים בלבד (בסדר עדיפויות יורד):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net -https://mail.google.com -https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "באמצעות צוות התמיכה שלנו"> -<!ENTITY torsettings.bridgeHelp4 "כמוצא אחרון, תוכל לבקש רשימת גשרים באמצעות פנייה מנומסת בדואל לכתובת הבאה: -help(a)rt.torproject.org -אנא זכור שבן אנוש ייאלץ להשיב באופן אישי לכל בקשה שכזו."> +<!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש המתירה חיבורים רק אל פתחות מסוימות"> +<!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות:"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> + +<!ENTITY torsettings.copyLog "העתק את יומן Tor ללוח החיתוך"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + +<!ENTITY torsettings.bridgeHelpTitle "עזרת ממסרי גשר"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 85265fb..7345a79 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -1,63 +1,64 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=תוכנת ההפעלה של Tor - -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor הפסיק לעבוד באופן פתאומי. ייתכן שהדבר אירע עקב תקלה ב-Tor עצמה, בשל תוכנה אחרת הפועלת על המערכת שלך, או בגין תקלת חומרה. כל עוד לא תפעיל מחדש את Tor, דפדפן Tor ימנע ממך לגלוש באינטרנט. אם הבעיה נמשכת, אנא שלח עותק מיומן הרישום של Tor לצוות התמיכה שלנו. -torlauncher.tor_exited2=התחלה מחדש של Tor לא תסגור את כרטיסיות הדפדפן שלך. -torlauncher.tor_controlconn_failed=נכשל החיבור לפורט השליטה של Tor. -torlauncher.tor_failed_to_start=הפעלת Tor נכשלה. -torlauncher.tor_control_failed=כשלה נטילת השליטה על Tor. -torlauncher.tor_bootstrap_failed=נכשל הניסיון להקים חיבור יציב לרשת Tor. +torlauncher.error_title=משגר Tor + +torlauncher.tor_exited_during_startup=Tor יצא במהלך ההזנק. ייתכן שזה עקב שגיאה בקובץ torrc שלך, תקל ב-Tor או בתכנית אחרת במערכתך, או חומרה תקולה. עד שלא תתקן את הבעיה המשתמעת ותפעיל מחדש את Tor, דפדפן Tor לא יתחיל. +torlauncher.tor_exited=Tor יצא באופן בלתי צפוי. ייתכן שזה עקב תקל ב-Tor עצמו, תכנית אחרת במערכתך או חומרה תקולה. עד שתפעיל מחדש את Tor, דפדפן Tor לא יהיה מסוגל להגיע לכל אתר שהוא. אם הבעיה נמשכת, אנא שלח עותק של יומן Tor שלך אל צוות התמיכה שלנו. +torlauncher.tor_exited2=הפעלת Tor מחדש לא תסגור את לשוניות הדפדפן שלך. +torlauncher.tor_controlconn_failed=לא היה יכול להתחבר אל פתחת הבקרה של Tor. +torlauncher.tor_failed_to_start=Tor נכשל להתחיל. +torlauncher.tor_control_failed=נכשל בלקיחת שליטה על Tor. +torlauncher.tor_bootstrap_failed=Tor נכשל בהקמת חיבור רשת Tor. torlauncher.tor_bootstrap_failed_details=%1$S נכשל (%2$S). -torlauncher.unable_to_start_tor=אין אפשרות להפעיל את Tor.\n\n%S -torlauncher.tor_missing=קובץ ההפעלה של Tor איננו קיים. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=כשל בהשגת סיסמה מעורבלת. +torlauncher.unable_to_start_tor=לא היה ניתן להתחיל את Tor.\n\n%S +torlauncher.tor_missing=קובץ ההפעלה של Tor חסר. +torlauncher.torrc_missing=קובץ ה-torrc חסר ולא היה יכול להיווצר. +torlauncher.datadir_missing=סיפריית הנתונים של Tor אינה קיימת ולא יכלה להיווצר. +torlauncher.password_hash_missing=נכשל בהשגת סיסמה מעורבלת. -torlauncher.failed_to_get_settings=אין אפשרות לאחזר הגדרות Tor.\n\n%S -torlauncher.failed_to_save_settings=אין אפשרות לשמור הגדרות Tor.\n\n%S -torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל כעת. +torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות Tor.\n\n%S +torlauncher.failed_to_save_settings=לא היה ניתן לשמור הגדרות Tor.\n\n%S +torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל. -torlauncher.error_proxy_addr_missing=עליך לציין גם כתובת IP או שם מארח וגם מספר פורט כדי לאפשר ל-Tor להיעזר בשרת פרוקסי על מנת לגשת לרשת האינטרנט. -torlauncher.error_proxy_type_missing=עליך לבחור את סוג שרת הפרוקסי. -torlauncher.error_bridges_missing=עליך לבחור בגשר אחד לפחות. -torlauncher.error_default_bridges_type_missing=עליך לבחור באיזה סוג של מסווה תעבורה תרצה להשתמש בגשרים שבחרת. -torlauncher.error_bridge_bad_default_type=גשרים בעלי מסווה תעבורה מסוג %S אינם זמינים כעת. אנא בחר סוג אחר. +torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי להגדיר את Tor להשתמש בייפוי-כוח כדי לגשת לאינטרנט. +torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. +torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. +torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. +torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. -torlauncher.recommended_bridge=(מומלץ) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=התחבר -torlauncher.restart_tor=התחל מחדש את Tor +torlauncher.restart_tor=הפעל מחדש את Tor torlauncher.quit=צא torlauncher.quit_win=יציאה torlauncher.done=בוצע torlauncher.forAssistance=לתמיכה, צור קשר עם %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=לתמיכה, בקר ב-%S -torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות מיומן הרישום של Tor מוכנות להעתקה לתוך עורך טקסט או להודעת דואל. +torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות יומן אירועים של Tor מוכנות להדבקה לתוך עורך מלל או להודעת דוא"ל. -torlauncher.bootstrapStatus.conn_dir=מתחבר למאגר שרתים -torlauncher.bootstrapStatus.handshake_dir=מקים כעת חיבור מוצפן למאגר שרתים -torlauncher.bootstrapStatus.requesting_status=מתעדכן כעת במצב הרשת -torlauncher.bootstrapStatus.loading_status=טוען את מצב הרשת -torlauncher.bootstrapStatus.loading_keys=טוען את אישורי האבטחה של הרשות -torlauncher.bootstrapStatus.requesting_descriptors=מבקש רשימת שרתים -torlauncher.bootstrapStatus.loading_descriptors=טוען רשימת שרתים +torlauncher.bootstrapStatus.conn_dir=מתחבר לסיפריית ממסרים +torlauncher.bootstrapStatus.handshake_dir=מקים חיבור סיפרייה מוצפן +torlauncher.bootstrapStatus.requesting_status=מאחזר מיצב רשת +torlauncher.bootstrapStatus.loading_status=טוען מיצב רשת +torlauncher.bootstrapStatus.loading_keys=טוען אישורי רָשׁוּת +torlauncher.bootstrapStatus.requesting_descriptors=מבקש מידע ממסר +torlauncher.bootstrapStatus.loading_descriptors=טוען מידע ממסר torlauncher.bootstrapStatus.conn_or=מתחבר אל רשת Tor -torlauncher.bootstrapStatus.handshake_or=מקים נתיב Tor +torlauncher.bootstrapStatus.handshake_or=מקים מעגל Tor torlauncher.bootstrapStatus.done=מחובר לרשת Tor! torlauncher.bootstrapWarning.done=בוצע torlauncher.bootstrapWarning.connectrefused=החיבור סורב torlauncher.bootstrapWarning.misc=שונות -torlauncher.bootstrapWarning.resourcelimit=משאבים לא מספיקים +torlauncher.bootstrapWarning.resourcelimit=משאבים בלתי מספיקים torlauncher.bootstrapWarning.identity=זהות אינה תואמת torlauncher.bootstrapWarning.timeout=החיבור פקע -torlauncher.bootstrapWarning.noroute=אין נתיב לארח -torlauncher.bootstrapWarning.ioerror=שגיאת קריאה/כתיבה -torlauncher.bootstrapWarning.pt_missing=חסר מסווה תעבורה +torlauncher.bootstrapWarning.noroute=אין נתיב למארח +torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה +torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 61a87d4..48ffa46 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "टोर संजाल व्यवस्था"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "टोर विचरक भाषा "> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "हाँ"> -<!ENTITY torSettings.no "नहीं"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "जोड़ें"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "पता :"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "पोर्ट/द्वार :"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties index b0c8d0a..9e913b4 100644 --- a/src/chrome/locale/hi/torlauncher.properties +++ b/src/chrome/locale/hi/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(अनुशंसित) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=जोड़ें torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 2834a8b..4a0151d 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Postavke Tor mreže"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera"> @@ -6,33 +9,11 @@  -<!ENTITY torsettings.prompt "Prije nego se spojite na Tor mrežu, trebate dati informacije o -internetskoj vezi ovog računala."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> -<!ENTITY torSettings.configurePrompt1 "Veza ovog računala s Internetom je cenzurirana ili iza proxya."> -<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxya prije nego se spojim na Tor mrežu."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Podesi"> -<!ENTITY torSettings.connectPrompt2 "Želim direktnu vezu s Tor mrežom."> -<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini slučajeva."> <!ENTITY torSettings.connect "Spoji"> -<!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxya"> -<!ENTITY torSettings.proxyQuestion "Treba li ovo računalo koristiti lokalni proxy da pristupi Internetu?"> - -<!ENTITY torSettings.proxyExplanation1 "U većini slučaja lokalni proxy nije potreban, ali može biti kad se spajate kroz mrežu tvrtke, škole ili fakulteta."> -<!ENTITY torSettings.proxyExplanation2 "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku ili provjerite mrežne postavke Vašeg sustava kako bi vidjeli da li je potreban lokalni proxy."> -<!ENTITY torSettings.enterProxy "Unesite postavke proxya."> -<!ENTITY torSettings.bridgePageTitle "Konfiguracija Tor mostova"> -<!ENTITY torSettings.bridgeQuestion "Blokira li Vaš davetelj Internet usluge (ISP) ili drugačije cenzurira veze -s Tor mrežom?"> -<!ENTITY torSettings.bridgeExplanation1 "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite Ne (ako se ne možete spojiti na Tor mrežu bez mosta, možete kasnije dodati jedan)."> -<!ENTITY torSettings.bridgeExplanation2 "Ako odaberete Da, od Vas će se tražiti da konfigurirate Tor mostove, koji su nepopisani releji koji otežavaju blokiranje veza na Tor mrežu."> -<!ENTITY torSettings.bridgeSettingsPrompt "Možete koristiti osigurani set adresa mostova ili možete unijeti vlasiti set mostova."> -  <!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene..."> @@ -44,8 +25,9 @@ s Tor mrežom?"> <!ENTITY torsettings.optional "Opcionalno"> -<!ENTITY torsettings.useProxy.checkbox "Ovo računalo treba koristiti lokalni proxy za pristup Internetu."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tip proxya:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -56,25 +38,21 @@ s Tor mrežom?"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> -<!ENTITY torsettings.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži"> -<!ENTITY torsettings.useBridges.default "Spoji se s osiguranim mostovima"> -<!ENTITY torsettings.useBridges.note "Svaka vrsta mosta koristi drugačiju metodu kako bi izbjegla cenzuru.&#160: Ako jedan most ne radi, probajte koristiti drugi."> -<!ENTITY torsettings.useBridges.type "Tip transporta:"> -<!ENTITY torsettings.useBridges.custom "Unesi vlastite mostove"> -<!ENTITY torsettings.useBridges.label "Unesite jedan ili više mostova (jedan po retku)."> -<!ENTITY torsettings.useBridges.placeholder "unesite adresa:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Pomoć za releje mostove"> -<!ENTITY torsettings.bridgeHelp1 "Ako se ne možete spojiti na Tor mrežu, to može biti zato što Vaš pružatelj Internet usluge (ISP) ili druga agencija blokira Tor.  Najčešće možete zaobići ovaj problem koristeći Tor mostove, koji su neizlistani releji koje je teže blokirati."> -<!ENTITY torsettings.bridgeHelp1B "Možete koristiti unaprijed konfigurirane setove adresa mostova ili možete dobiti prilagođene setove korištenjem jedne od ovih metoda:"> -<!ENTITY torsettings.bridgeHelp2Heading "Kroz web"> -<!ENTITY torsettings.bridgeHelp2 "Koristite web preglednik kako bi posjetili https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Kroz email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošaljite email na bridges(a)torproject.org tako što će te u poruku napisati samo 'get bridges'.  Kako bilo, da bi otežali napadaču da nauči puno adresa mostova, morate poslati taj zahtjev koristeći jednog od sljedećih davatelja email usluge (poredano po preferabilnosti):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ili https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Deska"> -<!ENTITY torsettings.bridgeHelp4 "Na kraju, možete zatražiti adrese mostova tako što će te poslati pristojan email na help(a)rt.torproject.org.  Imajte na umu da će na svaki zahtjev morati odgovoriti osoba."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index 108f29e..b774dfa 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova. torlauncher.error_default_bridges_type_missing=Morate odabrati vrstu transporta za pružene mostove. torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova koji imaju %S vrstu transporta. Molimo, prilagodite svoje postavke. -torlauncher.recommended_bridge=(preporučeno) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Spoji torlauncher.restart_tor=Ponovno pokreni Tor diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 0ba50d8..be04620 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Postavke Tor Mreže"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Što od sljedećeg najbolje opisuje tvoju situaciju?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguriraj"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> <!ENTITY torSettings.connect "Poveži se"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Unesi proxy postavke."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Priključak:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index 4078912..7c11518 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Poveži se torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ht/torlauncher.properties +++ b/src/chrome/locale/ht/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index b52082e..7a54757 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor hálózati beállítások"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser nyelv"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Mielőtt a Tor hálózatra csatlakoznál, információt kell adj a számítógép internet kapcsolatáról."> - -<!ENTITY torSettings.yes "Igen"> -<!ENTITY torSettings.no "Nem"> - -<!ENTITY torSettings.firstQuestion "A következők közül melyik illik jobban a szituációhoz?"> -<!ENTITY torSettings.configurePrompt1 "Ennek a számítógépnek a forgalma cenzorált vagy proxizott."> -<!ENTITY torSettings.configurePrompt2 "A Tor  hálózathoz való csatlakozás előtt be kell állítanom a hálózati hidat vagy a helyi proxyt."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Beállít"> -<!ENTITY torSettings.connectPrompt2 "Közvetlen kapcsolatot szeretnék létesíteni a Tor hálózattal."> -<!ENTITY torSettings.connectPrompt3 "A legtöbb esetben ez működni fog."> <!ENTITY torSettings.connect "Csatlakozás"> -<!ENTITY torSettings.proxyPageTitle "Helyi proxybeállítások"> -<!ENTITY torSettings.proxyQuestion "Ez a számítgép helyi proxyn keresztül éri el az Internetet? "> - -<!ENTITY torSettings.proxyExplanation1 "A helyi proxy a legtöbb esetben nem kell, de vállalati, iskolai vagy egyetemi hálózat esetén elfordulhat, hogy szükséges beállítani."> -<!ENTITY torSettings.proxyExplanation2 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, akkor nézd meg egy másik böngésző vagy a rendszer hálózati beállításait, hogy szükséges-e proxyt beállítani."> -<!ENTITY torSettings.enterProxy "Adja meg a proxy beállításokat."> -<!ENTITY torSettings.bridgePageTitle "Tor hidak konfigurálása"> -<!ENTITY torSettings.bridgeQuestion "Az internet szolgáltatód (ISP) blokkolja vagy cenzúrázza a kapcsolatot a Tor hálózathoz?"> -<!ENTITY torSettings.bridgeExplanation1 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, válaszd a Nem lehetőséget (ha hálózati híd nélkül nem tudsz kapcsolódni a Tor hálózathoz, akkor később is hozzáadhatsz egyet)."> -<!ENTITY torSettings.bridgeExplanation2 " Ha az Igen-t választod neked kell konfigurálni a Tor Hidak-et, maleyek nem listázott csomópontok, így lehetővé nehezebbé teszik a Tor hálózathoz kapcsolódás blokkolását."> -<!ENTITY torSettings.bridgeSettingsPrompt "Használhatod a szolgáltatott bridge címeket vagy beszerezhetsz egyedi bridge címeket."> -  <!ENTITY torsettings.startingTor "Várakozás a Tor indulására..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcionális"> -<!ENTITY torsettings.useProxy.checkbox "Ez a számítógép helyi proxyn keresztül kell éri el az Internetet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Típus:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Cím:"> <!ENTITY torsettings.useProxy.address.placeholder "IP cím vagy gépnév"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál ami csak adott portokon keresztül engedélyezi a kapcsolatotokat."> <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> -<!ENTITY torsettings.useBridges.checkbox "Az internet szolgáltatóm (ISP) blokkolja a Tor hálózathoz való csatlakozásokat"> -<!ENTITY torsettings.useBridges.default "Csatlakozás a szolgáltatott bridge címekkel."> -<!ENTITY torsettings.useBridges.note "Minden híd más megoldást használ a cenzorálás elkerülésére.  Ha egyik nem működik, próbálkozzon újra egy másikkal."> -<!ENTITY torsettings.useBridges.type "Átvitel típusa:"> -<!ENTITY torsettings.useBridges.custom "Addj meg egyedi bridge címeket"> -<!ENTITY torsettings.useBridges.label "Addj meg egy vagy több bridge relay címet (soronként egy)"> -<!ENTITY torsettings.useBridges.placeholder "Írd cím:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "A Tor log Vágólapra másolása"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Híd kapcsoló súgó"> -<!ENTITY torsettings.bridgeHelp1 "Ha nem tudsz csatlakozni a Tor.  hálózathoz, akkor valószínű az internet szolgáltató (ISP) vagy egy másik szervezet blokkolja. Gyakran megkerülhető a probléma Tor bridges használatával. Ezek nem listázott átjátszók amiket sokkal nehezebb blokkolni."> -<!ENTITY torsettings.bridgeHelp1B "Használhatod az előre konfigurált híd címeket, vagy beszerezhetsz egyedi címek készletét az alábbi módok egyikét használva:"> -<!ENTITY torsettings.bridgeHelp2Heading "Interneten keresztül"> -<!ENTITY torsettings.bridgeHelp2 "Használj egy böngészőt megnézni ezt az oldalt: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Az automata email válaszok által."> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Küldjön emailt a bridges(a)torproject.org címre 'get bridges' szöveggel a levél törzsében.  Ahhoz, hogy a híd címeket a támadók nehezeben tanulják meg, ezt a kérést az alábbi szolgáltatóktól kell küldenia (a javasolt sorrendben listázva):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vagy https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "A támogatáson keresztül."> -<!ENTITY torsettings.bridgeHelp4 "Utolsó lehetőségként küldj egy udvarias bridge igénylő emailt ide: help(a)rt.torproject.org.  Légyszíves vedd figyelembe az adott személynek több emailt kell megválaszolnia."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index 4bc4627..711dbd0 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Meg kell adnia egy vagy több hidat. torlauncher.error_default_bridges_type_missing=Ki kell választanod egy átviteli típust a felkínált hidakhoz. torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az átviteli típusa %S elérhető lenne. Kérlek módosítsd a beállításaidat. -torlauncher.recommended_bridge=(ajánlott) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Csatlakozás torlauncher.restart_tor=Tor újraindítása diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index 84a2881..f6b89c5 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index e952b09..240154c 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Այո"> -<!ENTITY torSettings.no "Ոչ"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/hy/torlauncher.properties +++ b/src/chrome/locale/hy/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index 58a9c71..2683a1e 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Si"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Porto:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties index 574afac..54b9a10 100644 --- a/src/chrome/locale/ia/torlauncher.properties +++ b/src/chrome/locale/ia/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 3fbef36..f2b0bdf 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Pengaturan Jaringan Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Bahasa Peramban Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Sebelum Anda terhubung ke jaringan Tor, Anda perlu memberikan informasi tentang koneksi internet komputer ini."> - -<!ENTITY torSettings.yes "Ya"> -<!ENTITY torSettings.no "Tidak"> - -<!ENTITY torSettings.firstQuestion "Mana dari yang berikut ini tepat menjelaskan situasi Anda?"> -<!ENTITY torSettings.configurePrompt1 "Koneksi Internet komputer ini disensor atau terproksi."> -<!ENTITY torSettings.configurePrompt2 "Saya perlu untuk mengatur jembatan atau pengaturan proksi lokal sebelum saya terkoneksi ke jaringan Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigur"> -<!ENTITY torSettings.connectPrompt2 "Saya ingin membuat koneksi langsung ke jaringan Tor."> -<!ENTITY torSettings.connectPrompt3 "Ini akan bekerja dalam kebanyakan situasi."> <!ENTITY torSettings.connect "Sambung"> -<!ENTITY torSettings.proxyPageTitle "Konfigurasi Proksi Lokal"> -<!ENTITY torSettings.proxyQuestion "Apakah komputer ini memerlukan proksi lokal untuk dapat mengakses Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Dalam banyak kasus proksi lokal tidah dibutuhkan, tapi mungkin dibutuhkan ketika menghubungkan lewat jaringan perusahaan, sekolah, atau universitas."> -<!ENTITY torSettings.proxyExplanation2 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, lihat dipengaturan Internet diperamban lainnya atau periksa pengaturan sistem jaringan anda untuk melihat apakah proksi lokal dibutuhkan."> -<!ENTITY torSettings.enterProxy "Masuk ke pengaturan proksi."> -<!ENTITY torSettings.bridgePageTitle "Konfigurasi Jembatan Tor"> -<!ENTITY torSettings.bridgeQuestion "Apakah Penyedia Layanan Internet (ISP) Anda memblokir atau menyensor sambungan ke Jaringan Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, pilih Tidak (jika anda tidak dapat menyambungkan ke jaringan Tor tanpa jembatan, anda dapat menambahkannya nanti)."> -<!ENTITY torSettings.bridgeExplanation2 "Jika anda pilih Ya, anda akan ditanyakan untuk mengatur Tor Bridges, dimana relai tak terdaftar yang membuatnya lebih susah untuk menghalangi koneksi ke Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Anda dapat menggunakan setelan jembatan yang disediakan atau Anda dapat memperoleh dan memasukkan setelan jembatan ubahsuai."> -  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proksi lokal untuk mengakses Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipe Proksi:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port"> <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> -<!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor"> -<!ENTITY torsettings.useBridges.default "Terhubung dengan bridge yang disediakan"> -<!ENTITY torsettings.useBridges.note "Setiap tipe jembatan menggunakan metode berbeda untuk menghindari penyaringan.  Jika satu jembatan tidak dapat bekerja, coba gunakan lagi jembatan lainnya."> -<!ENTITY torsettings.useBridges.type "Jenis Transport :"> -<!ENTITY torsettings.useBridges.custom "Masukkan bridge yang biasa digunakan"> -<!ENTITY torsettings.useBridges.label "Masukkan satu atau beberapa jembatan penyambung (satu per baris)."> -<!ENTITY torsettings.useBridges.placeholder "ketik address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir."> -<!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prakonfigurasi, disediakan alamat-alamat jembatan atau anda dapat mendapat barisan khusus dari alamat-alamat dengan menggunakan satu dari metode berikut:"> -<!ENTITY torsettings.bridgeHelp2Heading "Lewat web"> -<!ENTITY torsettings.bridgeHelp2 "Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Melalui Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Kieim email ke bridges(a)torproject.org dengan jalur 'get bridges' itu sendiri di bodi dari pesan   Walau bagaimana , untuk membuatnya lebih keras bagi para penyerang untuk mempelajari beberapa alamat bridge , anda harus mengirim permintaan ini dari salah satu Provider-provider email berikut (terdaftar di urutan preferensi):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Sebagai pilihan terakhir anda dapat meminta alamat bridge dengan mengirimkan pesan email dengan sopan ke help(a)rt.torproject.org.  Silakan catat bahwa petugas akan merespon masing-masing permintaan"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.  Ini mungkin memakan waktu beberapa menit."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index 00c65ec..2e51710 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau lebi torlauncher.error_default_bridges_type_missing=Anda harus memilih satu tipe transportasi untuk bridges yang tersedia. torlauncher.error_bridge_bad_default_type=Tidak ada bridges tersedia yang memiliki tipe transportasi %S tersedia. Mohon sesuaikan pengaturan Anda. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Hubungi torlauncher.restart_tor=Muat ulang Tor diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 28e8ddb..f630f85 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Netkerfisstillingar Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tungumál Tor-vafra"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Áður en þú tengist Tor-netinu, verðurðu að gefa upplýsingar um Internet-tengingu tölvunnar."> - -<!ENTITY torSettings.yes "Já"> -<!ENTITY torSettings.no "Nei"> - -<!ENTITY torSettings.firstQuestion "Hvað af eftirfarandi lýsir best aðstæðum þínum?"> -<!ENTITY torSettings.configurePrompt1 "Internet-tenging þessarar tölvu er ritskoðuð eða beint í gegnum milliþjón."> -<!ENTITY torSettings.configurePrompt2 "Setja verður upp Tor-brú eða stilla staðværan milliþjón (proxy) áður en tengst er við Tor netið."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Stilla"> -<!ENTITY torSettings.connectPrompt2 "Ég myndi vilja koma á beinni tengingu við Tor-netið."> -<!ENTITY torSettings.connectPrompt3 "Þetta mun virka í flestum tilfellum."> <!ENTITY torSettings.connect "Tengjast"> -<!ENTITY torSettings.proxyPageTitle "Uppsetning á staðværum milliþjóni (local proxy)"> -<!ENTITY torSettings.proxyQuestion "Þarf þessi tölva staðværan milliþjón (local proxy) til að fá aðgang að Internetinu?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Settu inn stillingar milliþjónsins."> -<!ENTITY torSettings.bridgePageTitle "Uppsetning Tor-brúa"> -<!ENTITY torSettings.bridgeQuestion "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar inn á Tor-netið?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Bíð eftir að Tor ræsist..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Valkvætt"> -<!ENTITY torsettings.useProxy.checkbox "Þessi tölva þarf staðværan milliþjón (local proxy) til að fá aðgang að Internetinu"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Gerð milliþjóns:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Vistfang:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-vistfang eða vélarheiti"> <!ENTITY torsettings.useProxy.port "Gátt:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Tengjast með tiltækum brúm"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Settu inn sérsniðnar brýr"> -<!ENTITY torsettings.useBridges.label "Settu inn einn eða fleiri endurvarpa fyrir brýr (einn á hverja línu)."> -<!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Í gegnum vefinn"> -<!ENTITY torsettings.bridgeHelp2 "Notaðu vafra til að skoða https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Í gegnum hjálparborðið"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index 5ac6c53..cfa135b 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -5,7 +5,7 @@ torlauncher.error_title=Tor-ræsir torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Endurræsing Tor mun ekki loka flipum vafrans. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor ræstist ekki. torlauncher.tor_control_failed=Mistókst að ná stjórn yfir Tor. @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Þú verður að tilgreina eina eða fleiri br torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(mælt með þessu) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Tengjast torlauncher.restart_tor=Endurræsa Tor @@ -45,9 +46,9 @@ torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection torlauncher.bootstrapStatus.requesting_status=Næ í stöðu netkerfis torlauncher.bootstrapStatus.loading_status=Hleð inn stöðu netkerfis -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.loading_keys=Hleð inn skilríkjum vottunarstöðvar +torlauncher.bootstrapStatus.requesting_descriptors=Bið um upplýsingar endurvarpa +torlauncher.bootstrapStatus.loading_descriptors=Hleð inn upplýsingum endurvarpa torlauncher.bootstrapStatus.conn_or=Tengist Tor-netinu torlauncher.bootstrapStatus.handshake_or=Kem á Tor-rás torlauncher.bootstrapStatus.done=Tengdur við Tor-netið! diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 943e24c..3ad32ca 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Impostazioni rete Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Lingua per il Tor Browser"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Prima di connetterti alla rete Tor, devi fornire le informazioni riguardo la connessione internet di questo computer."> - -<!ENTITY torSettings.yes "Sì"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?"> -<!ENTITY torSettings.configurePrompt1 "La connessione a Internet di questo computer è bloccata da censura o utilizza un proxy."> -<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare le impostazioni del bridge o del proxy locale prima di connettermi alla rete Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor."> -<!ENTITY torSettings.connectPrompt3 "Questo funzionerà nella maggior parte delle situazioni."> <!ENTITY torSettings.connect "Connetti"> -<!ENTITY torSettings.proxyPageTitle "Configurazione Proxy locale"> -<!ENTITY torSettings.proxyQuestion "Questo computer richiede l'uso di un proxy locale per accedere ad Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Nella maggior parte dei casi un proxy locale non è necessario, ma può essere richiesto quando ci si connette da una rete scolastica, universitaria o aziendale."> -<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni Internet di un altro browser web per vedere se sia configurato l'uso di un proxy."> -<!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy."> -<!ENTITY torSettings.bridgePageTitle "Configurazione Bridge di Tor"> -<!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Se non sei sicuro su come rispondere a questa domanda, scegli No (se non riesci a connetterti alla rete Tor senza un bridge puoi aggiungerlo in seguito)."> -<!ENTITY torSettings.bridgeExplanation2 "Se scegli Si, ti verrà chiesto di configurare i Bridge Tor, che sono relay non listati che rendono più difficile il blocco delle connessioni alla rete Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Puoi usare il set preconfigurato di bridge o ottenere ed inserire un set personale di bridge."> -  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Facoltativo"> -<!ENTITY torsettings.useProxy.checkbox "Questo computer richiede l'uso di un proxy locale per accedere a Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipo di proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Indirizzo:"> <!ENTITY torsettings.useProxy.address.placeholder "Indirizzo IP oppure hostname"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> -<!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> -<!ENTITY torsettings.useBridges.default "Collegati usando i bridge preconfigurati"> -<!ENTITY torsettings.useBridges.note "Ogni tipo di bridge usa un metodo differente per scavalcare la censura.  Se un bridge non funziona, prova di nuovo usandone uno diverso. "> -<!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> -<!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> -<!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)"> -<!ENTITY torsettings.useBridges.placeholder "Inserisci indirizzo:porta"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> -<!ENTITY torsettings.bridgeHelp1 "Se non ti riesci a connettere alla rete Tor, è possibile che il tuo Internet Service Provider (ISP) o una qualche altra agenzia stiano bloccando Tor.  Spesso puoi aggirare questo problema utilizzando un Bridge Tor, che è un relay non tracciato più difficile da bloccare."> -<!ENTITY torsettings.bridgeHelp1B "Puoi usare il set di indirizzi bridge preconfigurato fornito o puoi ottenere un set personale di indirizzi con uno di questi metodi:"> -<!ENTITY torsettings.bridgeHelp2Heading "Attraverso il web"> -<!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Invia una email a bridges(a)torproject.org con scritto 'get bridges' nel corpo del messaggio.  Inoltre, per evitare che un utente maleintenzionato richieda troppi indirizzi bridge, dovrai inviare una richiesta da uno dei seguenti provider di emails (ordinati per preferenza):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help(a)rt.torproject.org.  Tieni conto che una persona dovrà rispondere ad ogni singola richiesta."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index 5d7fb6b..f0222af 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Devi specificare uno o più ponti. torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo di trasporto per il bridge preconfigurato. torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. -torlauncher.recommended_bridge=(raccomandato) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connetti torlauncher.restart_tor=Riavvia Tor diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 16fee49..3bff26f 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Torネットワーク設定"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor ブラウザー言語"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor ネットワークに接続する前に、このコンピューターのインターネット接続についての情報を提供して頂く必要があります。"> - -<!ENTITY torSettings.yes "はい"> -<!ENTITY torSettings.no "いいえ"> - -<!ENTITY torSettings.firstQuestion "以下のうちあなたの状態に最も適しているのはどれですか？"> -<!ENTITY torSettings.configurePrompt1 "このコンピュータのインターネット接続は、検閲されているかプロキシを通します。"> -<!ENTITY torSettings.configurePrompt2 "Torネットワークに接続する前にブリッジやローカルプロキシを設定する必要があります。 "> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "構成"> -<!ENTITY torSettings.connectPrompt2 "Torネットワークに直接接続します。"> -<!ENTITY torSettings.connectPrompt3 "これはほとんどの状況で動作します。"> <!ENTITY torSettings.connect "接続"> -<!ENTITY torSettings.proxyPageTitle "ローカルプロキシの設定"> -<!ENTITY torSettings.proxyQuestion "インターネットに接続するためにローカルプロキシを通す必要がありますか？"> - -<!ENTITY torSettings.proxyExplanation1 "ほとんどの場合ローカルプロキシは必要ありません。ただし、会社、学校、大学などのネットワークを通して接続する場合に必要となることがあるかもしれません。"> -<!ENTITY torSettings.proxyExplanation2 "もし分からなければ、他のブラウザーのインターネット設定やシステムのネットワーク設定を確認して、ローカルプロキシが必要かどうか確認してください。"> -<!ENTITY torSettings.enterProxy "プロキシ設定を入力"> -<!ENTITY torSettings.bridgePageTitle "Torブリッジの設定"> -<!ENTITY torSettings.bridgeQuestion "あなたのインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックしているか、あるいは別のやり方で検閲していますか？"> -<!ENTITY torSettings.bridgeExplanation1 "もし分からなければ「いいえ」を選択してください。(ブリッジなしでTorネットワークに接続することができなかった場合、後で追加できます)"> -<!ENTITY torSettings.bridgeExplanation2 "「はい」を選択した場合、TorブリッジすなわちTorネットワークへの接続をブロックすることを難しくするリストされていないリレーを設定するよう求められます。"> -<!ENTITY torSettings.bridgeSettingsPrompt "提供されたブリッジのセットを使用するか、あるいはカスタムのブリッジのセットを取得して入力することができます。"> -  <!ENTITY torsettings.startingTor "Torの開始を待っています..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "オプション"> -<!ENTITY torsettings.useProxy.checkbox "このコンピューターはインターネットに接続するためにローカルプロキシを通す必要があります。"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxyの種類:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "アドレス:"> <!ENTITY torsettings.useProxy.address.placeholder "IPアドレスまたはホストネーム"> <!ENTITY torsettings.useProxy.port "ポート"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。"> <!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> -<!ENTITY torsettings.useBridges.checkbox "私のインターネットサービスプロバイダ(ISP)はTorネットワークへの接続をブロックします"> -<!ENTITY torsettings.useBridges.default "提供されたブリッジで接続"> -<!ENTITY torsettings.useBridges.note "それぞれの種類のブリッジは検閲を避けるために異なった方法を使用します。 もしひとつのブリッジが機能しなければ、別のもので再度試してみてください。"> -<!ENTITY torsettings.useBridges.type "トランスポートタイプ:"> -<!ENTITY torsettings.useBridges.custom "カスタムブリッジを入力"> -<!ENTITY torsettings.useBridges.label "1つ以上のブリッジリレーを入力してください(行あたり1つ)。"> -<!ENTITY torsettings.useBridges.placeholder "アドレス:ポートを入力"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> -<!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。  ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。"> -<!ENTITY torsettings.bridgeHelp1B "設定済みのデフォルトの設定を利用するか、以下のうちのいずれかの方法によってカスタムのアドレスセットを取得することができます。"> -<!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由"> -<!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く"> -<!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges(a)torproject.xn--orgget-rd4ex272a bridgesという本文のメールを送信してください。  ただし、攻撃者にブリッジのアドレスを知られないため、このリクエストを以下のEメールプロバイダーのいずれかから送信する必要があります。(設定の順に表示):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由"> -<!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)rt.torproject.org に丁寧なメールメッセージを送信して、ブリッジアドレスをリクエストすることができます。  人間が各リクエストに対応する必要があることにご注意ください。"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Torネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index a5e2d49..d60927e 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必 torlauncher.error_default_bridges_type_missing=提供されたブリッジ用のトランスポートタイプを選択する必要があります。 torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S がある提供されたブリッジに利用できるものがありません。設定を調整してください。 -torlauncher.recommended_bridge=(推奨) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=接続 torlauncher.restart_tor=Torを再起動する diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/jv/torlauncher.properties +++ b/src/chrome/locale/jv/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 236b7ea..a2cde90 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor-ის ქსელის პარამეტრები"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor-ის ბრაუზერის ენა"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor-ის ქსელთან შეერთებამდე, თქვენ უნდა წარადგინოთ ინფორმაცია ამ კომპიუტერის ინტერნეტ კავშირის შესახებ."> - -<!ENTITY torSettings.yes "დიახ"> -<!ENTITY torSettings.no "არა"> - -<!ENTITY torSettings.firstQuestion "შემდეგიდან რომელი უკეთესად აღწერს თქვენს სიტუაციას?"> -<!ENTITY torSettings.configurePrompt1 "ამ კომპიუტერის ინტერნეტ კავშირი არის ცენზურის ქვეშ ან პროქსის უკან."> -<!ENTITY torSettings.configurePrompt2 "უნდა დავაკონფიგურირო ბრიჯი ან ადგილობრივი პროქსის პარამეტრები Tor ქსელთან შეერთებამდე."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "კონფიგურირება"> -<!ENTITY torSettings.connectPrompt2 "მსურს Tor-ის ქსელთან პირდაპირი კავშირის გამოყენება."> -<!ENTITY torSettings.connectPrompt3 "ეს იმუშავებს უმეტეს სიტუაციაში."> <!ENTITY torSettings.connect "დაკავშირება"> -<!ENTITY torSettings.proxyPageTitle "ადგილობრივი პროქსის კონფიგურაცია"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "პორტი:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 976c18c..5645d46 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=დაკავშირება torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index 3787679..240154c 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "Жоқ"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index e3a225b..f582351 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index 0d10dbc..fd4646d 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "ការកំណត់បណ្ដាញ Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "មុនពេលអ្នកភ្ជាប់ទៅបណ្ដាញ Tor អ្នកត្រូវផ្ដល់ព័ត៌មានអំពីការភ្ជាប់អ៊ីនធឺណិតកុំព្យូទ័រនេះ។"> - -<!ENTITY torSettings.yes "បាទ/ចាស"> -<!ENTITY torSettings.no "ទេ"> - -<!ENTITY torSettings.firstQuestion "តើការពណ៌នាណាមួយដូចខាងក្រោមនេះល្អបំផុតសម្រាប់ស្ថានភាពរបស់អ្នក?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "កំណត់រចនាសម្ព័ន្ធ"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "វានឹងដំណើរការក្នុងស្ថានភាពភាគច្រើន។"> <!ENTITY torSettings.connect "តភ្ជាប់"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "បញ្ចូលការកំណត់ប្រូកស៊ី។"> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "តើក្រុមហ៊ុនផ្ដល់អ៊ីនធឺណិតរបស់អ្នក (ISP) ទប់ស្កាត់ ឬបើមិនដូច្នេះទេការភ្ជាប់ឧបករណ៍ចាប់សញ្ញាទៅបណ្ដាញ Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "អ្នកអាចប្រើការកំណត់ប៊្រីតដែលបានផ្ដល់ ឬអ្នកអាចយក និងបញ្ចូលការកំណត់ប៊្រីតផ្ទាល់ខ្លួន។"> -  <!ENTITY torsettings.startingTor "កំពុងរង់ចាំ Tor ចាប់ផ្ដើម..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "ជាជម្រើស"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "ប្រភេទប្រូកស៊ី៖"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "អាយដ្ឋាន៖"> <!ENTITY torsettings.useProxy.address.placeholder "អាសយដ្ឋាន IP ឬឈ្មោះម៉ាស៊ីន"> <!ENTITY torsettings.useProxy.port "ច្រក៖"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "កុំព្យូទ័រនេះឆ្លងកាត់ជញ្ជាំងភ្លើងដែលអនុញ្ញាតតែការភ្ជាប់ទៅច្រកជាក់លាក់"> <!ENTITY torsettings.firewall.allowedPorts "ច្រកបានអនុញ្ញាត៖"> -<!ENTITY torsettings.useBridges.checkbox "ក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) របស់ខ្ញុំទប់ស្កាត់ការភ្ជាប់ទៅបណ្ដាញ Tor ។"> -<!ENTITY torsettings.useBridges.default "ភ្ជាប់ជាមួយប៊្រីតបានផ្ដល់"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "ប្រភេទបញ្ជូន៖"> -<!ENTITY torsettings.useBridges.custom "បញ្ចូលប៊្រីតផ្ទាល់ខ្លួន"> -<!ENTITY torsettings.useBridges.label "បញ្ចូលការបញ្ជូនប្រ៊ីតបន្តមួយ ឬច្រើន (មួយក្នុងមួយជួរ)។"> -<!ENTITY torsettings.useBridges.placeholder "បញ្ចូល address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "ចម្លងកំណត់ហេតុ Tor ទៅក្ដារតម្បៀតខ្ទាស់"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "ជំនួយបញ្ជូនប្រ៊ីតបន្ត"> -<!ENTITY torsettings.bridgeHelp1 "បើអ្នកមិនអាចភ្ជាប់ទៅបណ្ដាញ Tor វាអាចមកពីក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) ឬភ្នាក់ងារផ្សេងកំពុងទប់ស្កាត់ Tor ។   ជារឿយៗអ្នកអាចស្វែងយល់ពីបញ្ហានេះ ដោយប្រើប៊្រីត Tor ដែលត្រូវបានលាក់ការបញ្ជូនបន្តដែលពិបាកទប់ស្កាត់។"> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "តាមរយៈបណ្ដាញ"> -<!ENTITY torsettings.bridgeHelp2 "ប្រើកម្មវិធីរុករកបណ្ដាញ ដើម្បីមើល https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "តាមរយៈការឆ្លើយតបដោយស្វ័យប្រវត្តិរបស់អ៊ីមែល"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "តាមរយៈជំនួយ"> -<!ENTITY torsettings.bridgeHelp4 "នៅជម្រើសចុងក្រោយ អ្នកអាចស្នើអាសយដ្ឋានប៊្រីតដោយផ្ញើសារអ៊ីមែលគួរសមទៅ help(a)rt.torproject.org.  សូមចំណាំថា មនុស្សម្នាក់នឹងត្រូវឆ្លើយតបទៅសំណើនីមួយៗ។"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties index f9eb30a..284d902 100644 --- a/src/chrome/locale/km/torlauncher.properties +++ b/src/chrome/locale/km/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=អ្នកត្រូវតែប torlauncher.error_default_bridges_type_missing=អ្នកត្រូវតែជ្រើសប្រភេទបញ្ជូនសម្រាប់ប៊្រីតបានផ្ដល់ឲ្យ។ torlauncher.error_bridge_bad_default_type=គ្មានប៊្រីតបានផ្ដល់ដែលមានប្រភេទបញ្ជូន %S ។ សូមកែការកំណត់របស់អ្នក។ -torlauncher.recommended_bridge=(បានផ្ដល់អនុសាសន៍) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=តភ្ជាប់ torlauncher.restart_tor=ចាប់ផ្ដើម Tor ឡើងវិញ diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index 2a9f2c7..46a2438 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "ಓಕೇ"> -<!ENTITY torSettings.no "ಇಲ್ಲಪ್ಪ"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties index 6c2ec67..6571cef 100644 --- a/src/chrome/locale/kn/torlauncher.properties +++ b/src/chrome/locale/kn/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index 0908a1d..68237c2 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor 네트워크 설정"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor 사용 언어"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor 네트워크에 접속하기 전, 이 컴퓨터의 인터넷 접속 정보를 제공해 주셔야 합니다."> - -<!ENTITY torSettings.yes "네"> -<!ENTITY torSettings.no "아니오"> - -<!ENTITY torSettings.firstQuestion "무엇이 당신의 상황과 가장 가까운가요?"> -<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열 또는 프록시에 연결되어 있습니다."> -<!ENTITY torSettings.configurePrompt2 "저는  Tor 네트워크에 접속하는 데 브릿지나 로컬 프록시 설정을 필요로 합니다."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "구성"> -<!ENTITY torSettings.connectPrompt2 "나는 Tor 네트워크와 직접적인 연결을 하고 싶습니다."> -<!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작할 것입니다."> <!ENTITY torSettings.connect "연결"> -<!ENTITY torSettings.proxyPageTitle "로컬 프록시 구성"> -<!ENTITY torSettings.proxyQuestion "이 컴퓨터로 인터넷에 접근할 때 로컬 프록시를 사용해야 하나요?"> - -<!ENTITY torSettings.proxyExplanation1 "당신이 회사, 학교 네트워크에서 접속하지 않는다면, 웬만하면 로컬 프록시는 필요하지 않습니다."> -<!ENTITY torSettings.proxyExplanation2 "당신이 이에 대해 잘 모른다면, 다른 브라우저의 인터넷 설정이나 시스템 네트워크 설정에서 로컬 프록시가 필요한 지 확인하세요."> -<!ENTITY torSettings.enterProxy "프록시 정보를 입력하세요."> -<!ENTITY torSettings.bridgePageTitle "Tor 브릿지 구성"> -<!ENTITY torSettings.bridgeQuestion "당신의 인터넷 서비스 제공자 (ISP)가 Tor 네트워크 연결을 차단 혹은 검열합니까?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "주소:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "포트:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties index ba0e7bf..47dece0 100644 --- a/src/chrome/locale/ko-KR/torlauncher.properties +++ b/src/chrome/locale/ko-KR/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(추천) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=연결 torlauncher.restart_tor=Tor 재시작 diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 64e87cb..8dca12c 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor 네트워크 설정"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor 브라우저 언어"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor 네트워크에 연결을 시도하기 전에, 이 컴퓨터의 인터넷 연결에 대한 정보를 제공해야 합니다."> - -<!ENTITY torSettings.yes "예"> -<!ENTITY torSettings.no "아니오"> - -<!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> -<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> -<!ENTITY torSettings.configurePrompt2 "Tor 네트워크에 연결하기 전에 브리지 또는 로컬 프록시 설정을 구성해야 합니다."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "구성"> -<!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> -<!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> <!ENTITY torSettings.connect "연결"> -<!ENTITY torSettings.proxyPageTitle "로컬 프록시 설정"> -<!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?"> - -<!ENTITY torSettings.proxyExplanation1 "대부분의 경우 로컬 프록시는 필요하지 않지만 회사, 학교 또는 대학 네트워크를 통해 연결할 때 필요할 수 있습니다."> -<!ENTITY torSettings.proxyExplanation2 "이 질문에 대답하는 방법을 모르면 다른 브라우저의 인터넷 설정을 확인하거나 시스템의 네트워크 설정을 확인하여 로컬 프록시가 필요한지 확인하십시오."> -<!ENTITY torSettings.enterProxy "프록시 설정에 들어갑니다."> -<!ENTITY torSettings.bridgePageTitle "Tor 브릿지 설정"> -<!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> -<!ENTITY torSettings.bridgeExplanation1 "이 질문에 대답하는 방법을 모르면 아니오를 선택하십시오 (브리지 없이 Tor 네트워크에 연결할 수 없는 경우 나중에 추가 할 수 있습니다)."> -<!ENTITY torSettings.bridgeExplanation2 "예를 선택하면 Tor 네트워크에 대한 연결을 차단하기가 더 어려워지는 목록에 없는 릴레이 인 Tor 브리지를 구성하라는 메시지가 표시됩니다."> -<!ENTITY torSettings.bridgeSettingsPrompt "제공된 브리지 세트를 사용하거나 사용자 지정 브리지 세트를 취득하여 입력 할 수 있습니다."> -  <!ENTITY torsettings.startingTor "Tor 시작 대기 중..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "선택"> -<!ENTITY torsettings.useProxy.checkbox "이 컴퓨터는 인터넷 접속에 프록시를 사용해야 합니다."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "프록시 종류:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "주소:"> <!ENTITY torsettings.useProxy.address.placeholder "IP 주소 또는 호스트 네임"> <!ENTITY torsettings.useProxy.port "포트:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 통과하는 방화벽을 지나 연결됩니다."> <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> -<!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> -<!ENTITY torsettings.useBridges.default "제공된 브릿지에 연결"> -<!ENTITY torsettings.useBridges.note "각 유형의 브리지는 검열을 피하기 위해 다른 방법을 사용합니다  하나의 브리지가 작동하지 않으면 다른 브리지를 사용하여 다시 시도하십시오."> -<!ENTITY torsettings.useBridges.type "전송 유형:"> -<!ENTITY torsettings.useBridges.custom "이용자 브릿지 접속"> -<!ENTITY torsettings.useBridges.label "1개 이상의 브릿지 중계 서버를 입력해 주세요. (각 줄에 한 개씩)"> -<!ENTITY torsettings.useBridges.placeholder "주소 입력 : 포트 번호"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> -<!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.  그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> -<!ENTITY torsettings.bridgeHelp1B "사전 구성된 브리지 주소 집합을 사용하거나 다음 방법 중 하나를 사용하여 사용자 지정 주소 집합을 얻을 수 있습니다."> -<!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> -<!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> -<!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.  단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 아래의 이메일(우선순위대로 기재되어 있음)으로 보내주시면 감사하겠습니다."> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 또는 https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> -<!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의 해주십시오"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index ca48f30..3a2ff53 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니 torlauncher.error_default_bridges_type_missing=제공된 브리지의 전송 유형을 선택해야합니다. torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공 한 브리지 유효한 것이 아닙니다. 설정을 조정하십시오. -torlauncher.recommended_bridge=(권장함) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=연결 torlauncher.restart_tor=Tor 재시작 diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ku/torlauncher.properties +++ b/src/chrome/locale/ku/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/kw/torlauncher.properties +++ b/src/chrome/locale/kw/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index a94a6ac..2e64ffa 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Ооба"> -<!ENTITY torSettings.no "Жок"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Байланышуу "> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Дарек:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties index 7de69b9..788283f 100644 --- a/src/chrome/locale/ky/torlauncher.properties +++ b/src/chrome/locale/ky/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Байланышуу torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index 77fa7af..ac57dd6 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Jo"> -<!ENTITY torSettings.no "Nee"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties index 08f57f5..7f98dad 100644 --- a/src/chrome/locale/lb/torlauncher.properties +++ b/src/chrome/locale/lb/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/lg/torlauncher.properties +++ b/src/chrome/locale/lg/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ln/torlauncher.properties +++ b/src/chrome/locale/ln/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index 31cb0e6..6d77fcd 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "ການຕັ້ງຄ່າເຄືອຂ່າຍ Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "ກ່ອນທີ່ທ່ານຈະເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor, ທ່ານຕ້ອງໄດ້ໃຫ້ລາຍລະອຽດກ່ຽວກັບ ການເຊື່ອມຕໍ່ ອິນເຕີເນັດ ຂອງ ຄັອມພິວເຕີຣ໌ ນີ້ກ່ອນ."> - -<!ENTITY torSettings.yes "ແມ່ນ"> -<!ENTITY torSettings.no "ບໍ່"> - -<!ENTITY torSettings.firstQuestion "ອັນໃດ ຕໍ່ໄປນີ້ ທີ່ ບັນຍາຍ ຢ່າງ ລະອຽດ ທີ່ສຸດ ກ່ຽວກັບ ສະພາບ ຂອງ ທ່ານ?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "ກຳນົດຄ່າ"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "ນີ້ຈະໃຊ້ໄດ້ກັບສະຖານະການສ່ວນໃຫຍ່."> <!ENTITY torSettings.connect "ເຊື່ອມຕໍ່"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "ປ້ອນ ການຕັ້ງຄ່າ ພຣັອກຊີ ເຂົ້າໄປ."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "ຜູ້ໃຫ້ບໍລິການ ອິນເຕີເນັດ (ISP) ກັນໄວ້ບໍ່ ຫຼືບໍ່ ກໍແມ່ນ ມີການກວດສອບ ກ່ອນທີ່ຈະເຊື່ອມຕໍ່ເຂົ້າກັບເຄືອຂ່າຍ Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "ພັອດ:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index ce43346..febfbe8 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(ແນະນໍາ) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=ເຊື່ອມຕໍ່ torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index ecf78f0..279c490 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor tinklo nustatymai"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor naršyklės kalba"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Prieš tai, kai prisijungsite prie Tor tinklo, jūs turite pateikti informaciją apie šio kompiuterio interneto ryšį."> - -<!ENTITY torSettings.yes "Taip"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi jūsų padėtį?"> -<!ENTITY torSettings.configurePrompt1 "Šio kompiuterio interneto ryšys yra cenzūruojamas arba jungiamas per įgaliotąjį serverį."> -<!ENTITY torSettings.configurePrompt2 "Prieš jungiantis prie Tor tinklo, man reikia sukonfigūruoti tinklų tiltą ar vietinius įgaliotojo serverio nustatymus."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigūruoti"> -<!ENTITY torSettings.connectPrompt2 "Aš norėčiau tiesiogiai prisijungti prie Tor tinklo."> -<!ENTITY torSettings.connectPrompt3 "Tai suveiks daugeliu situacijų."> <!ENTITY torSettings.connect "Prisijungti"> -<!ENTITY torSettings.proxyPageTitle "Vietinio įgaliotojo serverio konfigūracija"> -<!ENTITY torSettings.proxyQuestion "Ar šis kompiuteris prisijungimui prie interneto naudoja vietinį įgaliotąjį serverį?"> - -<!ENTITY torSettings.proxyExplanation1 "Daugeliu atveju, vietinis įgaliotasis serveris yra nereikalingas, tačiau jo gali prireikti, jungiantis per kompanijos, mokyklos ar universiteto tinklą."> -<!ENTITY torSettings.proxyExplanation2 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pažiūrėkite interneto nustatymus kitoje naršyklėje arba patikrinkite savo sistemos tinklo nustatymus, kad pamatytumėte ar vietinis įgaliotasis serveris yra reikalingas."> -<!ENTITY torSettings.enterProxy "Įrašykite įgaliotojo serverio nustatymus."> -<!ENTITY torSettings.bridgePageTitle "Tor tinklų tiltų konfigūracija"> -<!ENTITY torSettings.bridgeQuestion "Ar jūsų interneto paslaugų tiekėjas (ISP) blokuoja ar kitaip cenzūruoja prisijungimus prie Tor tinklo?"> -<!ENTITY torSettings.bridgeExplanation1 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pasirinkite Ne (jeigu negalėsite prisijungti prie Tor tinklo be tinklų tilto, tuomet galėsite jį pridėti vėliau)."> -<!ENTITY torSettings.bridgeExplanation2 "Jeigu pasirinksite Taip, jūsų bus paprašyta sukonfigūruoti Tor tinklų tiltus, kurie yra neišvardyti retransliavimai, trukdantys blokuoti ryšius su Tor tinklu."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Laukiama, kol Tor bus paleistas…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Nebūtina"> -<!ENTITY torsettings.useProxy.checkbox "Šis kompiuteris turi naudoti vietinį įgaliotąjį serverį, kad gautų prieigą prie internetą."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresas:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas"> <!ENTITY torsettings.useProxy.port "Prievadas:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:"> -<!ENTITY torsettings.useBridges.checkbox "Mano interneto paslaugų tiekėjas (ISP) blokuoja prisijungimus prie Tor tinklo"> -<!ENTITY torsettings.useBridges.default "Prisijungti, naudojant pateiktus tinklų tiltus"> -<!ENTITY torsettings.useBridges.note "Kiekvienas tinklų tilto tipas, tam, kad išvengtų cenzūros, naudoja skirtingą metodą.  Jeigu vienas tinklų tiltas neveikia, bandykite dar kartą, naudodami kitą tinklų tiltą."> -<!ENTITY torsettings.useBridges.type "Perdavimo tipas:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Įveskite vieną ar daugiau tinklų tilto retransliavimus (kiekvieną atskiroje eilutėje)."> -<!ENTITY torsettings.useBridges.placeholder "įrašykite adresą:prievadą"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopijuoti Tor žurnalą į iškarpinę"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ar https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.  Tai gali užtrukti kelias minutes."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 19e97d8..f82d1f8 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Privalote nurodyti bent vieną tinklų tiltą. torlauncher.error_default_bridges_type_missing=Privalote nurodytiems tinklų tiltams pasirinkti perdavimo tipą. torlauncher.error_bridge_bad_default_type=Neprieinamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome sureguliuoti savo nustatymus. -torlauncher.recommended_bridge=(rekomenduojama) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Prisijungti torlauncher.restart_tor=Pakartotinai paleisti Tor diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index d10497d..ee8fd53 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor tīkla iestatījumi"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Pārlūka Tor valoda"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Pirms pievienojaties pie tīkla Tor, Jums jānorāda informācija par šī datora interneta savienojumu."> - -<!ENTITY torSettings.yes "Jā"> -<!ENTITY torSettings.no "Nē"> - -<!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> -<!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> -<!ENTITY torSettings.configurePrompt2 "Man jānokonfigurē tiltu vai vietējo starpniekserveru iestatījumi pirms es izveidoju savienojumu ar tīklu Tor ."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurēt"> -<!ENTITY torSettings.connectPrompt2 "Es vēlos izveidot tiešu savienojumu ar tīklu Tor."> -<!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> -<!ENTITY torSettings.proxyPageTitle "Lokālā starpniekservera konfigurēšana"> -<!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?"> - -<!ENTITY torSettings.proxyExplanation1 "Vairumā gadījumu nav nepieciešams vietējais starpniekserveris, bet tas var būt nepieciešams, ja savienojumu veido caur uzņēmuma, skolas vai universitātes tīklu."> -<!ENTITY torSettings.proxyExplanation2 "Ja īsti nezināt kā atbildēt uz šo jautājumu, ieskatieties cita pārlūka interneta iestatījumos vai pārbaudiet Jūsu sistēmas tīkla iestatījumus, lai redzētu vai ir nepieciešams vietējais starpniekserveris. "> -<!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatījumus."> -<!ENTITY torSettings.bridgePageTitle "Tor tiltu konfigurēšana"> -<!ENTITY torSettings.bridgeQuestion "Vai Jūsu interneta pakalpojumu sniedzējs (ISP) bloķē vai savādāk cenzē savienojumus ar tīklu Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Ja īsti nezināt kā atbildēt uz šo jautājumu, izvēlieties Nē (ja bez tilta nevarat izveidot savienojumu ar tīklu Tor, varēsit tiltu pievienot vēlāk)."> -<!ENTITY torSettings.bridgeExplanation2 "Ja izvēlēsities Jā, Jums lūgs konfigurēt Tor tiltus, kas ir sarakstos neiekļauti retranslatori, kas padara grūtāku savienojumu bloķēšanu ar tīklu Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Jūs varat izmantot piedāvāto tiltu kopumu vai varat ievadīt tiltu pielāgotu sarakstu. "> -  <!ENTITY torsettings.startingTor "Gaida, kamēr Tor startēs..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Neobligāts"> -<!ENTITY torsettings.useProxy.checkbox "Šajā datorā interneta piekļuvei ir jāizmanto lokālais starpniekserveris."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Starpnieka tips:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adrese:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums"> <!ENTITY torsettings.useProxy.port "Ports:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Šis dators iet caur ugunsmūri, kurš atļauj tikai savienojumus ar noteiktiem portiem."> <!ENTITY torsettings.firewall.allowedPorts "Atļautie porti:"> -<!ENTITY torsettings.useBridges.checkbox "Mans interneta pakalpojumu sniedzējs (IPS) bloķē savienojumu izveidošanu ar tīklu Tor"> -<!ENTITY torsettings.useBridges.default "Veidot savienojumu ar piedāvātajiem tiltiem"> -<!ENTITY torsettings.useBridges.note "Katrs tilta veids lieto citu cenzūras apiešanas metodi.  ja kāds tilts nestrādā, mēģiniet vēlreiz ar citu."> -<!ENTITY torsettings.useBridges.type "Transporta veids:"> -<!ENTITY torsettings.useBridges.custom "Ievadiet pielāgotus tiltus"> -<!ENTITY torsettings.useBridges.label "Ievadiet vienu vai vairākus tilta retranslatorus (vienu rindā)."> -<!ENTITY torsettings.useBridges.placeholder "rakstīt address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopēt Tor žurnālu starpliktuvē"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Palīdzība par tiltu retranslatoriem"> -<!ENTITY torsettings.bridgeHelp1 "Ja nevarat izveidot savienojumu ar tīklu Tor, tad, iespējams, ka Jūsu interneta pakalpojumu sniedzējs (ISP) vai cita iestāde bloķē Tor.  Bieži, šo problemu var apiet izmantojot Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kurus grūtāk bloķēt."> -<!ENTITY torsettings.bridgeHelp1B "Jūs varat izmantot piedāvāto, iepriekš nokonfigurēto tiltu adrešu kopumu vai varat saņemt pielāgotu adrešu kopumu, lietojot kādu no šīm metodēm:"> -<!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> -<!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu, lai apmeklētu https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Sūtiet e-pastu uz bridges(a)torproject.org ar rindu 'get bridges' ziņojuma tekstā.  Taču, lai uzbrucējam būtu sarežģītāk uzzināt daudz tiltu adrešu, Jums jāsūta šis pieprasījums no kāda no šo e-pasta pakalpojumu sniedzēju e-pastiem (uzskaitītiem vēlamās izvēles kārtībā):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> -<!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor.  tam var būt nepieciešamas vairākas minūtes."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index 72389df..1842243 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Jums jānorāda viens vai vairāki tilti. torlauncher.error_default_bridges_type_missing=Jums piedāvātajiem tiltiem jāizvēlas transporta veids. torlauncher.error_bridge_bad_default_type=Nav piedāvātu tiltu ar transporta veidu %S . Lūdzu, koriģējiet uzstadījumus. -torlauncher.recommended_bridge=(ieteicami) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Veidot savienojumu torlauncher.restart_tor=Restartēt Tor diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/mg/torlauncher.properties +++ b/src/chrome/locale/mg/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/mi/torlauncher.properties +++ b/src/chrome/locale/mi/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 00d6235..c457350 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Да"> -<!ENTITY torSettings.no "Не"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Порта:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 817aa35..cb2fd69 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(препорачано) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 24bb4d6..3523a14 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -28,13 +28,14 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=കഴിഞ്ഞു torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/mn/torlauncher.properties +++ b/src/chrome/locale/mn/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index b0fef6d..5f0d428 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "होय"> -<!ENTITY torSettings.no "नाही"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "जोडा"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index c5c3b38..114cb48 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=एक किंवा अधिक ब्र torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(शिफारस केलेली) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=जोडा torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 71a3a6e..0d66f7a 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tetapan Rangkaian Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Sebelum anda menyambung ke jaringan Tor, anda mestilah memberi maklumat tentang talian internet komputer ini terlebih dahulu."> - -<!ENTITY torSettings.yes "Ya"> -<!ENTITY torSettings.no "Tidak"> - -<!ENTITY torSettings.firstQuestion "Antara berikut yang manakah terbaik menerangkan keadaan anda?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurasi"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Menyambung"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Masukkan tetapan proksi."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Menunggu Tor untuk dimulakan..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Jenis Proksi:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama host"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Komputer ini melalui firewall yang hanya membenarkan sambungan ke port tertentu"> <!ENTITY torsettings.firewall.allowedPorts "Port yang dibenarkan:"> -<!ENTITY torsettings.useBridges.checkbox "Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Masukkan satu atau lebih bridge relay (satu per baris)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Salin log Tor ke clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index 35caa26..83bedf6 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(digalakkan) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Menyambung torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/mt/torlauncher.properties +++ b/src/chrome/locale/mt/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index 80448c5..e079969 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "ဟုတ်ကဲ့"> -<!ENTITY torSettings.no "လက်မခံ့ါ"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "ချိတ်ဆက်ရန်"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "နေရပ်လိပ်စာ -"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "ခွင့်ပြုထားသော Ports များ -"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index eef9cb1..be6012c 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Bridge တစ်ခု (သို့) တ torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(အကြံပြုထားသည်) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=ချိတ်ဆက်ရန် torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/nah/torlauncher.properties +++ b/src/chrome/locale/nah/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/nap/torlauncher.properties +++ b/src/chrome/locale/nap/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 06e1054..2824aa6 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Før du kan koble til Tor-nettverket, må du gi informasjon om denne datamaskinens Internett-tilkobling."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nei"> - -<!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> -<!ENTITY torSettings.configurePrompt1 "Datamaskinens Internett-tilkobling er sensurert eller bak mellomtjener."> -<!ENTITY torSettings.configurePrompt2 "Jeg trenger å sette opp bro eller lokale mellomtjenerinnstillinger før jeg kobler til Tor nettverket."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Sett opp"> -<!ENTITY torSettings.connectPrompt2 "Jeg ønsker å opprette en direkte forbindelse til Tor-nettverket."> -<!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner."> <!ENTITY torSettings.connect "Koble til"> -<!ENTITY torSettings.proxyPageTitle "Lokalt mellomtjener-oppsett"> -<!ENTITY torSettings.proxyQuestion "Trenger denne maskinen å bruke en lokal mellomtjener for å nå Internett?"> - -<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfeller en lokal mellomtjener ikke er nødvendig, men det kan være påkrevd når du kobler til gjennom et firma, skole eller universitetsnettverk."> -<!ENTITY torSettings.proxyExplanation2 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, se på Internett-innstillingene i en annen nettleser eller sjekk nettverksinnstillingene systemets å se om en lokal mellomtjener er nødvendig."> -<!ENTITY torSettings.enterProxy "Skriv inn mellomtjenings-innstillingene."> -<!ENTITY torSettings.bridgePageTitle "Oppsett av Tor-broer."> -<!ENTITY torSettings.bridgeQuestion "Blokkerer eller på annet vis sensurerer Internettleverandøren (ISP) dine tilkoblinger til Tor-nettverket?"> -<!ENTITY torSettings.bridgeExplanation1 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, velg Nei (hvis du ikke klarer å koble til Tor-nettverket uten en bro, kan du legge til en senere)."> -<!ENTITY torSettings.bridgeExplanation2 "Hvis du velger Ja, vil du bli bedt om å sette opp Tor-broer, som er unoterte rutingsstafettoppsett som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> -<!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer."> -  <!ENTITY torsettings.startingTor "Venter på at Tor skal starte…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Valgfritt"> -<!ENTITY torsettings.useProxy.checkbox "Denne maskinen trenger å bruke en mellomtjener for å nå Internett"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,26 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter"> <!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:"> -<!ENTITY torsettings.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket"> -<!ENTITY torsettings.useBridges.default "Koble til med angitte broer"> -<!ENTITY torsettings.useBridges.note "Hver type bro bruker en annen metode for å unngå sensur.  Hvis en bro ikke virker, prøv på nytt med en annen."> -<!ENTITY torsettings.useBridges.type "Tilkoblingstype:"> -<!ENTITY torsettings.useBridges.custom "Angi egendefinerte broer"> -<!ENTITY torsettings.useBridges.label "Angi én eller flere bro-rutingsstafettoppsett (ett per linje)."> -<!ENTITY torsettings.useBridges.placeholder "type adresse:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.  Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede rutingsstafettoppsett og derfor vanskeligere å blokkere."> -<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de ferdig oppsatte, medfølgende broene eller du kan skaffe et egendefinert sett adresser ved bruk av én av disse metodene:."> -<!ENTITY torsettings.bridgeHelp2Heading "Via nettet"> -<!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for å besøke https://bridges.torproject.org/?lang=nb"> -<!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send en e-post til bridges(a)torproject.org med 'get bridges' enten i emnefeltet eller i meldingen.  For å gjøre det vanskeligere for en angriper å ta rede på en mengde bro-adresser, må du sende denne forespørselen fra en av følgende i listen over e-posttilbydere (opplistet etter preferanse):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> -<!ENTITY torsettings.bridgeHelp4 "Som en siste utvei, kan du be om bro-adresser ved å sende en høflig e-post til help(a)rt.torproject.org.  -Tenk over at en person må svare på hver slik forespørsel."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 65951d6..adefc26 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -26,9 +26,10 @@ torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller v torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. -torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Juster innstillingene dine. +torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. -torlauncher.recommended_bridge=(anbefalt) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Koble til torlauncher.restart_tor=Omstart av Tor diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/nds/torlauncher.properties +++ b/src/chrome/locale/nds/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 9b1f1a7..26fdd4a 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "जडान गर्नुहोस् "> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties index 36faf97..5f075da 100644 --- a/src/chrome/locale/ne/torlauncher.properties +++ b/src/chrome/locale/ne/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=एक वा एक भन्दा बढी torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=जडान गर्नुहोस् torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index d313b6e..6692952 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Netwerk Instellingen"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Voordat u connecteert met het Tor netwerk, dient u informatie op te geven inzake uw internetconnectie."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nee"> - -<!ENTITY torSettings.firstQuestion "Welke van devolgende situaties beschrijft uw situatie het best?"> -<!ENTITY torSettings.configurePrompt1 "De Internet connectie van deze computer is gecensureerd of connecteert via een proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configureer"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Dit zal werken in de meeste situaties."> <!ENTITY torSettings.connect "Verbinden"> -<!ENTITY torSettings.proxyPageTitle "Lokale Proxy Configuratie."> -<!ENTITY torSettings.proxyQuestion "Gebruikt deze computer een lokale proxy om verbinding te maken met het Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Geef de proxy instellingen in"> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuratie"> -<!ENTITY torSettings.bridgeQuestion "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Wachten tot Tor opstart..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optioneel"> -<!ENTITY torsettings.useProxy.checkbox "Deze computer heeft een lokale proxy nodig om toegang te krijgen tot het Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adres of hostnaam"> <!ENTITY torsettings.useProxy.port "Poort:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Via het Web"> -<!ENTITY torsettings.bridgeHelp2 "Gebruik een web browser om https://bridges.torproject.org te bezoeken"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Via de Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index e63e160..608698b 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(aanbevolen) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Verbinden torlauncher.restart_tor=Tor herstarten @@ -53,7 +54,7 @@ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! torlauncher.bootstrapWarning.done=klaar -torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index bb0bbe8..b9da126 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netwerkinstellingen"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor-browsertaal"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Voordat je verbindt met het Tor-netwerk moet je eerst wat meer informatie geven over de internetverbinding van deze computer."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nee"> - -<!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?"> -<!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer is gecensureerd of loopt via een proxy."> -<!ENTITY torSettings.configurePrompt2 "Ik moet een bridge of lokale proxy instellen voordat ik verbinding kan maken met het Tor netwerk."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configureren"> -<!ENTITY torSettings.connectPrompt2 "Ik wil een directe verbinding met het Tor netwerk maken."> -<!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken."> <!ENTITY torSettings.connect "Verbinden"> -<!ENTITY torSettings.proxyPageTitle "Lokale proxy-configuratie"> -<!ENTITY torSettings.proxyQuestion "Heeft deze computer een lokale proxy nodig om toegang tot het internet te krijgen?"> - -<!ENTITY torSettings.proxyExplanation1 "In de meeste gevallen is een locale proxy niet nodig, maar kan het wel worden vereist bij het verbinden met een bedrijf, school of universitair netwerk."> -<!ENTITY torSettings.proxyExplanation2 "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy."> -<!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in."> -<!ENTITY torSettings.bridgePageTitle "Tor bridge-configuratie"> -<!ENTITY torSettings.bridgeQuestion "Blokkeert of filtert je Internet Service Provider (ISP) verbindingen met het Tor-netwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee (als je niet kunt verbinden met het Tor netwerk zonder een bridge, kun je later een toevoegen)."> -<!ENTITY torSettings.bridgeExplanation2 "Als je Ja kiest, moet je zelf Tor Bridges instellen, maar omdat het geen vertrouwde relays zijn is het moeilijker om verbindingen te blokkeren naar het Tor Netwerk."> -<!ENTITY torSettings.bridgeSettingsPrompt "Je ka de opgegeven bridges gebruiken, of je kan je eigen bridges verkrijgen en instellen. "> -  <!ENTITY torsettings.startingTor "Wachten tot Tor gestart is…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optioneel"> -<!ENTITY torsettings.useProxy.checkbox "Deze computer heeft een lokale proxy nodig om toegang te krijgen tot het internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxytype:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adres of hostnaam"> <!ENTITY torsettings.useProxy.port "Poort:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat"> <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> -<!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor-netwerk"> -<!ENTITY torsettings.useBridges.default "Verbinden met ingestelde bridges"> -<!ENTITY torsettings.useBridges.note "Elk type bridge gebruikt een verschillende methode om censorship te voorkomen.  Als een van de bridges niet werkt, probeert u het dan opnieuw met een andere."> -<!ENTITY torsettings.useBridges.type "Transporttype:"> -<!ENTITY torsettings.useBridges.custom "Eigen bridge-instellingen"> -<!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel)."> -<!ENTITY torsettings.useBridges.placeholder "type adres:poortnummer"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp"> -<!ENTITY torsettings.bridgeHelp1 "Indien je geen verbinding kan maken met het Tor-netwerk, zou het kunnen dat je Internet Service Provider (ISP) of een andere instelling Tor blokkeert.  Vaak kan je dit omzeilen door gebruik te maken van Tor-bridges, dit zijn ongeregistreerde relays die moeilijker te blokkeren zijn."> -<!ENTITY torsettings.bridgeHelp1B "Je kunt voorgedefinieerde set met bridge-adressen gebruiken of je kunt een maatwerk adressenset krijgen via een van deze methoden:"> -<!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web"> -<!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken"> -<!ENTITY torsettings.bridgeHelp3Heading "Door middel van de e-mail-autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Stuur een e-mail naar bridges(a)torproject.org met als inhoud van de mail enkel de tekst 'get bridges'.  Let wel, om het aanvallers te bemoeilijken informatie te verkrijgen over bridge-adressen dien je je aanvraag te versturen van een van de volgende e-mailproviders (gerangschikt in volgorde naar voorkeur):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk"> -<!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel kan je bridge-adressen aanvragen door een vriendelijke e-mail te sturen naar help(a)rt.torproject.org.  Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 44ed510..b372c39 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven. torlauncher.error_default_bridges_type_missing=Je moet een transport-type selecteren voor de verstrekte bridges. torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub je instellingen aan. -torlauncher.recommended_bridge=(aanbevolen) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Verbind torlauncher.restart_tor=Herstart Tor diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index f631124..60d422a 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor nettlesarspråk"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Før du koplar til Tor-nettverket må du oppgje korleis maskina di koplar til internett."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nei"> - -<!ENTITY torSettings.firstQuestion "Kva trur du passar best?"> -<!ENTITY torSettings.configurePrompt1 "Internett-sambandet til denne maskina er anten sensurert eller går gjennom ein proxy-tenar."> -<!ENTITY torSettings.configurePrompt2 "Eg må konfigurera bru- eller lokale proxyinnstillingar før eg koplar til Tor-nettverket."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurer"> -<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til Tor-nettverket direkte."> -<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve."> <!ENTITY torSettings.connect "Kopla til"> -<!ENTITY torSettings.proxyPageTitle "Konfigurasjon av lokal proxy"> -<!ENTITY torSettings.proxyQuestion "For å kopla til internett, treng denne maskina å nytta ein lokal proxy?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Sensurerer eller blokkerer internettleverandøren din (ISP) på noko vis tilgang til Tor-nettverket?"> -<!ENTITY torSettings.bridgeExplanation1 "Viss du ikkje er viss på dette, så vel Nei (viss du ikkje klarer å kopla til Tor-nettverket utan ei bru, kan du sete opp dette seinare)."> -<!ENTITY torSettings.bridgeExplanation2 "Viss du vel Ja, vert du spurt om du vil konfigurere bruer med Tor. Bruer er ulista relear som gjer det vanskelegare å blokkere samband til Tor-nettverket."> -<!ENTITY torSettings.bridgeSettingsPrompt "Du kan nytta bruene som følgjer med eller skaffa og skriva inn dine eigne."> -  <!ENTITY torsettings.startingTor "Ventar på at Tor startar..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Valfritt"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Mellomtenartype:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Addresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vertsnamn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Tillatne portar:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transporttype:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Gjennom nettet"> -<!ENTITY torsettings.bridgeHelp2 "Nytt ein nettlesar for å vitja https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index f6b3dd3..ad843e9 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=DU må velje ei transporttype for dei medfølgjande bruene. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(tilrådd) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Kople til torlauncher.restart_tor=Start Tor på nytt diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/nso/torlauncher.properties +++ b/src/chrome/locale/nso/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/oc/torlauncher.properties +++ b/src/chrome/locale/oc/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/or/torlauncher.properties +++ b/src/chrome/locale/or/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 32da454..d60f00c 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "ਟੋਰ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗ"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "ਹਾਂ"> -<!ENTITY torSettings.no "ਨਹੀਂ"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "ਸੰਰਚਨਾ"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "ਇਹ ਬਹੁਤੇ ਹਾਲਤਾਂ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ।"> <!ENTITY torSettings.connect "ਕੁਨੈਕਟ ਕਰੋ"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "...ਟੋਰ ਸ਼ੁਰੂ ਹੋਣ ਤੱਕ ਉਡੀਕੋ"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "ਚੋਣਵਾਂ"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "ਪਰਾਕਸੀ ਕਿਸਮ:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "ਪਤਾ:"> <!ENTITY torsettings.useProxy.address.placeholder "IP ਸਿਰਨਾਵਾਂ ਜਾਂ ਹੋਸਟ-ਨਾਂ"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "ਦਿੱਤੇ ਬਰਿਜ਼ ਰਾਹੀਂ ਕੁਨੈਕਟ"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "ਟਰਾਂਸਪੋਰਟ ਕਿਸਮ:"> -<!ENTITY torsettings.useBridges.custom "ਪਸੰਦੀਦਾ ਬਰਿੱਜ਼ ਦਿਓ"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "ਵੈੱਬ ਰਾਹੀਂ"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡੈਸਕ ਰਾਹੀਂ"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index 43da2bd..5b2f8c8 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=ਕੁਨੈਕਟ ਕਰੋ torlauncher.restart_tor=ਟੋਰ ਮੁੜ-ਚਾਲੂ ਕਰੋ diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/pap/torlauncher.properties +++ b/src/chrome/locale/pap/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index de9ccac..9a2f3f6 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -53,6 +53,3 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> - - -<!ENTITY torprogress.pleaseWait "Przeglądarka Tor uruchomi się po połączeniu z siecią Tor"> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index cfb082d..5806fe5 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Ustawienia Sieci"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor."> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Zanim podłączysz się do sieci Tor, uzupełnij informacje o parametrach połączenia tego komputera z internetem."> - -<!ENTITY torSettings.yes "Tak"> -<!ENTITY torSettings.no "Nie"> - -<!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> -<!ENTITY torSettings.configurePrompt1 "Połączenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy."> -<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować ustawienia mostka lub lokalne proxy przed podłączyć do sieci Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguruj"> -<!ENTITY torSettings.connectPrompt2 "Chciałbym nawiązać bezpośrednie połączenie do sieci Tor."> -<!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji."> <!ENTITY torSettings.connect "Połącz"> -<!ENTITY torSettings.proxyPageTitle "Ustawienia lokalnego proxy"> -<!ENTITY torSettings.proxyQuestion "Czy ten komputer musi używać lokalnego proxy, aby połączyć się z Internetem?"> - -<!ENTITY torSettings.proxyExplanation1 "W większości przypadków lokalny serwer proxy nie jest potrzebny, jednakże może to być konieczne w przypadku podłączenia przez firmy, szkoły lub sieci uniwersyteckiej."> -<!ENTITY torSettings.proxyExplanation2 "Jeśli nie jesteś pewien, jak odpowiedzieć na to pytanie, przejrzyj ustawienia opcji internetowych w innej przeglądarce lub sprawdzić ustawienia sieci danego systemu, aby sprawdzić, czy lokalny serwer proxy jest potrzebny."> -<!ENTITY torSettings.enterProxy "Wprowadź ustawienia serwera proxy"> -<!ENTITY torSettings.bridgePageTitle "Ustawienia Tor Bridges"> -<!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Jeśli nie jesteś pewien, jak odpowiedzieć na to pytanie, wybierz opcję Nie (jeśli nie jesteś w stanie połączyć się z siecią Tor bez mostu, możesz dodać jeden później)."> -<!ENTITY torSettings.bridgeExplanation2 "Jeśli wybierzesz Tak, zostaniesz poproszony o skonfigurowanie Mostu Tor, który jest przekaźnikiem nie listowanym, sprawia to, że trudniej zablokować połączenia do sieci Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Możesz wybrać dostępny zestaw mostków, albo możesz uzyskać i wprowadzić niestandardowy zestaw mostów."> -  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "(opcjonalnie)"> -<!ENTITY torsettings.useProxy.checkbox "Ten komputer musi używać lokalnego proxy w celu połączenia się z Internetem"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> -<!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor"> -<!ENTITY torsettings.useBridges.default "Połącz z dostępnymi mostami."> -<!ENTITY torsettings.useBridges.note "Każdy rodzaj mostu używa innej metody, aby uniknąć cenzury..  Jeśli jeden most nie działa, spróbuj użyć innego."> -<!ENTITY torsettings.useBridges.type "Typ Transportu:"> -<!ENTITY torsettings.useBridges.custom "Wprowadź własne mosty"> -<!ENTITY torsettings.useBridges.label "Dodaj jeden lub więcej przekaźników mostowych (jeden w każdej linijce)"> -<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> -<!ENTITY torsettings.bridgeHelp1 "Jeśli nie jesteś w stanie połączyć się z siecią Tor, może to oznaczać, że Twój Dostawca Usług Internetowych (ISP) lub inna agencja blokuje dostęp do sieci Tor.  Często można obejść ten problem używając Mostów Tor, które są nienotowanymi przekaźnikami, dzięki czemu trudniej je zablokować."> -<!ENTITY torsettings.bridgeHelp1B "Możesz użyć prekonfigurowanego, dostarczonego zestawu adresów mostu(bridge adresses) lubmożesz uzyskać niestandardowe zestawy adresów, poprzzez używanie jednej z tych trzech metod:"> -<!ENTITY torsettings.bridgeHelp2Heading "Za pośrednictwem sieci Web"> -<!ENTITY torsettings.bridgeHelp2 "Użyj przeglądarki internetowej do odwiedzenia https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Wyślij e-maila na adres bridges(a)torproject.org pisząc w treści emaila 'get bridges'.  Jednak, aby utrudnić napastnikom naukę o adresach mostków, należy wysłać tego emaila używając jednego z wymienionych dostawców usługi email (dostawcy wymienieni są w kolejności preferencji):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, lub https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "W ostateczności, można zażądać adresów mostów, wysyłając uprzejmą wiadomość e-mail do help(a)rt.torproject.org.  Należy pamiętać, że osoba będzie musiała odpowiedzieć na każde żądanie."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index d3831a1..e09b3ec 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (brid torlauncher.error_default_bridges_type_missing=Musisz wybrać rodzaj transportu dla dostępnych mostów. torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które mają typ transportu %S. Proszę zmienić swoje ustawienia. -torlauncher.recommended_bridge=(zalecane) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Połącz torlauncher.restart_tor=Zrestartuj Tora diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/pms/torlauncher.properties +++ b/src/chrome/locale/pms/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ps/torlauncher.properties +++ b/src/chrome/locale/ps/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 7bbaedc..4338412 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Idioma do navegador Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Antes de se conectar à rede Tor, você deve fornecer informações sobre a conexão a Internet desse computador."> - -<!ENTITY torSettings.yes "Sim"> -<!ENTITY torSettings.no "Não"> - -<!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "A conexão à Internet deste computador foi censurada, filtrada ou limitada por um proxy."> -<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definições de conexão de ponte ou proxy local antes de conectar à rede Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Eu gostaria de fazer uma conexão direta com a rede Tor."> -<!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> <!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyPageTitle "Configuração de Proxy Local"> -<!ENTITY torSettings.proxyQuestion "Este computador necessita de um proxy local para acessar a Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos, um proxy local não é necessário, mas é requerido quando estiver conectando através de uma rede de empresa, escola ou universidade."> -<!ENTITY torSettings.proxyExplanation2 "Se você não tem certeza de como responder essa questão, procure nas configurações de Internet de outro navegador ou verifique as configurações de rede do seu sistema para ver se um proxy local é necessário."> -<!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> -<!ENTITY torSettings.bridgePageTitle "Configuração de Pontes Tor"> -<!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Se você não tem certeza de como responder essa questão, escolha Não (se você não conseguir conectar à rede Tor sem uma conexão de ponte, você pode adicionar uma mais tarde)."> -<!ENTITY torSettings.bridgeExplanation2 "Ao escolher Sim, o próximo passo a seguir será configurar Tor Bridges, que são transmissores não listados que dificultam o bloqueio de conexões à rede Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. "> -  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Este computador necessita de um proxy local para acessar a Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Endereço:"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou Servidor"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> -<!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> -<!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Cada tipo de conexão de ponte usa um método diferente para evitar censura.  Se uma não funcionar, tente novamente usando uma diferente."> -<!ENTITY torsettings.useBridges.type "Tipo de transporte:"> -<!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas"> -<!ENTITY torsettings.useBridges.label "Inserir um ou mais retransmissores de pontes (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "tipo de endereço:porta"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copiar o registro do Tor na área de transferência"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Se for impossível conectar-se à rede Tor, talvez o seu Provedor de Internet (ISP) ou outra instância esteja bloqueando o Tor. . Normalmente, é possível contornar esse problema utilizando Pontes Tor, que são retransmissores não listados, mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "Você pode usar o conjunto de endereços de pontes fornecido, já pré-configurado, ou pode obter um conjunto de endereços personalizados utilizando um dos métodos indicados abaixo:"> -<!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> -<!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Por meio da resposta automárica do e-mail"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar um e-mail para bridges(a)torproject.org com a mensagem 'get bridges'.  Contudo, para tornar mais difícil a um invasor descobrir uma grande quantidade de endereços, você deve enviar esse pedido a partir de um dos seguintes provedores de e-mail (listados em ordem de preferência)."> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Pelo Serviço de Assistência"> -<!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org.  Por favor, entenda que uma pessoa terá que responder a cada solicitação"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 20cb37a..5777e48 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. -torlauncher.recommended_bridge=(recomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar o Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 4250124..554dc90 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor, precisa de fornecer informação sobre a ligação deste computador à Internet."> - -<!ENTITY torSettings.yes "Sim"> -<!ENTITY torSettings.no "Não"> - -<!ENTITY torSettings.firstQuestion "Qual das seguintes frases descreve melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet deste computador está censurada ou é efetuada via proxy."> -<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar a ponte ou as definições do proxy local antes de ligar à rede Tor ."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Eu gostaria de efetuar uma ligação direta à rede Tor."> -<!ENTITY torSettings.connectPrompt3 "Isto irá funcionar na maioria das situações."> <!ENTITY torSettings.connect "Ligar"> -<!ENTITY torSettings.proxyPageTitle "Configuração do Proxy Local"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos não é necessário um proxy local, mas este poderá ser necessário quando ligar através da rede de uma empresa, escola ou universidade."> -<!ENTITY torSettings.proxyExplanation2 "Se não tem a certeza de como responder a esta pergunta, consulte as definições da Internet noutro navegador ou verifique as definições da rede do seu sistema para verificar se é necessário ou não um proxy local."> -<!ENTITY torSettings.enterProxy "Insira as definições do proxy."> -<!ENTITY torSettings.bridgePageTitle "Configuração das Pontes Tor"> -<!ENTITY torSettings.bridgeQuestion "O seu Provedor de Serviços da Internet (ISP) bloqueia ou então censura as ligações à Rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Se não tem a certeza sobre como responder a esta pergunta, escolha Não (se não consegue ligar-se à rede Tor sem uma ponte, pode adicionar uma mais tarde)."> -<!ENTITY torSettings.bridgeExplanation2 "Se escolher 'Sim', ser-lhe-á pedido para configurar as Pontes do Tor, que são retransmissões não listadas o que torna mais difícil o bloqueio das ligações à Rede Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Poderá utilizar o conjunto de pontes fornecido ou poderá obter um conjunto de pontes personalizadas."> -  <!ENTITY torsettings.startingTor "A aguardar que o Tor inicie..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de utilizar um proxy local para aceder à Internet."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Endereço:"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> -<!ENTITY torsettings.useBridges.checkbox "O meu Provedor de Serviço da Internet (ISP) bloqueia as ligações à rede Tor"> -<!ENTITY torsettings.useBridges.default "Ligar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Cada tipo de ponte utiliza um método diferente para evitar a censura.  Se uma ponte não funcionar, tente novamente utilizando uma diferente."> -<!ENTITY torsettings.useBridges.type "Tipo de transporte:"> -<!ENTITY torsettings.useBridges.custom "Insira as pontes personalizadas"> -<!ENTITY torsettings.useBridges.label "Insira uma ou mais retransmissões de ponte (uma por linha)."> -<!ENTITY torsettings.useBridges.placeholder "digite endereço:porta"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu Provedor de Serviço de Internet (ISP) ou outra agência está a bloquear o Tor.  Frequentemente, pode contornar este problema utilizando Tor Bridges, o qual são pontos de passagem não listados que são mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "Poderá utilizar o conjunto de pontes pré-configurado fornecido ou poderá obter um conjunto de endereços personalizados, utilizando um deste métodos:"> -<!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> -<!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático de Correio Eletrónico"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie uma mensagem para bridges(a)torproject.org com a linha 'get bridges' no corpo da mensagem.  Contudo, para tornar mais difícil para um atacante aprender sobre os endereços de pontes, deve enviar este pedido a partir dos seguintes provedores de serviços de correio eletrónico (listados pela ordem de preferência):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> -<!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help(a)rt.torproject.org.  Por favor, note que uma pessoa irá precisar de responder a cada pedido."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index bd6085d..e03a55a 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de transporte para as pontes fornecidas torlauncher.error_bridge_bad_default_type=Não estão disponíveis as pontes fornecidas que têm o tipo de transporte %S. Por favor, ajuste as suas configurações. -torlauncher.recommended_bridge=(recomendado) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Ligar torlauncher.restart_tor=Reiniciar o Tor diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index c99dc80..ae2f66f 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Setări rețea Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Limba pentru Tor Browser"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Înainte de a vă conecta la rețeaua Tor, trebuie să oferiți informații despre conexiunea acestui computer la Internet."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Nu"> - -<!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> -<!ENTITY torSettings.configurePrompt1 "Această conexiune la internet a computerului este cenzurată sau prin proxy."> -<!ENTITY torSettings.configurePrompt2 "Trebuie să configurez setările bridge sau proxy locale înainte de conectarea la rețeaua Tor "> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configuraţi "> -<!ENTITY torSettings.connectPrompt2 "Aș dori o conexiune directă la rețeaua Tor."> -<!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> <!ENTITY torSettings.connect "Conectare"> -<!ENTITY torSettings.proxyPageTitle "Configurare Proxy local"> -<!ENTITY torSettings.proxyQuestion "Are nevoie acest computer să utilizeze un proxy local pentru accesarea internetului?"> - -<!ENTITY torSettings.proxyExplanation1 "În cele mai multe cazuri un proxy local nu este necesar dar poate fi necesară atunci când conectarea se face printr-o rețea a unei firme, școli sau universități."> -<!ENTITY torSettings.proxyExplanation2 "Dacă nu sunteți sigur cum să răspundeți la această întrebare uitași-vă la setările de internet în alt browser sau verificați setările de rețea ale sistemului dvs. pentru a vedea dacă este nevoie de un proxy local."> -<!ENTITY torSettings.enterProxy "Introduceţi setările pentru proxy ."> -<!ENTITY torSettings.bridgePageTitle "Configurare Punți Tor "> -<!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Dacă nu sunteți sigur cum să răspundeți la această întrebare, alegeți Nu (dacă nu vă puteți conecta la rețeaua Tor fără un bridge, puteți adăuga unul mai târziu)."> -<!ENTITY torSettings.bridgeExplanation2 "Dacă alegeți Da vi se va cere să configurați Tor Bridges, care sunt relee nelistate ce fac mai dificilă blocarea conexiunilor la Rețeaua Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Puteți folosi setul de punți oferit sau puteți obține și introduce un set particular de punți."> -  <!ENTITY torsettings.startingTor "Aștept Tor să pornească..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opțional"> -<!ENTITY torsettings.useProxy.checkbox "Acest computer are nevoie să utilizeze un proxy local pentru accesarea internetului."> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Tip proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresă:"> <!ENTITY torsettings.useProxy.address.placeholder "Adresă IP sau hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Acest computer iese printr-un firewall care permite doar conexiuni către anumite porturi"> <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> -<!ENTITY torsettings.useBridges.checkbox "Internet Service Providerul (ISP) meu blochează conexiunile către rețeaua Tor"> -<!ENTITY torsettings.useBridges.default "Conectați-vă punțile oferite"> -<!ENTITY torsettings.useBridges.note "Fiecare tip de bridge folosește o metodă diferită de a evita cenzura.  Dacă un bridge nu funcționează, încercați să folosiți unul diferit."> -<!ENTITY torsettings.useBridges.type "Tip de transport:"> -<!ENTITY torsettings.useBridges.custom "Introduceți punți personalizate"> -<!ENTITY torsettings.useBridges.label "Introduceți una sau mai multe bridge relays (una pe linie)."> -<!ENTITY torsettings.useBridges.placeholder "scrieți adresă:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copiați jurnalul Tor în Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Ajutor Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "Dacă nu puteți să vă conectați la rețeaua tor, poate să fie din cauză că Internet Service Providerul (ISP) sau altă agenție blochează Tor.  Des, puteți ocoli această problemă folosind Tor Bridges, care sînt relayuri nelistate, mai dificil de blocat."> -<!ENTITY torsettings.bridgeHelp1B "Puteți folosi setul de adrese de punți preconfigurate oferite sau puteți obține un set personalizat de adrese folosind una din aceste metode:"> -<!ENTITY torsettings.bridgeHelp2Heading "Prin Web"> -<!ENTITY torsettings.bridgeHelp2 "Folosiți un webbrowser pentru a vizita https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Prin email automat"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Trimiteți email la bridges(a)torproject.org cu linia 'get bridges' inclusă în contextul message.  Totuși, pentru a face dificil unui atacator să învețe cât mai multe adrese de punți, trebuie să trimiteți această cerere de la unul dintre următorii furnizori de servicii email (listați în ordinea preferinței):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index a02bfd5..f02d004 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri. torlauncher.error_default_bridges_type_missing=Trebuie să alegeți un tip de transport pentru punțile oferite torlauncher.error_bridge_bad_default_type=Nici una din punțile oferite care să ofere transport tip %S este disponibilă. Ajutați setările. -torlauncher.recommended_bridge=(recomandat) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Conectare torlauncher.restart_tor=Repornește Tor diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 20117a1..335655a 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Настройки сети Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Язык браузера Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Прежде чем вы подключитесь к сети Tor, вам нужно указать информацию об интернет-соединении этого компьютера."> - -<!ENTITY torSettings.yes "Да"> -<!ENTITY torSettings.no "Нет"> - -<!ENTITY torSettings.firstQuestion "Что лучше описывает вашу ситуацию?"> -<!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется или включает прокси-сервер."> -<!ENTITY torSettings.configurePrompt2 "Необходимо настроить параметры моста или локальный прокси-сервер, прежде чем подключаться к сети Tor. "> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Настроить"> -<!ENTITY torSettings.connectPrompt2 "Я хочу напрямую подключиться к сети Tor."> -<!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> <!ENTITY torSettings.connect "Соединиться"> -<!ENTITY torSettings.proxyPageTitle "Настройки локального прокси-сервера"> -<!ENTITY torSettings.proxyQuestion "Требуется ли этому компьютеру локальный прокси-сервер для доступа к Интернету?"> - -<!ENTITY torSettings.proxyExplanation1 "В большинстве случаев локальный прокси-сервер не нужен, но он может потребоваться при подключении через сеть компании, школы или университета."> -<!ENTITY torSettings.proxyExplanation2 "Если вы не знаете, как ответить на этот вопрос, проверьте настройки интернета другого браузера или проверьте системные настройки своей сети, чтобы посмотреть, нужен ли локальный прокси."> -<!ENTITY torSettings.enterProxy "Введите настройки прокси-сервера."> -<!ENTITY torSettings.bridgePageTitle "Настройки шлюзов Tor"> -<!ENTITY torSettings.bridgeQuestion "Ваш провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Если вы не знаете, как ответить на данный вопрос, выберите "Нет" (если вы не можете подключиться к сети Tor, вы можете ответить позже)."> -<!ENTITY torSettings.bridgeExplanation2 "Если вы выберете "Да", Вам будет предложено настроить Tor мосты, что усложняет блокировку подключения к сети Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Вы можете использовать предопределенный набор мостов или получить и ввести список мостов вручную."> -  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Необязательно"> -<!ENTITY torsettings.useProxy.checkbox "Этому компьютеру нужен локальный прокси для доступа в Интернет"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Тип Прокси:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или имя узла"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам"> <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> -<!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> -<!ENTITY torsettings.useBridges.default "Подключиться к предопределенным мостам"> -<!ENTITY torsettings.useBridges.note "Каждый тип моста использует различные способы избежания цензуры.  Если мост не работает, попробуйте еще раз, используя другой."> -<!ENTITY torsettings.useBridges.type "Тип транспорта:"> -<!ENTITY torsettings.useBridges.custom "Ввести мосты вручную"> -<!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)"> -<!ENTITY torsettings.useBridges.placeholder "введите адрес:порт"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> -<!ENTITY torsettings.bridgeHelp1 "Если вы не можете подключиться к сети Tor, возможно ваш провайдер (ISP) или иная организация блокирует Tor.  Часто эту проблему можно обойти при помощи мостов Tor, не перечисленных в публичных списках, которые сложнее заблокировать."> -<!ENTITY torsettings.bridgeHelp1B "Вы можете воспользоваться готовым сконфигурированным набором адресов мостов, либо получить пользовательский список адресов с помощью одного из следующих методов:"> -<!ENTITY torsettings.bridgeHelp2Heading "В Интернете"> -<!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Отправьте имейл по адресу bridges(a)torproject.org со строкой 'get bridges' в теле сообщения.  Однако чтобы усложнить сбор атакующими адресов всех мостов, от Вас требуется отправить запрос с одного из следующих адресов (в порядке предпочтения)"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> -<!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.  Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 442f81b..39defe1 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Необходимо указать один torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. -torlauncher.recommended_bridge=(рекомендуемый) +torlauncher.bridge_suffix.meek-amazon=(работает в Китае) +torlauncher.bridge_suffix.meek-azure=(работает в Китае) torlauncher.connect=Соединиться torlauncher.restart_tor=Перезапустить Tor diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index adaa33f..bf9aca6 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Да"> -<!ENTITY torSettings.no "Нет"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties index c61eb30..b09753e 100644 --- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties +++ b/src/chrome/locale/ru(a)petr1708/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(рекомендуется) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties index 7c0e797..b09753e 100644 --- a/src/chrome/locale/sco/torlauncher.properties +++ b/src/chrome/locale/sco/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommendit) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index eca83b0..ef72a6a 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "TOR ජාල සිටුවම්"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "ඔව්"> -<!ENTITY torSettings.no "නැත"> - -<!ENTITY torSettings.firstQuestion "පහත සදහන් කුමක් ඔබගේ තත්ත්වය හොදින්ම විස්තර කරයිද?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "වින්‍යාස කරන්න"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "සම්බන්ධ වෙන්න"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "නියුතු සේවාදායක සැකසුම් ඇතුළත් කරන්න"> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "TOR ආරම්භ වනතුරු …"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "අමතර"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "නියුතු සේවාදායක වර්ගය:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "ලිපිනය:"> <!ENTITY torsettings.useProxy.address.placeholder "IP ලිපිනය හෝ සත්කාරක නාමය"> <!ENTITY torsettings.useProxy.port "පොර්ටය:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "මෙම පරිගණකය විශේෂිත ports සදහා සම්බන්ධ වීමට ඉඩදෙන පරිදි firewall එකක් හරහා ගමන් කරයි."> <!ENTITY torsettings.firewall.allowedPorts "අනුමත Ports"> -<!ENTITY torsettings.useBridges.checkbox "මාගේ අන්තර්ජාල සේවා සපයන්නා(ISP) විසින් TOR ජාලය සදහා සබදතාවය අවහිර කර ඇත."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Clipboard එකට Tor ලොගය පිටපත් කරන්න."> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "සේතු ප්‍රතියෝජක (Bridge Relay) උපකාරකය"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties index 74f9648..54597d5 100644 --- a/src/chrome/locale/si-LK/torlauncher.properties +++ b/src/chrome/locale/si-LK/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=ඔබ විසින් සේතු එක torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(නිර්දේශිත) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=සම්බන්ධ වෙන්න torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index f6c15c9..a56c632 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Nastavenia Tor Network"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Jazyk Tor Browser"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Pred tým, než sa pripojíte k sieti Tor, je potrebné poskytnúť informácie o pripojení tohto počítača na Internet."> - -<!ENTITY torSettings.yes "Áno"> -<!ENTITY torSettings.no "Nie"> - -<!ENTITY torSettings.firstQuestion "Ktorá z nasledujúcich situácií najlepšie popisuje vašu?"> -<!ENTITY torSettings.configurePrompt1 "Pripojenie tohto počítača je cenzurované, filtrované alebo vedené cez proxy."> -<!ENTITY torSettings.configurePrompt2 "Musím nastaviť premostenie alebo miestne proxy nastavenie pred pripojením do Tor siete."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurovať"> -<!ENTITY torSettings.connectPrompt2 "Rád by som sa pripojil priamo do siete Tor."> -<!ENTITY torSettings.connectPrompt3 "Toto by vo väčšine prípadov malo fungovať."> <!ENTITY torSettings.connect "Pripojiť"> -<!ENTITY torSettings.proxyPageTitle "Miestne proxy nastavenia"> -<!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač použiť proxy pre prístup na internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Vo väčšine prípadov nie je lokálne proxy potrebné, ale môže byť vyžadované pri pripájaní sa cez firemnú, školskú alebo univerzitnú sieť."> -<!ENTITY torSettings.proxyExplanation2 "Ak si nie ste istý ako zodpovedať túto otázky, pozrite si nastavenia internetu v inom prehliadači, alebo skontrolujte Vaše systémové sieťové nastavenia, či je miestne proxy potrebné."> -<!ENTITY torSettings.enterProxy "Zadajte nastavenia proxy."> -<!ENTITY torSettings.bridgePageTitle "Konfigurácia premostenia Tor"> -<!ENTITY torSettings.bridgeQuestion "Blokuje váš poskytovateľ internetového pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "Ak si nie ste istý ako zodpovedať túto otázku, zvoľte Nie (ak sa nedokážete pripojiť k sieti Tor bez premostenia, môžete ho pridať neskôr)."> -<!ENTITY torSettings.bridgeExplanation2 "Ak zvolíte Áno, budete vyzvaný na nastavenie Tor premostení. Premostenia sú v zozname neuvedené prenosy, ktoré sťažujú blokovanie pripojení do siete Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Môžete použiť dodanú sadu premostení alebo si môžete zaobstarať a zadať vlastnú sadu premostení."> -  <!ENTITY torsettings.startingTor "Čakanie na štart Toru..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje pre prístup na Internet použiť proxy"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor"> -<!ENTITY torsettings.useBridges.default "Pripojiť sa cez dodané premostenia"> -<!ENTITY torsettings.useBridges.note "Každý typ premostení používa inú metódu na vyhýbanie sa cenzúre.  Ak jedno premostenie nefunguje, skúste iné."> -<!ENTITY torsettings.useBridges.type "Typ transportu:"> -<!ENTITY torsettings.useBridges.custom "Zadajte vlastné premostenia"> -<!ENTITY torsettings.useBridges.label "Zadaj jedno alebo viac premostení relé (jedno na riadok)."> -<!ENTITY torsettings.useBridges.placeholder "Typ adresy:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopírovať log Toru do schránky"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Pomocník pre premostenia relé"> -<!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopní sa pripojiť do siete Tor, je možné, že váš poskytovateľ internetového pripojenia (ISP) alebo iný správny orgán blokuje Tor.  Väčšinou je možné tento problém obísť použitím Tor Bridges, čo sú nikde nezapísané relé, ktoré je obtiažne blokovať."> -<!ENTITY torsettings.bridgeHelp1B "Môžete použiť prednastavené, vopred poskytnuté adresy premostení alebo môžete získať vlastný set adries použitím jednej z nasledujúcich metód:"> -<!ENTITY torsettings.bridgeHelp2Heading "Prostredníctvom internetu"> -<!ENTITY torsettings.bridgeHelp2 "Navštívte https://bridges.torproject.org pomocou webového prehliadača"> -<!ENTITY torsettings.bridgeHelp3Heading "Cez automatickú emailovú odpoveď"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošlite email na bridges(a)torproject.org len s textom 'get bridges' v tele správy.  Bohužiaľ, aby sa zabránilo útočníkom získať množstvo adries premostení, musíte požiadavku poslať z emailu nasledovných poskytovateľov (zoradené podľa preferencií): "> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Prostredníctvom Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help(a)rt.torproject.org a požiadať o adresy premostenia.  Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties index f0e48e5..3717b5c 100644 --- a/src/chrome/locale/sk-SK/torlauncher.properties +++ b/src/chrome/locale/sk-SK/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Musíte špecifikovať jedno alebo viac premos torlauncher.error_default_bridges_type_missing=Musíte vybrať typ transportu pre získanie premostení. torlauncher.error_bridge_bad_default_type=Nie sú k dispozícii žiadne premostenia s typom transportu %S. Prosím upravte nastavenia. -torlauncher.recommended_bridge=(odporúčané) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Pripojiť torlauncher.restart_tor=Reštartovať Tor diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index 17e8026..f73572f 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Sieťové Nastavenia Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Jazyk Prehliadača Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Predtým než sa pripojíte k sieti Toru, potrebujete poskytnúť informácie o pripojení tohto počítača k Internetu."> - -<!ENTITY torSettings.yes "Áno"> -<!ENTITY torSettings.no "Nie"> - -<!ENTITY torSettings.firstQuestion "Ktoré z nasledujúcich možností najlepšie opisuje Vašu situáciu?"> -<!ENTITY torSettings.configurePrompt1 "Pripojenie tohto počítača k Internetu je cenzurované, filtrované alebo sprostredkovávané."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurácia"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Toto bude vo väčšine prípadov fungovať."> <!ENTITY torSettings.connect "Pripojiť"> -<!ENTITY torSettings.proxyPageTitle "Lokálne proxy nastavenie"> -<!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač používať lokálne proxy k prístupu na internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Vstúpiť do nastavení proxy."> -<!ENTITY torSettings.bridgePageTitle "Nastavenie Tor premostení"> -<!ENTITY torSettings.bridgeQuestion "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Môžete použiť poskytnutú sadu mostov alebo získať a vložiť vlastnú sadu."> -  <!ENTITY torsettings.startingTor "Čakám kým sa Tor spustí..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje použivať lokálne proxy k prístupu na internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač ide cez firewall, ktorý povoľuje iba niektoré porty"> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Môj Internetový provider (ISP) blokuje pripojenia do siete Toru"> -<!ENTITY torsettings.useBridges.default "Pripojiť sa s poskytnutými mostami"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Prepravný typ:"> -<!ENTITY torsettings.useBridges.custom "Vložiť vlastné mosty"> -<!ENTITY torsettings.useBridges.label "Vložte jedno alebo viacero relé premostení (každé do nového riadka)."> -<!ENTITY torsettings.useBridges.placeholder "zadajte adresu:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Skopírovať záznam Tor do schránky clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Nápoveda o relé premosteniach"> -<!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopný sa pripojiť k sieti Toru, je možné, že vás blokuje váš Poskytovateľ Internetú (ISP) alebo nejaké iná agentúra.   Tento problém môžete často obísť použivaním Mostov Toru, čo sú nezaradené relé náročnejšie na blokovanie."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Cez Web"> -<!ENTITY torsettings.bridgeHelp2 "Použite webový prehliadač na navštívenie https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Cez Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošlite email na adresu bridges(a)torproject.org obsahujúcu jeden riadok 'get bridges' ako telo správy.  Avšak, aby bolo pre útočníkov náročnejšie odhaliť veľa mostových adries, musíte túto žiadosť poslať z adresy z jedných týchto poskytovateľov (zoradené podľa obľúbenosti ):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, alebo https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Cez Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Ako poslednú možnosť si môžete vyžiadať adresy mostov zaslaním zdvorilého emailu na adresu help(a)rt.torproject.org.  Prosíme berte na vedomie, že príslušná osoba musí odpovedať na každú jednu podobnú žiadosť."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index 912b1c8..43e28a7 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Musíte špecifikovať jeden alebo viac mostov torlauncher.error_default_bridges_type_missing=Musíte zvoliť prepravný typ pre poskytnuté mosty. torlauncher.error_bridge_bad_default_type=Žiadne poskytnuté mosty nemajú dostupný prepravný typ %S. Prosíme upravte svoje nastavenia. -torlauncher.recommended_bridge=(odporúčané) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Pripojiť torlauncher.restart_tor=Reštartujte Tor diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 5ba1f32..41b7063 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor mrežne nastavitve"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Preden se povežete na Tor omrežje, si morate priskrbeti informacije o tej računalniški internet povezavi."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Kaj od sledečega najbolj ustzrezno opisuje vašo situacijo?"> -<!ENTITY torSettings.configurePrompt1 "Ta računalniška internet povezava je cenzurirana ali neposredna."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Oblikovanje"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "To deluje v večini primerov."> <!ENTITY torSettings.connect "Povezava"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Vnesite nastavitve strežnika proxy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Ali vaš internetni ponudnik (ISP) blokira ali kako drugače cenzurira povezavo na Tor omrežje?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Lahko uporabite pripravljene nastavitve povezav ali pridobite in vnesete običajne nastavitve povezav."> -  <!ENTITY torsettings.startingTor "Čakanje na zagon Tor-a..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Po izbiri"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy tip:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Naslov:"> <!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene"> <!ENTITY torsettings.useProxy.port "Vhod:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata"> <!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:"> -<!ENTITY torsettings.useBridges.checkbox "Moj internetni ponudnik (ISP) blokira povezave na Tor omrežje"> -<!ENTITY torsettings.useBridges.default "Povezava z ponujeno premostitvijo"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Tip prometa:"> -<!ENTITY torsettings.useBridges.custom "Vnesite običajne premostitve"> -<!ENTITY torsettings.useBridges.label "Vnesite enega ali več premostitvenih vozlišč (vsakega v svojo vrsto)"> -<!ENTITY torsettings.useBridges.placeholder "vpišite naslov:vrata"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopirajte Tor poročilo v odložišče"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Pomoč premostitveno vozlišče"> -<!ENTITY torsettings.bridgeHelp1 "Če se ne morete povezati v omrežje Tor, je mogoče, da vaš ponudnik internetnih storitev (ISP) ali druga agencija blokira Tor.  Pogosto lahko to obidete s pomočjo Tor premostitvijo, na nenašteta vozlišča, za težje blokiranje."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Preko Web"> -<!ENTITY torsettings.bridgeHelp2 "Uporabite web brskalnik za obisk https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Preko poštnega avtomatskega odzivnika"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošljite e-pošto na bridges(a)torproject.org z vrstico 'get bridges' v sporočilu. Vendar pa, da otežite napadalcu učenje o vozliščnih naslovih, morate poslati ta zahtevek iz enega od naslednjih ponudnikov e-pošte (navedene po prednostnem vrstnem redu):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Preko table Pomoči"> -<!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s pošiljanjem olikanega e-sporočila na help(a)rt.torproject.org.  Prosimo, upoštevajte, da dotična oseba odgovarja na vsako zahtevo."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index ac4791e..9c39f0c 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Določiti morate enega ali več mostičkov. torlauncher.error_default_bridges_type_missing=Izbrati morate tip prometa za ponujene premostitve. torlauncher.error_bridge_bad_default_type=Nobenih ponujenih premostitev, ki imajo tip transporta% S ni na voljo. Prosimo, da prilagodite nastavitve. -torlauncher.recommended_bridge=(priporočljivo) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Povezava torlauncher.restart_tor=Ponovno zaženite Tor diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index c89784c..919f708 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Poveži"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "vrata:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index 44f6757..479edc8 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Morate določiti vsaj en ali več mostov. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(priporočeno) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Poveži torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties index 71e2c63..7eac413 100644 --- a/src/chrome/locale/sn/torlauncher.properties +++ b/src/chrome/locale/sn/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/so/torlauncher.properties +++ b/src/chrome/locale/so/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/son/torlauncher.properties +++ b/src/chrome/locale/son/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd index 9c78c3c..75ece3b 100644 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ b/src/chrome/locale/sq-AL/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index c0fd25a..cba8ae5 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit të Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Gjuha e Tor Browser"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Përpara se të lidheni me rrjetin e Tor, ju nevojitet të ofroni informacion rreth lidhjes së Internetit të këtij kompjuteri."> - -<!ENTITY torSettings.yes "Po"> -<!ENTITY torSettings.no "Jo"> - -<!ENTITY torSettings.firstQuestion "Cila nga këto e përshkruan më mirë situatën tuaj të tanishme?"> -<!ENTITY torSettings.configurePrompt1 "Lidhja e Internetit të këtij kompjuteri është e censuruar ose me proxy"> -<!ENTITY torSettings.configurePrompt2 "Më duhet të konfigurojë urën ose proxy-n lokal, përpara se të lidhem tek rrjeti Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguroni"> -<!ENTITY torSettings.connectPrompt2 "Do pëlqeja të bëja një lidhje të drejtpërdrejtë tek rrjeti i Tor."> -<!ENTITY torSettings.connectPrompt3 "Kjo do të funksionojë në shumë situata."> <!ENTITY torSettings.connect "Lidhuni"> -<!ENTITY torSettings.proxyPageTitle "Konfigurimi i Proxy-t Lokal "> -<!ENTITY torSettings.proxyQuestion "A i nevojitet këtij kompjuteri që të përdorë një proxy lokal, për t'u qasur në Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Në shumë raste, një proxy lokal nuk nevojitet, por ai mund të kërkohet kur lidhesh përmes një rrejti kompanie, shkolle, ose universiteti."> -<!ENTITY torSettings.proxyExplanation2 "Nëse s'jeni i sigurt sesi t'i përgjigjeni kësaj pyetje, shikoni tek konfigurimi i Internetit në një tjetër shfletues, ose kontrolloni konfigurimin e rrjetit, për të parë nëse nevojitet një proxy lokal."> -<!ENTITY torSettings.enterProxy "Futni konfigurimin e proxy-t."> -<!ENTITY torSettings.bridgePageTitle "Konfigurimi i Urave të Tor"> -<!ENTITY torSettings.bridgeQuestion "A i pengon ose censuron lidhjet për tek Rrjeti Tor, Ofruesi juaj i Shërbimit Internet (ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "Nëse s'jeni i sigurt sesi t'i përgjigjeni kësaj pyetje, zgjidhni "Jo" (nëse e keni të pamundur që të lidheni me rrjetin Tor pa pasur një urë, mund ta shtoni një më vonë)."> -<!ENTITY torSettings.bridgeExplanation2 "Nëse përzgjidhni "Po", do t'ju kërkohet të konfiguroni Tor bridges, të cilat janë rele të palistuara, që e bëjnë më të vështirë pengimin e lidhjeve për tek Rrjeti Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Ju mund të përdorni grupin e dhënë të urave, ose mund të përftoni dhe futni një sasi të personalizuar urash."> -  <!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Me zgjedhje"> -<!ENTITY torsettings.useProxy.checkbox "Ky kompjuter nevojitet që të përdorë një proxy lokal, që të ketë qasje në Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Lloji i Proxy-t:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritësit"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta."> <!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara:"> -<!ENTITY torsettings.useBridges.checkbox "Ofruesi im i Shërbimit të Internetit (ISP) pengon lidhjet drejt rrjetit Tor"> -<!ENTITY torsettings.useBridges.default "Lidhuni me urat e ofruara"> -<!ENTITY torsettings.useBridges.note "Çdo lloj ure përdor një mënyrë të ndryshme për të shmangur censurën.  Nëse njëra urë nuk punon, provoni sërish duke përdorur një tjetër."> -<!ENTITY torsettings.useBridges.type "Lloji i Transportit:"> -<!ENTITY torsettings.useBridges.custom "Futini urat e përshtatura"> -<!ENTITY torsettings.useBridges.label "Futni një ose më shumë rele urë (një për rresht)"> -<!ENTITY torsettings.useBridges.placeholder "lloji i adresës:portë"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopjojeni Regjistrin e Tor në Kujtesën e fragmenteve"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Ndihma mbi Relenë e Urë"> -<!ENTITY torsettings.bridgeHelp1 "Nëse s'mundeni të lidheni me rrjetin Tor, mund të jetë sepse Ofruesi juaj i Shërbimit të Internetit (ISP), ose ndonjë agjenci tjetër po pengojnë Tor.  Shpesh, ju mund ta shmangni këtë problem, duke përdorur urat e Tor, të cilat janë rele të palistuara, që janë shumë më të vështira për t'u penguar."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Përmes Web-it"> -<!ENTITY torsettings.bridgeHelp2 "Përdorni një shfletues web-i që të vizitoni https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Përmes Vetëpërgjigjes se E-postës"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Dërgoni e-postë tek bridges(a)torproject.org me reshtin 'get bridges' të veçuar në trupin e mesazhit.  Megjithatë, për ta bërë më të vështirë që një sulmues të mësojë shumë adresa ura, ju duhet ta dërgoni këtë kërkesë nga njëri prej ofruesve të e-postës (listuar sipas rendit të parapëlqimit):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Përmes Help Desk-ut"> -<!ENTITY torsettings.bridgeHelp4 "Si mjet të fundit, ju mund të kërkoni adresat urë, duke dërguar një mesazh e-poste me politesë tek help(a)rt.torproject.org.  Ju lutemi vini re se një person do të duhet t'i përgjigjet çdo kërkese."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index de3ce69..db86c0c 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Duhet të specifikoni një ose më shumë ura. torlauncher.error_default_bridges_type_missing=Duhet të përzgjidhni një lloj transport për urat e parashikuara torlauncher.error_bridge_bad_default_type=S'ka ura të parashikuara, që kanë transport të llojit %S, të disponueshme. Ju lutemi ndreqni parametrat tuaj. -torlauncher.recommended_bridge=(rekomandohet) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Lidhuni torlauncher.restart_tor=Riniseni Tor diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index e27b1ab..c69d297 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Подешавања Тор мреже"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Тор језик"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Пре него што се повежете на Тор мрежу, требало би да пружите информације о интернет конекцији овог рачунара."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "NE"> - -<!ENTITY torSettings.firstQuestion "Шта од понуђеног најбоље описује Вашу ситуацију?"> -<!ENTITY torSettings.configurePrompt1 "Интернет конекција овог рачунара је цензурисана или посредована."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Конфигуриши"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proksija"> -<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi kao pristup internetu?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Унесите proxy подешавања."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Да ли Ваш интернет сервис провајдер (ИСП) блокира или на неки други начин цензурише повезивање на Тор мрежу?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Можете користити понуђени сет премошћивача или можете добавити или унети жељени сет премошћивача."> -  <!ENTITY torsettings.startingTor "Чекамо да се Тор покрене..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Опционо"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Врста proxyja:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове."> <!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:"> -<!ENTITY torsettings.useBridges.checkbox "Мој интернет сервис провајдер (ИСП) блокира повезивање на Тор мрежу."> -<!ENTITY torsettings.useBridges.default "Повежите се са понуђеним премошћивачима"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Врста транспорта:"> -<!ENTITY torsettings.useBridges.custom "Унесите жељене премошћиваче"> -<!ENTITY torsettings.useBridges.label "Unesite jedan ili više releja mostova (u svakom redu po jedan)."> -<!ENTITY torsettings.useBridges.placeholder "куцајте aдреса:порт"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Кроз Мрежу"> -<!ENTITY torsettings.bridgeHelp2 "Користите веб прегледач да посетите https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index b7d9c08..1bd6677 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Morate odrediti jedan ili vise mostova torlauncher.error_default_bridges_type_missing=Морате да одаберете тип транспорта за обезбеђене мостове torlauncher.error_bridge_bad_default_type=Не постоје услови да мостови који имају тип транспорта %S буду доступни. Молимо Вас да прилагодите поставке. -torlauncher.recommended_bridge=(препоручено) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Повежи се torlauncher.restart_tor=Поново покрени Тор diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 9f1ed4a..53fe718 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Podešavanja Tor mreže"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Pre nego što se konektujete na Tor mrežu, potrebno je da pružite informacije o internet konekciji ovog kompjutera."> - -<!ENTITY torSettings.yes "Da"> -<!ENTITY torSettings.no "Ne"> - -<!ENTITY torSettings.firstQuestion "Koji od ponuđenih najbolje opisuje vašu situaciju?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfiguriši"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> <!ENTITY torSettings.connect "Povezivanje"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi za pristup internetu?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Unesite vaša proksi podešavanja."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Opciono"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS "> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi: "> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "tip adrese: port "> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index 5065021..8bfcc09 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(preporučeno) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Povezivanje torlauncher.restart_tor=Restartovanje Tor-a diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/st/torlauncher.properties +++ b/src/chrome/locale/st/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/su/torlauncher.properties +++ b/src/chrome/locale/su/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index a62de6e..6ce1473 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -53,6 +53,3 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> - - -<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 4b118b6..aaffeb3 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Nätverksinställningar för Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Innan du ansluter till Tor-nätverket så behöver du lämna information om den här datorns internetanslutning."> - -<!ENTITY torSettings.yes "Ja"> -<!ENTITY torSettings.no "Nej"> - -<!ENTITY torSettings.firstQuestion "Vilket av följande beskriver bäst din situation?"> -<!ENTITY torSettings.configurePrompt1 "Den här datorns Internetanslutning är censorerad eller går genom en proxy."> -<!ENTITY torSettings.configurePrompt2 "Jag behöver konfigurera en brygga eller inställningar för lokal proxy innan jag ansluter till Tor-nätverket."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Konfigurera"> -<!ENTITY torSettings.connectPrompt2 "Jag vill göra en direktanslutning till Tor-nätverket."> -<!ENTITY torSettings.connectPrompt3 "Detta fungerar i de flesta situationer."> <!ENTITY torSettings.connect "Anslut"> -<!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfiguration"> -<!ENTITY torSettings.proxyQuestion "Behöver den här datorn använda en lokal proxy för att ansluta till Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "I de flesta fallen behövs ingen lokal proxy, men det kan behövas om du ansluter via ett nätverk på ett företag, en skola eller ett universitet."> -<!ENTITY torSettings.proxyExplanation2 "Om du är osäker på hur du ska svara på den här frågan, titta på internetinställningarna i en annan webbläsare eller kontrollera ditt systems nätverksinställningar för att se om en lokal proxy behövs."> -<!ENTITY torSettings.enterProxy "Ange proxyinställningarna."> -<!ENTITY torSettings.bridgePageTitle "Konfiguration av Tor-bryggor"> -<!ENTITY torSettings.bridgeQuestion "Blockerar eller censurerar din internetleverantör anslutningar till Tor-nätverket?"> -<!ENTITY torSettings.bridgeExplanation1 "Om du är osäker på hur du ska besvara den här frågan, välj Nej (om du inte kan ansluta till Tor-nätverket utan en brygga så kan du lägga till en senare)."> -<!ENTITY torSettings.bridgeExplanation2 "Om du väljer Ja kommer du att tillfrågas om att konfigurera Tor-bryggor, vilka är olistade reläer som gör det svårare att blockera anslutningarna till Tor-nätverket."> -<!ENTITY torSettings.bridgeSettingsPrompt "Du kan använda de förkonfigurerade bryggorna, eller skaffa och ange bryggor själv."> -  <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Valfri"> -<!ENTITY torsettings.useProxy.checkbox "Den här datorn behöver använda en lokal proxy för att ansluta till Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Typ av proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adress:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denna dator går genom en brandvägg som bara tillåter anslutningar på vissa specifika portar."> <!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:"> -<!ENTITY torsettings.useBridges.checkbox "Min internetleverantör blockerar anslutningar till Tor-nätverket"> -<!ENTITY torsettings.useBridges.default "Anslut med tillgängliga bryggor"> -<!ENTITY torsettings.useBridges.note "Varje typ av brygga använder en egen metod för att undvika censur.  Om en brygga inte fungerar, försök igen genom att använda en annan."> -<!ENTITY torsettings.useBridges.type "Transport-typ:"> -<!ENTITY torsettings.useBridges.custom "Ange egna bryggor"> -<!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad)."> -<!ENTITY torsettings.useBridges.placeholder "typ adress:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor"> -<!ENTITY torsettings.bridgeHelp1 "Om du inte kan ansluta till Tor-nätverket är det möjligt att din internetleverantör eller annan myndighet blockerar Tor.  Ofta kan du kringgå detta problem genom att använda Tor-bryggor, vilka är olistade reläer som är mer svårblockerade."> -<!ENTITY torsettings.bridgeHelp1B "Du kan använda de förinställda adresserna till bryggor, eller hämta egna adresser genom att använda en av dessa metoder:"> -<!ENTITY torsettings.bridgeHelp2Heading "Via nätet"> -<!ENTITY torsettings.bridgeHelp2 "Använd en webbläsare för att besöka https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Skicka ett e-postmeddelande till bridges(a)torproject.org med bara "get bridges" i texten.  Men för att göra det svårare för en angripare att få tag på många adresser till bryggor så måste du skicka meddelandet från någon av följande epostleverantörer (listan är sorterad på vilka vi föredrar):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> -<!ENTITY torsettings.bridgeHelp4 "Som en sista utväg kan du skicka ett artigt e-post meddelande på engelska till help(a)rt.torproject.org, och fråga efter bryggadresser.  Tänk på att en person måste svara på varje sådan förfrågan."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 305971d..70821c1 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. -torlauncher.recommended_bridge=(rekommenderas) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Anslut torlauncher.restart_tor=Starta om Tor diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties index fe931a1..b09753e 100644 --- a/src/chrome/locale/sw/torlauncher.properties +++ b/src/chrome/locale/sw/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(imependekezwa) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/szl/torlauncher.properties +++ b/src/chrome/locale/szl/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 70a6dd5..ebfbd91 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor நெட்வொர்க் அமைப்புகள்"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "சரி"> -<!ENTITY torSettings.no "இல்லை"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "கட்டமைக்க"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "இணைக்க"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Tor தொடங்குவதற்கு காத்திருக்கிறது..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "விருப்பத்தேர்வு"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "முகவரி:"> <!ENTITY torsettings.useProxy.address.placeholder "IP முகவரி அல்லது ஹோஸ்ட்பெயர்"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog " Tor பதிவுகளை கிளிப்போர்டுக்கு நகலெடு"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index 9efb30b..368e04e 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=நீங்கள் ஒன்று அல torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=இணைக்க torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index 19661a8..240154c 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "కాదు "> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/te-IN/torlauncher.properties +++ b/src/chrome/locale/te-IN/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index 24bb4d6..04654b8 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -28,13 +28,14 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=Иҷро шуд torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index ded8092..b025dd2 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "ตั้งค่าเครือข่าย Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "ภาษาของทอร์เบราว์เซอร์"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "ใช่"> -<!ENTITY torSettings.no "ไม่"> - -<!ENTITY torSettings.firstQuestion "สิ่งต่อไปนี้อันไหนบ้างที่บรรยายลักษณะสถานการณ์ของคุณ"> -<!ENTITY torSettings.configurePrompt1 "การเชื่อมต่ออินเตอร์เน็ตของคอมพิวเตอร์เครื่องนี้ถูกตรวจสอบหรือมีการใช้พร็อกซี่"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "กำหนดค่า"> -<!ENTITY torSettings.connectPrompt2 "ฉันต้องการสร้างการเชื่อมต่อโดยตรงไปยังเครือข่ายทอร์."> -<!ENTITY torSettings.connectPrompt3 "นี่จะทำงานในสถานการณ์ส่วนใหญ่"> <!ENTITY torSettings.connect "เชื่อมต่อ"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "ใส่ค่าติดตั้งพร็อกซี"> -<!ENTITY torSettings.bridgePageTitle "การตั้งค่า Tor Bridges"> -<!ENTITY torSettings.bridgeQuestion "ผู้ให้บริการอินเตอร์เน็ต (ISP) ของคุณปิดกั้นหรือคัดกรองการเชื่อมต่อไปยังเครือข่าย Tor หรือไม่?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "รอให้ Tor เริ่มทำงาน..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "ตัวเลือก"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "ชนิดพร็อกซี:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "ที่อยู่:"> <!ENTITY torsettings.useProxy.address.placeholder "ที่อยู่ IP หรือชื่อโฮสต์"> <!ENTITY torsettings.useProxy.port "พอร์ต:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "คอมพิวเตอร์เครื่องนี้ใช้งานผ่านไฟร์วอลล์ที่ยินยอมที่จะให้เชื่อมต่อกับบางพอร์ตเท่านั้น"> <!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาต:"> -<!ENTITY torsettings.useBridges.checkbox "ผู้ให้บริการอินเทอร์เน็ต (ไอเอสพี) ของฉัน ปิดกั้นการเชื่อมต่อกับเครือข่าย Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "ใส่สะพานรีเลย์อย่างน้อยหนึ่งอัน (บรรทัดละอัน)"> -<!ENTITY torsettings.useBridges.placeholder "พิมพ์ address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "คัดลอกปูม Tor ไปที่คลิปบอร์ด"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "การช่วยเหลือรีเลย์สะพาน"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "ผ่านทางเว็บ"> -<!ENTITY torsettings.bridgeHelp2 "ใช้เว็บเบราว์เซอร์เพื่อเข้าชม https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index 4616a6d..6c13fdf 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=คุณต้องระบุสะพา torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(แนะนำ) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=เชื่อมต่อ torlauncher.restart_tor=เริ่มการทำงานของ Tor ใหม่ diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/tk/torlauncher.properties +++ b/src/chrome/locale/tk/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 1114d4a..a4bd576 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Ağı Ayarları"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Dili"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Tor ağına bağlanmadan önce, bu bilgisayarın İnternet bağlantısı hakkında bilgi vermeniz gerekiyor."> - -<!ENTITY torSettings.yes "Evet"> -<!ENTITY torSettings.no "Hayır"> - -<!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> -<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü ya da vekil sunucu arkasında."> -<!ENTITY torSettings.configurePrompt2 "Tor ağına bağlanmadan önce köprü ya da yerel vekil sunucu ayarlarını yapılandırmalıyım."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Yapılandır"> -<!ENTITY torSettings.connectPrompt2 "Tor ağı ile doğrudan bir bağlantı kurmak istiyorum."> -<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> -<!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu Ayarları"> -<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor mu?"> - -<!ENTITY torSettings.proxyExplanation1 "Çoğu durumda bir yerel vekil sunucu gerekmez. Ancak bir kurum, okul ya da üniversite ağından bağlanırken gerekli olabilir."> -<!ENTITY torSettings.proxyExplanation2 "Bu sorunun yanıtından emin değilseniz, farklı bir web tarayıcıdaki İnternet ayarlarına bakın ya da vekil sunucu kullanmanın gerekip gerekmediğini anlamak için sisteminizin ağ ayarlarına bakın."> -<!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarını girin."> -<!ENTITY torSettings.bridgePageTitle "Tor Köprüleri Ayarları"> -<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına olan bağlantıları engelliyor ya da sansürlüyor mu?"> -<!ENTITY torSettings.bridgeExplanation1 "Bu sorunun yanıtından emin değilseniz, Hayır seçin (bir köprü olmadan Tor ağına bağlanamıyorsanız, daha sonra ekleyebilirsiniz)."> -<!ENTITY torSettings.bridgeExplanation2 "Evet olarak seçerseniz, Tor Ağı bağlantılarını engellemeyi zorlaştıran listelenmemiş aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> -<!ENTITY torSettings.bridgeSettingsPrompt "Hazır köprüleri kullanabilir ya da özel köprüler edinip yazabilirsiniz."> -  <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "İsteğe bağlı"> -<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> <!ENTITY torsettings.useProxy.port "Bağlantı noktası:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu bilgisayar yalnız belirli bağlantı noktalarına bağlanmaya izin veren bir güvenlik duvarı kullanıyor"> <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> -<!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (ISS) Tor ağına olan bağlantıları engelliyor"> -<!ENTITY torsettings.useBridges.default "Hazır köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.note "Her bir köprü türünde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> -<!ENTITY torsettings.useBridges.type "Aktarım tür:"> -<!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> -<!ENTITY torsettings.useBridges.label "Bir ya da birkaç köprü aktarıcısı yazın (her satıra bir tane)."> -<!ENTITY torsettings.useBridges.placeholder "adres:bağlantı noktası şeklinde yazın"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> -<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) ya da başka bir kurum Tor 'u engelliyor olabilir. Bu sorunu çoğunlukla, engellenmesi daha zor olan listelenmeyen aktarıcılar, Tor Köprülerini kullanarak çözebilirsiniz."> -<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış hazır köprü adreslerini kullanabilir ya da şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> -<!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla"> -<!ENTITY torsettings.bridgeHelp2 "Bir web tarayıcısı kullanarak https://bridges.torproject.org adresini ziyaret edin"> -<!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanıtı yoluyla"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges(a)torproject.org adresine, ileti içeriğine yalnız 'get bridges' yazarak bir e-posta gönderin.  Bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu e-postayı aşağıdaki e-posta sağlayıcılarının birinden göndermelisiniz (yeğlenme sırasına göre listelenmiştir):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ya da https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Yardım masası yoluyla"> -<!ENTITY torsettings.bridgeHelp4 "Son yol olarak, köprü adreslerini help(a)rt.torproject.org adresine göndereceğiniz nazik bir e-posta ile isteyebilirsiniz.  Her isteği bir kişinin yanıtlayacağını unutmayın."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index e2a343d..d9bbcfc 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Hazır köprüler için bir aktarım türü seçmelisiniz. torlauncher.error_bridge_bad_default_type=Hazır köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. -torlauncher.recommended_bridge=(önerilir) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Bağlan torlauncher.restart_tor=Tor'u Yeniden Başlat diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 4ed6ade..35788dc 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Налаштування мережі Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Мова Tor Browser"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Перед тим, як підключитися до мережі Tor, необхідно надати інформацію про підключення до Інтернету Вашого комп'ютера."> - -<!ENTITY torSettings.yes "Так"> -<!ENTITY torSettings.no "Ні"> - -<!ENTITY torSettings.firstQuestion "Яке з наступних тверджень найкраще описує Вашу ситуацію?"> -<!ENTITY torSettings.configurePrompt1 "Мережеве з'єднання цього комп'ютера цензурується або йде через проксі-сервер."> -<!ENTITY torSettings.configurePrompt2 "Мені потрібно налаштувати міст або локальний проксі перед під'єданням до мережі Tor."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Налаштування"> -<!ENTITY torSettings.connectPrompt2 "Я бажаю підключитися до мережі Tor напряму."> -<!ENTITY torSettings.connectPrompt3 "Це має працювати у більшості ситуацій."> <!ENTITY torSettings.connect "З'єднатися"> -<!ENTITY torSettings.proxyPageTitle "Локальна конфігурація проксі-сервера"> -<!ENTITY torSettings.proxyQuestion "Чи потрібно цьому комп'ютеру використовувати локальний проксі для доступу в Інтернет?"> - -<!ENTITY torSettings.proxyExplanation1 "У більшості випадків локальний проксі не потрібний, але він може вимагатися при підключенні через мережу компанії, школи чи університету."> -<!ENTITY torSettings.proxyExplanation2 "Якщо Ви не впевнені, як відповісти на це запитання, подивіться налаштування Інтернету в іншому браузері або мережні налаштування Вашої системи, щоб побачити чи потрібне використання проксі."> -<!ENTITY torSettings.enterProxy "Задати параметри проксі"> -<!ENTITY torSettings.bridgePageTitle "Конфігурації Tor-мостів"> -<!ENTITY torSettings.bridgeQuestion "Ваш Інтернет-провайдер (ISP) блокує чи яким-небудь чином цензурує підключення до Tor мережі?"> -<!ENTITY torSettings.bridgeExplanation1 "Якщо Ви не впевнені, як відповісти на це запитання, виберіть Ні. (Якщо Ви не можете під'єднатися до мережі Tor без моста, його можна додати пізніше)."> -<!ENTITY torSettings.bridgeExplanation2 "Якщо Ви виберете Так, Вам буде запропоновано налаштувати мости Tor, які є приватними трансляторами, що ускладнюють блокування з'єднань з мережею Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Ви можете використати визначений перелік мостів або можете отримати і ввести набір мостів вручну."> -  <!ENTITY torsettings.startingTor "Підключення до Tor..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Додатково"> -<!ENTITY torsettings.useProxy.checkbox "Цей комп'ютер повинен використовувати локальний проксі для доступу в Інтернет"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Тип проксі:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Адреса:"> <!ENTITY torsettings.useProxy.address.placeholder "ІР адреса або ім'я хосту"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Мій брандмауер дозволяє підключення тільки до певних портів"> <!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти:"> -<!ENTITY torsettings.useBridges.checkbox "Мій провайдер блокує доступ до мережі Tor"> -<!ENTITY torsettings.useBridges.default "Підключитися з визначеними мостами"> -<!ENTITY torsettings.useBridges.note "Кожен тип мостів викорисовує інший метод уникнення цензури.  Якщо один міст не працює, спробуйте ще раз через інший."> -<!ENTITY torsettings.useBridges.type "Тип транспорту:"> -<!ENTITY torsettings.useBridges.custom "Ввести мости вручну"> -<!ENTITY torsettings.useBridges.label "Введіть один або кілька ретрансляторів типу міст (по одному в рядок)."> -<!ENTITY torsettings.useBridges.placeholder "введіть адресу:порт"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Скопіювати журнал Tor до буферу обміну"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Допомога по ретрансляторам типу міст"> -<!ENTITY torsettings.bridgeHelp1 "Якщо Ви не можете підключитися до мережі Tor, може бути, що Ваш інтернет-провайдер (ISP) або інша організація блокує Tor.  Часто можна обійти цю проблему за допомогою Tor мостів, що є приватними трансляторами, які важче заблокувати."> -<!ENTITY torsettings.bridgeHelp1B "Ви можете використати заздалегідь визначений перелік адрес мостів або можете отримати і ввести набір мостів вручну."> -<!ENTITY torsettings.bridgeHelp2Heading "Через Веб"> -<!ENTITY torsettings.bridgeHelp2 "Відвідайте сторінку https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Через автовідповідач електронної пошти"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Надішліть повідомлення на адресу bridges(a)torproject.org із рядком "get bridges" у тілі повідомлення.  Проте, для того, щоб ускладнити визначення великої кількості адрес мостів зловмисниками, необхідно відправити цей запит від поштової скриньки одного з наступних постачальників (перераховано у порядку пріоритетності):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com або https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Через допомогу"> -<!ENTITY torsettings.bridgeHelp4 "У крайньому випадку, Ви можете отримати адресу мосту, відправивши ввічливе повідомлення на адресу help(a)rt.torproject.org.  Зверніть увагу на те, що кожен запит обробляється людиною."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index 5ddfb29..9dd9ca9 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Ви повинні вказати один а torlauncher.error_default_bridges_type_missing=Ви повинні вибрати тип транспорту для наданих мережевих мостів. torlauncher.error_bridge_bad_default_type=Немає мережевих мостів які мають тип транспорту %S. Будь ласка перевірте ваші налаштування. -torlauncher.recommended_bridge=(рекомендовано) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=З'єднатися torlauncher.restart_tor=Перезапустити Tor diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index 9243e1a..41bed6b 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "ٹور نیٹ ورک سیٹنگز"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "ہاں"> -<!ENTITY torSettings.no "نہیں"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "اختیاری"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "پورٹ:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties index 9e00075..1c01937 100644 --- a/src/chrome/locale/ur-PK/torlauncher.properties +++ b/src/chrome/locale/ur-PK/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index bb905b0..e2ea1f7 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "طور نیٹ ورک کے سیٹنگز"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "جی ہاں"> -<!ENTITY torSettings.no "نہیں"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index f18ebee..5970b9c 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor tarmoq moslamalari"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Ha"> -<!ENTITY torSettings.no "Yo'q"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Ulanish"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Qo'shimcha"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proksi turi:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Manzil:"> <!ENTITY torsettings.useProxy.address.placeholder "IP manzil yoki host nomi"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties index 99d0d39..60c4e21 100644 --- a/src/chrome/locale/uz/torlauncher.properties +++ b/src/chrome/locale/uz/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Ulanish torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/ve/torlauncher.properties +++ b/src/chrome/locale/ve/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index b48aed1..0f637e6 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Những cài đặt của mạng Tor"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Ngôn ngữ Trình duyệt Tor"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Trước khi bạn kết nối với mạng lưới Tor, bạn cần phải cung cấp thông tin về kết nối Internet của máy tính này."> - -<!ENTITY torSettings.yes "Có"> -<!ENTITY torSettings.no "Không"> - -<!ENTITY torSettings.firstQuestion "Những thứ nào dưới đây mô tả đúng nhất về tình huống của bạn?"> -<!ENTITY torSettings.configurePrompt1 "Việc kết nối Internet của máy tính này bị kiểm duyệt và được đại diện."> -<!ENTITY torSettings.configurePrompt2 "Tôi cần cấu hình cầu nối hoặc những cài đặt đại diện nội bộ trước khi tôi kết nối tới Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Cấu hình"> -<!ENTITY torSettings.connectPrompt2 "Tôi muốn tạo kết nối trực tiếp với mạng lưới Tor."> -<!ENTITY torSettings.connectPrompt3 "Việc này sẽ hoạt động trong hầu hết các tình huống."> <!ENTITY torSettings.connect "Kết nối"> -<!ENTITY torSettings.proxyPageTitle "Cấu hình ủy quyền nội bộ"> -<!ENTITY torSettings.proxyQuestion "Máy tính này có cần sử dụng ủy quyền nội bộ để kết nối Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "Trong hầu hết các tình huống, một sự ủy quyền nội bộ là không cần thiết, nhưng nó có thể cần thiết khi kết nối thông qua một công ty, trường học, hoặc mạng lưới trường đại học."> -<!ENTITY torSettings.proxyExplanation2 "Nếu bạn không chắc cách trả lời câu hỏi này, xem cài đặt Internet trong một trình duyệt khác hoặc kiểm tra cài đặt mạng lưới của hệ thống của bạn để xem sự ủy quyền nội bộ có cần thiết không."> -<!ENTITY torSettings.enterProxy "Nhập những cài đặt ủy quyền."> -<!ENTITY torSettings.bridgePageTitle "Cấu hình cầu nối Tor"> -<!ENTITY torSettings.bridgeQuestion "Nhà cung cấp dịch vụ (ISP) của bạn có ngăn chặn hoặc kiểm duyệt kết nối đến mạng Tor không?"> -<!ENTITY torSettings.bridgeExplanation1 "Nếu bạn không chắc cách trả lời câu hỏi này, chọn Không (nếu bạn không thể kết nối mạng lưới Tor mà không có cầu nối, bạn có thể thêm một cái sau đó)."> -<!ENTITY torSettings.bridgeExplanation2 "Nếu bạn chọn Có, bạn sẽ được hỏi để cấu hình Cầu nối Tor, những sự lặp không được liệt kê mà làm cho khó khăn khi chặn kết nối tới Mạng lưới Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Bạn có thể sử dụng bộ cầu nối đã được cung cấp hoặc bạn có thể lấy và nhập một bộ cầu nối riêng."> -  <!ENTITY torsettings.startingTor "Chờ đợi để Tor khởi động.."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Tuỳ chọn"> -<!ENTITY torsettings.useProxy.checkbox "Máy tính này cần sử dụng một ủy quyền nội bộ để truy cập Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Dạng proxy:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Địa chỉ:"> <!ENTITY torsettings.useProxy.address.placeholder "Địa chỉ IP hoặc hostname"> <!ENTITY torsettings.useProxy.port "Cổng:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Máy tính này đi qua một tường lửa mà chỉ cho phép tới một vài cổng"> <!ENTITY torsettings.firewall.allowedPorts "Những Cổng Được phép:"> -<!ENTITY torsettings.useBridges.checkbox "Nhà cung cấp dịch vụ của tôi (ISP) đã chặn kết nối đến mạng Tor"> -<!ENTITY torsettings.useBridges.default "Kết nối với những cầu được cung cấp"> -<!ENTITY torsettings.useBridges.note "Mỗi loại cầu nối sử dụng một phương pháp khác nhau để tránh việc kiểm duyệt.  Nếu một cầu nối không hoạt động, thử lại bằng một cái khác."> -<!ENTITY torsettings.useBridges.type "Loại hình vận chuyển:"> -<!ENTITY torsettings.useBridges.custom "Nhập những cầu quen thuộc"> -<!ENTITY torsettings.useBridges.label "Nhập một hoăc nhiều hơn những tiếp sức cầu nối (một cái trên mỗi dòng)."> -<!ENTITY torsettings.useBridges.placeholder "nhập address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Chép nhật ký của Tor vào Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Giúp đỡ về Tiếp sức cầu nối"> -<!ENTITY torsettings.bridgeHelp1 "Nếu như bạn không thể kết nối đến mạng Tor, có thể là nhà cung cấp dịch vụ của bạn (ISP) hoặc cơ quan khác đã chặn kết nối đến Tor. Thông thường, bạn có thể giải quyết vấn này bằng cách sử dụng Tor Bridges, các Tor Bridges này sẽ không được liệt kê để làm cho việc ngăn chặn khó khăn hơn."> -<!ENTITY torsettings.bridgeHelp1B "Bạn có thể sử dụng bộ cầu nối đã được cấu hình trước, được cung cấp hoặc bạn có thể lấy một bộ địa chỉ riêng bằng cách sử dụng một trong những phương pháp:"> -<!ENTITY torsettings.bridgeHelp2Heading "Đi qua Web"> -<!ENTITY torsettings.bridgeHelp2 "Sử dụng trình duyệt web truy cập vào https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Thông qua Hệ thống tự động trả lời email"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Gửi email tới bridges(a)torproject.org với dòng 'get bridges' bởi bản thân nó trong phần thân thông điệp.  Tuy nhiên, để làm khó hơn cho một kẻ tấn công có thể hiểu nhiều về địa chỉ cầu nối, bạn phải gửi yêu cầu này từ một trong những nhà cung cấp email dưới đây (được liệt kê theo sự ưa thích):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Thông qua Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Như là phương thức cuối cùng, bạn có thể yêu cầu địa chỉ cầu nối bằng cách gửi một email lịch sự tới help(a)rt.torproject.org.  Vui lòng lưu ý rằng một người cần phải phản hồi tới từng yêu cầu."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 0ef4db5..872af2b 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều torlauncher.error_default_bridges_type_missing=Bạn phải chọn một loại vận chuyển cho cầu nối đã được cung cấp. torlauncher.error_bridge_bad_default_type=Không cầu nối đã được cung cấp nào có loại vận chuyển %S có sẵn. Vui lòng điều chỉnh cài đặt của bạn. -torlauncher.recommended_bridge=(khuyên dùng) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Kết nối torlauncher.restart_tor=Khởi động lại Tor diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/wa/torlauncher.properties +++ b/src/chrome/locale/wa/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/wo/torlauncher.properties +++ b/src/chrome/locale/wo/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index bad6552..50b72ff 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor 网络设置"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser 语言"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "在连接 Tor 网络之前，需提供相关的网络连接信息。"> - -<!ENTITY torSettings.yes "是"> -<!ENTITY torSettings.no "否"> - -<!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> -<!ENTITY torSettings.configurePrompt1 "网络连接受到审查或需要代理。"> -<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或设置本地代理才能连接到 Tor 网络。"> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "配置"> -<!ENTITY torSettings.connectPrompt2 "我想直接连接 Tor 网络。"> -<!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> -<!ENTITY torSettings.proxyPageTitle "本地代理配置"> -<!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？"> - -<!ENTITY torSettings.proxyExplanation1 "大多数情况下并不需要使用本地代理，但在公司、学校等网络时这可能需要。"> -<!ENTITY torSettings.proxyExplanation2 "如果你不确定此问题的答案，请查看此计算机中的其他浏览器的因特网设置或者是你系统中的网络设置，查看是否需要本地代理设置。"> -<!ENTITY torSettings.enterProxy "输入代理设置。"> -<!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> -<!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeExplanation1 "如果不确定，可选择否，之后不用网桥则无法连接时，可再尝试使用网桥。"> -<!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> -<!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。"> -  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "可选"> -<!ENTITY torsettings.useProxy.checkbox "需要本地代理来访问互联网"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "代理类型："> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "地址："> <!ENTITY torsettings.useProxy.address.placeholder "IP 地址或主机名"> <!ENTITY torsettings.useProxy.port "端口："> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> -<!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> -<!ENTITY torsettings.useBridges.default "使用集成的网桥连接"> -<!ENTITY torsettings.useBridges.note "每种网桥使用不同的方法以避免被封锁。如果某个网桥不工作，请换用另一种重试。"> -<!ENTITY torsettings.useBridges.type "传输类型："> -<!ENTITY torsettings.useBridges.custom "输入自定义网桥"> -<!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "类型地址:端口"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> -<!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用预先配置好的默认设置的网桥地址集成，也可以以下列方式获取一些自定的网桥地址："> -<!ENTITY torsettings.bridgeHelp2Heading "网页方式"> -<!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 这两个单词（如需获取 obfs3 网桥，请写“get transport obfs3”）。为了防止封锁者大量获取网桥地址，发送网桥请求邮件必须使用以下网站的电子邮箱（按推荐度由高到低排列）。"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net，https://mail.google.com 或者 https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> -<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 71a6937..8bbb139 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=必须指定一个或多个网桥。 torlauncher.error_default_bridges_type_missing=必须指定网桥的传输类型。 torlauncher.error_bridge_bad_default_type=没有传输类型为 %S 的可用网桥。请调整设置。 -torlauncher.recommended_bridge=(推荐) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=连接 torlauncher.restart_tor=重新启动 Tor diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 03cf6a1..63c7f3a 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "設定Tor洋蔥路由網絡"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor洋蔥路由瀏覽器嘅語言"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "連接到Tor洋蔥路由網絡前，請提供呢部電腦網絡連線嘅相關資訊。"> - -<!ENTITY torSettings.yes "是"> -<!ENTITY torSettings.no "否"> - -<!ENTITY torSettings.firstQuestion "下列邊項最符合你嘅實際情況？"> -<!ENTITY torSettings.configurePrompt1 "呢部電腦嘅網絡連線有被監控過濾或有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "我必須喺連上Tor洋蔥路由 網絡之前，先設定好橋接器或本地代理伺服器。"> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "我想直接連上Tor洋蔥路由網絡"> -<!ENTITY torSettings.connectPrompt3 "呢樣可以喺大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyPageTitle "設定本地代理伺服器"> -<!ENTITY torSettings.proxyQuestion "呢部電腦需要使用本地代理伺服器嚟存取網絡嗎？"> - -<!ENTITY torSettings.proxyExplanation1 "大部份情況係唔需要本地代理伺服器，但當使用嘅係企業或學校等嘅內部網絡時，就有可能需要。"> -<!ENTITY torSettings.proxyExplanation2 "如果唔確定，可參考其他網絡瀏覽器嘅網際網絡設定或者作業系統嘅網絡相關設定，以確定係咪需要設定本地代理伺服器。"> -<!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> -<!ENTITY torSettings.bridgePageTitle "設定Tor洋蔥路由橋接器"> -<!ENTITY torSettings.bridgeQuestion "你嘅互聯網服務提供者(ISP)會唔會阻擋或過濾連接到Tor洋蔥路由嘅網絡活動？"> -<!ENTITY torSettings.bridgeExplanation1 "唔確定，請選「否」(往後若發現唔使用橋接器無法連上Tor洋蔥路由網絡嘅話，可以返嚟加入此設定)。"> -<!ENTITY torSettings.bridgeExplanation2 "若選取「是」，則須進行Tor洋蔥路由橋接器設定。橋接器係未被列表嘅秘密Tor洋蔥路由節點，可令阻擋連接Tor洋蔥路由網絡更加困難。"> -<!ENTITY torSettings.bridgeSettingsPrompt "你可以使用提供嘅橋接器，也可輸入一組自訂嘅橋接器。"> -  <!ENTITY torsettings.startingTor "等待Tor洋蔥路由啟動…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "呢部電腦需要透過本地代理伺服器存取互聯網"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "位址："> <!ENTITY torsettings.useProxy.address.placeholder "IP位址或主機名稱"> <!ENTITY torsettings.useProxy.port "連接埠："> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "http╱https"> <!ENTITY torsettings.firewall.checkbox "呢部電腦通過某個只容許連接至特定連線埠嘅防火牆"> <!ENTITY torsettings.firewall.allowedPorts "容許嘅連接埠："> -<!ENTITY torsettings.useBridges.checkbox "我嘅互聯網服務提供者(ISP)會阻擋連接到Tor洋蔥路由嘅網絡活動"> -<!ENTITY torsettings.useBridges.default "使用提供嘅橋接器連線"> -<!ENTITY torsettings.useBridges.note "每種橋接器都使用唔同嘅方式去規避網絡封包過濾，  如果發現使用咗某個橋接器仍無法順利連線嘅話，可以更換另一個橋接器再行嘗試。"> -<!ENTITY torsettings.useBridges.type "傳輸類型："> -<!ENTITY torsettings.useBridges.custom "輸入自訂嘅橋接器"> -<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接轉向站(每行一個)。"> -<!ENTITY torsettings.useBridges.placeholder "請輸入「位址:連接埠」"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "將Tor洋蔥路由嘅日誌複製到剪貼簿"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "橋接轉向站嘅說明"> -<!ENTITY torsettings.bridgeHelp1 "若無法連接到Tor洋蔥路由網絡，可能係因為你嘅互聯網服務提供者(ISP)或其他機構正在封鎖Tor洋蔥路由網絡。  通常你可以使用橋接器連上Tor洋蔥路由網絡，以解決此問題。呢類橋接器係未被羅列於清單中嘅秘密轉向站，非常難以被過濾阻擋。"> -<!ENTITY torsettings.bridgeHelp1B "你可使用提供並預先設定好嘅橋接器位址，或使用下列方法嘅任何一種以取得一組自訂嘅位址："> -<!ENTITY torsettings.bridgeHelp2Heading "透過網絡"> -<!ENTITY torsettings.bridgeHelp2 "使用瀏覽器到訪 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "透過電郵自動回覆"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並喺內文中輸入「get bridges」字串。  然而，要使網絡攻擊者更難取得橋接器位址，你必須使用以下電郵提供者之一嚟寄送呢個要求(順序係依照優先建議)："> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> -<!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 0a23a8b..9dc9002 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=須指定一個或多個橋接器。 torlauncher.error_default_bridges_type_missing=須為橋接器選取傳輸類型。 torlauncher.error_bridge_bad_default_type=未提供傳輸類型為%S嘅橋接器。請重選。 -torlauncher.recommended_bridge=(建議) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=連接 torlauncher.restart_tor=重新啟動Tor洋蔥路由 diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index dff397b..82ec4d3 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "洋蔥路由網路設定"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "洋蔥路由瀏覽器之語言"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "在您連接到洋蔥路由網路前，您需要提供這台電腦網路連線的相關資訊。"> - -<!ENTITY torSettings.yes "是"> -<!ENTITY torSettings.no "否"> - -<!ENTITY torSettings.firstQuestion "下列哪一項敘述最符合您的實際情況？"> -<!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線有被監控過濾或是有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "我必須要在連上洋蔥路由 網路之前，先設定好橋接器或本地端代理伺服器。"> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "我想要直接連上洋蔥路由網路。"> -<!ENTITY torSettings.connectPrompt3 "這將在大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyPageTitle "本地端代理伺服器的設定"> -<!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？"> - -<!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> -<!ENTITY torSettings.proxyExplanation2 "如果您不確定如何回答這個問題的話，可以參考其他網路瀏覽器的網際網路設定或者是作業系統中的網路相關設定，以確定是否需要設定本地端代理伺服器。"> -<!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> -<!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> -<!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> -<!ENTITY torSettings.bridgeExplanation1 "若您不確定如何回答這個問題的話，請選擇「否」(若之後您發現沒有使用橋接器無法連上洋蔥路由網路的話，可以再回頭來增加此設定)。"> -<!ENTITY torSettings.bridgeExplanation2 "若您選擇「是」的話，您將必須要進行洋蔥路由的橋接器設定，橋接器是未被列表的祕密洋蔥路由節點，它可以讓對通往洋蔥路由網路連線的阻擋，變得更加困難。"> -<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接器，您也可以輸入一組自訂的橋接器。"> -  <!ENTITY torsettings.startingTor "正在等待洋蔥路由啟動…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "這台電腦需要透過代理伺服器存取網際網路"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "位址："> <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱"> <!ENTITY torsettings.useProxy.port "連接埠："> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連線埠的防火牆"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> -<!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)會過濾阻擋連接至洋蔥路由的網路活動"> -<!ENTITY torsettings.useBridges.default "使用提供的橋接器連線"> -<!ENTITY torsettings.useBridges.note "每種橋接器都使用不同的方式去規避網路封包過濾，  如果發現使用了某個橋接器仍然無法順利連上線的話，可以更換另一個橋接器再行嘗試。"> -<!ENTITY torsettings.useBridges.type "傳輸類型："> -<!ENTITY torsettings.useBridges.custom "輸入自訂的橋接器"> -<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼器 (每行一個)。"> -<!ENTITY torsettings.useBridges.placeholder "請輸入位址:連接埠"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "若您無法連接到洋蔥路由網路，可能是因為您的網際網路服務提供者 (ISP) 或其它機構正在封鎖洋蔥路由網路。  通常您可以使用橋接中繼器來連上洋蔥路由網路，以便解決此問題。該種中繼器是未被羅列於清單中的秘密中繼節點，非常難以被過濾阻擋。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用我們所提供的預設橋接器位址組合，或者也可以由以下的方法取得客製化的橋接器位址組合："> -<!ENTITY torsettings.bridgeHelp2Heading "透過網路"> -<!ENTITY torsettings.bridgeHelp2 "使用網路瀏覽器造訪 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "透過電子郵件自動回覆"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並在內文中輸入「get bridges」字串。  然而，要使得網路攻擊者更難取得橋接器位址，您必須是使用以下電子郵件提供者之一來寄送本要求 (列表順序是依照優先偏好)："> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com 或者 https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> -<!ENTITY torsettings.bridgeHelp4 "最後的方法是：您可以發送一封禮貌性的郵件到 help(a)rt.torproject.org.  請注意，對於此類郵件我們必需要一封封地手動回覆。"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 9461178..5b42edc 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=您必須指定一個或多個橋接。 torlauncher.error_default_bridges_type_missing=您必須為該橋接器選擇一種傳輸類型。 torlauncher.error_bridge_bad_default_type=沒有提供傳輸類型為 %S 的橋接器。請調整您的設定。 -torlauncher.recommended_bridge=(建議使用) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=連線 torlauncher.restart_tor=重新啟動洋蔥路由 diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index e28f84e..240154c 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,25 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/zu/torlauncher.properties +++ b/src/chrome/locale/zu/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor

1 0

[tor-launcher/master] Release preparations for 0.2.14.1
by gk＠torproject.org 10 Nov '17

10 Nov '17

commit 2931039d9f244e004094911b790220ae71a7d494 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 10 09:35:59 2017 +0000 Release preparations for 0.2.14.1 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index e660e2f..6cb74e9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.14</em:version> + <em:version>0.2.14.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Revert "Translations update"
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 5e8ee3f00456d1e2a997fc48db59e625d44aceb2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 20:25:32 2017 +0000 Revert "Translations update" This reverts commit 34eeec4bd5d1f73da11a78b8aa4e9d78211b213b. This did not pick up our news strings as Transifex did not include them yet --- src/chrome/locale/ach/network-settings.dtd | 3 + src/chrome/locale/ady/network-settings.dtd | 3 + src/chrome/locale/af/network-settings.dtd | 3 + src/chrome/locale/ak/network-settings.dtd | 3 + src/chrome/locale/am-ET/network-settings.dtd | 3 + src/chrome/locale/am/network-settings.dtd | 3 + src/chrome/locale/ar/network-settings.dtd | 3 + src/chrome/locale/arn/network-settings.dtd | 3 + src/chrome/locale/ast/network-settings.dtd | 3 + src/chrome/locale/az/network-settings.dtd | 3 + src/chrome/locale/be/network-settings.dtd | 3 + src/chrome/locale/bg/network-settings.dtd | 3 + src/chrome/locale/bn-BD/network-settings.dtd | 3 + src/chrome/locale/bn-IN/network-settings.dtd | 3 + src/chrome/locale/bn/network-settings.dtd | 3 + src/chrome/locale/bo/network-settings.dtd | 3 + src/chrome/locale/br/network-settings.dtd | 3 + src/chrome/locale/bs/network-settings.dtd | 3 + src/chrome/locale/ca/network-settings.dtd | 3 + src/chrome/locale/ca(a)valencia/network-settings.dtd | 3 + src/chrome/locale/cs-CZ/network-settings.dtd | 3 + src/chrome/locale/cs/network-settings.dtd | 3 + src/chrome/locale/csb/network-settings.dtd | 3 + src/chrome/locale/cv/network-settings.dtd | 3 + src/chrome/locale/cy/network-settings.dtd | 3 + src/chrome/locale/da/network-settings.dtd | 3 + src/chrome/locale/de/network-settings.dtd | 3 + src/chrome/locale/dz/network-settings.dtd | 3 + src/chrome/locale/el/network-settings.dtd | 3 + src/chrome/locale/en-GB/network-settings.dtd | 3 + src/chrome/locale/en/network-settings.dtd | 61 ++++------- src/chrome/locale/en/torlauncher.properties | 3 +- src/chrome/locale/eo/network-settings.dtd | 3 + src/chrome/locale/es-AR/network-settings.dtd | 3 + src/chrome/locale/es-CL/network-settings.dtd | 3 + src/chrome/locale/es-CO/network-settings.dtd | 3 + src/chrome/locale/es-MX/network-settings.dtd | 3 + src/chrome/locale/es/network-settings.dtd | 3 + src/chrome/locale/et/network-settings.dtd | 5 +- src/chrome/locale/et/torlauncher.properties | 2 +- src/chrome/locale/eu/network-settings.dtd | 3 + src/chrome/locale/fa/network-settings.dtd | 3 + src/chrome/locale/fi/network-settings.dtd | 3 + src/chrome/locale/fil/network-settings.dtd | 3 + src/chrome/locale/fo/network-settings.dtd | 3 + src/chrome/locale/fr-CA/network-settings.dtd | 27 ++--- src/chrome/locale/fr-CA/torlauncher.properties | 40 +++---- src/chrome/locale/fr/network-settings.dtd | 31 +++--- src/chrome/locale/fr/torlauncher.properties | 40 +++---- src/chrome/locale/fur/network-settings.dtd | 3 + src/chrome/locale/fy/network-settings.dtd | 3 + src/chrome/locale/ga/network-settings.dtd | 113 +++++++++---------- src/chrome/locale/ga/torlauncher.properties | 120 ++++++++++----------- src/chrome/locale/gl/network-settings.dtd | 3 + src/chrome/locale/gu-IN/network-settings.dtd | 3 + src/chrome/locale/gu/network-settings.dtd | 3 + src/chrome/locale/gun/network-settings.dtd | 3 + src/chrome/locale/ha/network-settings.dtd | 3 + src/chrome/locale/he/network-settings.dtd | 97 +++++++++-------- src/chrome/locale/he/torlauncher.properties | 74 ++++++------- src/chrome/locale/hi/network-settings.dtd | 3 + src/chrome/locale/hr-HR/network-settings.dtd | 3 + src/chrome/locale/hr/network-settings.dtd | 3 + src/chrome/locale/ht/network-settings.dtd | 3 + src/chrome/locale/hu/network-settings.dtd | 3 + src/chrome/locale/hy-AM/network-settings.dtd | 3 + src/chrome/locale/hy/network-settings.dtd | 3 + src/chrome/locale/ia/network-settings.dtd | 3 + src/chrome/locale/id/network-settings.dtd | 3 + src/chrome/locale/is/network-settings.dtd | 15 +-- src/chrome/locale/is/torlauncher.properties | 8 +- src/chrome/locale/it/network-settings.dtd | 3 + src/chrome/locale/ja/network-settings.dtd | 3 + src/chrome/locale/jv/network-settings.dtd | 3 + src/chrome/locale/ka/network-settings.dtd | 3 + src/chrome/locale/kk/network-settings.dtd | 3 + src/chrome/locale/km/network-settings.dtd | 3 + src/chrome/locale/kn/network-settings.dtd | 3 + src/chrome/locale/ko-KR/network-settings.dtd | 3 + src/chrome/locale/ko/network-settings.dtd | 3 + src/chrome/locale/ku/network-settings.dtd | 3 + src/chrome/locale/kw/network-settings.dtd | 3 + src/chrome/locale/ky/network-settings.dtd | 3 + src/chrome/locale/lb/network-settings.dtd | 3 + src/chrome/locale/lg/network-settings.dtd | 7 +- src/chrome/locale/ln/network-settings.dtd | 3 + src/chrome/locale/lo/network-settings.dtd | 3 + src/chrome/locale/lt/network-settings.dtd | 3 + src/chrome/locale/lv/network-settings.dtd | 3 + src/chrome/locale/mg/network-settings.dtd | 3 + src/chrome/locale/mi/network-settings.dtd | 3 + src/chrome/locale/mk/network-settings.dtd | 3 + src/chrome/locale/ml/network-settings.dtd | 3 + src/chrome/locale/ml/torlauncher.properties | 2 +- src/chrome/locale/mn/network-settings.dtd | 3 + src/chrome/locale/mr/network-settings.dtd | 3 + src/chrome/locale/ms-MY/network-settings.dtd | 3 + src/chrome/locale/mt/network-settings.dtd | 3 + src/chrome/locale/my/network-settings.dtd | 3 + src/chrome/locale/nah/network-settings.dtd | 3 + src/chrome/locale/nap/network-settings.dtd | 3 + src/chrome/locale/nb/network-settings.dtd | 3 + src/chrome/locale/nb/torlauncher.properties | 2 +- src/chrome/locale/nds/network-settings.dtd | 3 + src/chrome/locale/ne/network-settings.dtd | 3 + src/chrome/locale/nl-BE/network-settings.dtd | 3 + src/chrome/locale/nl-BE/torlauncher.properties | 2 +- src/chrome/locale/nl/network-settings.dtd | 3 + src/chrome/locale/nn/network-settings.dtd | 3 + src/chrome/locale/nso/network-settings.dtd | 3 + src/chrome/locale/oc/network-settings.dtd | 3 + src/chrome/locale/or/network-settings.dtd | 3 + src/chrome/locale/pa/network-settings.dtd | 3 + src/chrome/locale/pap/network-settings.dtd | 3 + src/chrome/locale/pl-PL/network-settings.dtd | 3 + src/chrome/locale/pl/network-settings.dtd | 3 + src/chrome/locale/pms/network-settings.dtd | 3 + src/chrome/locale/ps/network-settings.dtd | 3 + src/chrome/locale/pt-BR/network-settings.dtd | 3 + src/chrome/locale/pt/network-settings.dtd | 3 + src/chrome/locale/ro/network-settings.dtd | 3 + src/chrome/locale/ru/network-settings.dtd | 3 + src/chrome/locale/ru(a)petr1708/network-settings.dtd | 3 + src/chrome/locale/sco/network-settings.dtd | 3 + src/chrome/locale/si-LK/network-settings.dtd | 3 + src/chrome/locale/sk-SK/network-settings.dtd | 3 + src/chrome/locale/sk/network-settings.dtd | 3 + src/chrome/locale/sl-SI/network-settings.dtd | 3 + src/chrome/locale/sl/network-settings.dtd | 3 + src/chrome/locale/sn/network-settings.dtd | 3 + src/chrome/locale/so/network-settings.dtd | 3 + src/chrome/locale/son/network-settings.dtd | 3 + src/chrome/locale/sq-AL/network-settings.dtd | 3 + src/chrome/locale/sq/network-settings.dtd | 3 + src/chrome/locale/sr/network-settings.dtd | 3 + src/chrome/locale/sr(a)latin/network-settings.dtd | 3 + src/chrome/locale/st/network-settings.dtd | 3 + src/chrome/locale/su/network-settings.dtd | 3 + src/chrome/locale/sv-SE/network-settings.dtd | 3 + src/chrome/locale/sv/network-settings.dtd | 3 + src/chrome/locale/sw/network-settings.dtd | 3 + src/chrome/locale/szl/network-settings.dtd | 3 + src/chrome/locale/ta/network-settings.dtd | 3 + src/chrome/locale/te-IN/network-settings.dtd | 3 + src/chrome/locale/te/network-settings.dtd | 3 + src/chrome/locale/tg/network-settings.dtd | 3 + src/chrome/locale/tg/torlauncher.properties | 2 +- src/chrome/locale/th/network-settings.dtd | 3 + src/chrome/locale/ti/network-settings.dtd | 3 + src/chrome/locale/tk/network-settings.dtd | 3 + src/chrome/locale/tr/network-settings.dtd | 3 + src/chrome/locale/uk/network-settings.dtd | 3 + src/chrome/locale/ur-PK/network-settings.dtd | 3 + src/chrome/locale/ur/network-settings.dtd | 3 + src/chrome/locale/uz/network-settings.dtd | 3 + src/chrome/locale/ve/network-settings.dtd | 3 + src/chrome/locale/vi/network-settings.dtd | 3 + src/chrome/locale/wa/network-settings.dtd | 3 + src/chrome/locale/wo/network-settings.dtd | 3 + src/chrome/locale/zh-CN/network-settings.dtd | 3 + src/chrome/locale/zh-HK/network-settings.dtd | 3 + src/chrome/locale/zh-TW/network-settings.dtd | 3 + src/chrome/locale/zu/network-settings.dtd | 3 + 163 files changed, 762 insertions(+), 321 deletions(-) diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index d226ca3..ff231bb 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd index 23aae0a..003e255 100644 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ b/src/chrome/locale/am-ET/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index 2e81470..b6d2e03 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index a20acd8..cd31eed 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net او https://mail.google.com, او https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "من خلال مكتب المساعدة"> <!ENTITY torsettings.bridgeHelp4 "يمكنك طلب عناوين الجسر، كحل أخير، من خلال إرسال رسالة بريد إلكتروني مهذبة إلى help(a)rt.torproject.org.  يرجى ملاحظة أنه يجب أن يرد شخص ما على كل طلب."> + + +<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index 6f12432..e85cb26 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 9e96619..7ef8cd1 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, və ya https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Dəstək Masası Vasitəsilə"> <!ENTITY torsettings.bridgeHelp4 "Son çarə olaraq körpü ünvanlarını help(a)rt.torproject.org ünvanına mədəni tələb emaili göndərməklə əldə edə bilərsən.  Lütfən, unutma ki, yazdığın insan hər bir tələbə ayrı ayrı cavab yazacaq."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index 9e0d430..c235b1c 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 7972c72..ce13b61 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "През бюрото за помощ"> <!ENTITY torsettings.bridgeHelp4 "Като последна стъпка, вие може да изисквате адреси чрез пращане на учтив имейл до help(a)rt.torproject.org.  Моля обърнете внимание, че на всяка молба за bridge се отговаря персонално."> + + +<!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 5ebd2d0..db4e635 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index 5a33a60..2a7e408 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index bff8120..9eb7945 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A través de l'Escriptori d'Ajuda"> <!ENTITY torsettings.bridgeHelp4 "Com a última opció, podeu demanar adreces de pont enviant un missatge a help(a)rt.torproject.org.  Una persona respondrà cada petició."> + + +<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index 0458e75..e666423 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -52,3 +52,6 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + +<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd index 75ece3b..9c78c3c 100644 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ b/src/chrome/locale/cs-CZ/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index a69caff..d5241e1 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> <!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk."> + + +<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index dfe657e..6a95899 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index 6f3cc56..2ed3e89 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 2851032..4257722 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> + + +<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index c635745..d976ea2 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle"> <!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help(a)rt.torproject.org angefordert werden.  Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss."> + + +<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index aa2b6f4..85d7b78 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> <!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> + + +<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 0d2e9dc..240154c 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,22 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 0c3fa75..f6d763a 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 49e95dd..5be6fa5 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos."> diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 6303509..30d3940 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index cb4c106..4a458a0 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index ad001f4..85b97c0 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index dc01bb3..45ff7f0 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario"> <!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help(a)rt.torproject.org .  Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición."> + + +<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index d471080..35b5fe3 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -14,7 +14,7 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Häälesta"> +<!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 8b40330..57528a5 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -33,7 +33,7 @@ torlauncher.recommended_bridge=(soovitatud) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Välju +torlauncher.quit_win=Exit torlauncher.done=Valmis torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 0efb96c..9753df9 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> + + +<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake."> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 490a77b..76cb386 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, یا https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> <!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> + + +<!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index f0ddb4c..bbd6db8 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com tai https:://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen läpi"> <!ENTITY torsettings.bridgeHelp4 "Viimeisenä keinona voit pyytää siltaosoitteita lähettämällä kohteliaan viestin osoitteeseen: help(a)rt.torproject.org.  Huomioi, että henkilön tulee vastata kuhunkin pyyntöön."> + + +<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index bd9412b..b73700b 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index 78bc505..bf6c933 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index b52cf71..af3ea91 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -15,20 +15,20 @@ <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> <!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "J’aimerais établir une connexion directe vers le réseau Tor."> +<!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet?">  -<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n’est pas requis, mais il pourrait être exigé pour une connexion par un réseau d’entreprise, d’école ou d’université."> -<!ENTITY torSettings.proxyExplanation2 "Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> +<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> +<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur de services Internet (FSI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n’êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n’arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> -<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l’on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé.">  @@ -45,14 +45,14 @@ <!ENTITY torsettings.useProxy.checkbox "Cet ordinateur doit utiliser un mandataire local pour accéder à Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> <!ENTITY torsettings.useProxy.address "Adresse :"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> <!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon fournisseur de services Internet (FSI) bloque les connexions vers le réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> @@ -65,11 +65,14 @@ <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> <!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur de services Internet (FSI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d’adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d’adresses en utilisant une de ces méthodes :"> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu’il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d’un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d’assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu’une personne devra répondre à chaque demande."> +<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> +<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> + + +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index 14c76a1..e213ea0 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -3,30 +3,30 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s'est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu'à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s'est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l'équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera par les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. +torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l’exécutable Tor. -torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. -torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. -torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. +torlauncher.tor_missing=Il manque l'exécutable Tor. +torlauncher.torrc_missing=Le fichier torrc manque et n'a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas et n'a pas pu être créé. +torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S -torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible d'enregistrer les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez choisir un type de transport pour les ponts fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) @@ -36,28 +36,28 @@ torlauncher.quit=Quitter torlauncher.quit_win=Sortie torlauncher.done=Terminé -torlauncher.forAssistance=Pour de l’assistance, contacter %S -torlauncher.forAssistance2=Pour de l’assistance, visiter %S +torlauncher.forAssistance=Pour de l'assistance, contacter %S +torlauncher.forAssistance2=Pour de l'assistance, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire -torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau -torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité -torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais +torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrée à l'annuaire +torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes -torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité +torlauncher.bootstrapWarning.identity=mauvaise concordance de l'identité torlauncher.bootstrapWarning.timeout=expiration du temps de connexion -torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte +torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index fa9fd6e..5cdbd06 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -15,19 +15,19 @@ <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> <!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont (Bridge) ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "J’aimerais établir une connexion directe vers le réseau Tor."> +<!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet ?">  -<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n’est pas requis, mais il pourrait être exigé pour une connexion par un réseau d’entreprise, d’école ou d’université."> -<!ENTITY torSettings.proxyExplanation2 "Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> +<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> +<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts (Bridges) Tor"> -<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d’accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n’êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n’arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> <!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts (Bridges) Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts (Bridges) fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> @@ -45,16 +45,16 @@ <!ENTITY torsettings.useProxy.checkbox "Cet ordinateur doit utiliser un mandataire local pour accéder à Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> <!ENTITY torsettings.useProxy.address "Adresse :"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> <!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d’accès à Internet (FAI) bloque les connexions vers le réseau Tor"> +<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions vers le réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts (Bridges) fournis"> <!ENTITY torsettings.useBridges.note "Chaque type de pont (Bridge) utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> @@ -64,12 +64,15 @@ <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts ((Bridges Relays)"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d’accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d’adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d’adresses en utilisant une de ces méthodes :"> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu’il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d’un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d’assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu’une personne devra répondre à chaque demande."> +<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> +<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> + + +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index dddd060..8a5f37f 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,30 +3,30 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s'est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu'à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s'est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l'équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. +torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l’exécutable Tor. -torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. -torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. -torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. +torlauncher.tor_missing=Il manque l'exécutable Tor. +torlauncher.torrc_missing=Le fichier torrc manque et n'a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas et n'a pas pu être créé. +torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S -torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible d'enregistrer les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts (Bridges). torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts (Bridges) fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) @@ -36,28 +36,28 @@ torlauncher.quit=Quitter torlauncher.quit_win=Sortie torlauncher.done=Terminé -torlauncher.forAssistance=Pour de l’assistance, contacter %S -torlauncher.forAssistance2=Pour de l’assistance, visiter %S +torlauncher.forAssistance=Pour de l'assistance, contacter %S +torlauncher.forAssistance2=Pour de l'assistance, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire -torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau -torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité -torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais +torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrée à l'annuaire +torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor ! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes -torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité +torlauncher.bootstrapWarning.identity=mauvaise concordance de l'identité torlauncher.bootstrapWarning.timeout=expiration du temps de connexion -torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte +torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 477705a..1753adb 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index c76302b..e28f84e 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -1,75 +1,78 @@ -<!ENTITY torsettings.dialog.title "Socruithe Líonra Tor"> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torlauncher.localePicker.title "Teanga Bhrabhsálaí Tor"> -<!ENTITY torlauncher.localePicker.prompt "Roghnaigh teanga."> +<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> +<!ENTITY torlauncher.localePicker.prompt "Please select a language.">  -<!ENTITY torsettings.prompt "Sular féidir leat ceangal a bhunú le líonra Tor, caithfidh tú tuilleadh eolais a sholáthar maidir le ceangal Idirlín an ríomhaire seo."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Tá"> -<!ENTITY torSettings.no "Níl"> +<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.no "No"> -<!ENTITY torSettings.firstQuestion "Cé acu díobh seo a leanas a dhéanann an cur síos is fearr ar do chás-sa?"> -<!ENTITY torSettings.configurePrompt1 "Úsáideann an ríomhaire seo ceangal Idirlín faoi chinsireacht nó úsáideann sé seachfhreastalaí."> -<!ENTITY torSettings.configurePrompt2 "Caithfidh mé droichead nó seachfhreastalaí áitiúil a chumrú sula ndéanfaidh mé ceangal le líonra&160;Tor."> -<!ENTITY torSettings.configure "Cumraigh"> -<!ENTITY torSettings.connectPrompt2 "Ba mhaith liom ceangal go díreach le líonra Tor."> -<!ENTITY torSettings.connectPrompt3 "Oibreoidh sé seo an chuid is mó den am."> -<!ENTITY torSettings.connect "Ceangail"> +<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Cumraíocht Sheachfhreastalaí Áitiúil"> -<!ENTITY torSettings.proxyQuestion "An bhfuil seachfhreastalaí áitiúil ag teastáil ón ríomhaire seo le ceangal leis an Idirlíon?"> +<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">  -<!ENTITY torSettings.proxyExplanation1 "Ní bhíonn seachfhreastalaí áitiúil ag teastáil an chuid is mó den am, ach b'fhéidir go mbeadh gá leis dá mbeifeá ag ceangal trí chomhlacht, scoil, nó ollscoil."> -<!ENTITY torSettings.proxyExplanation2 "Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais, le fáil amach an bhfuil seachfhreastalaí de dhíth."> -<!ENTITY torSettings.enterProxy "Cuir isteach socruithe an tseachfhreastalaí."> -<!ENTITY torSettings.bridgePageTitle "Cumraíocht Droichead Tor"> -<!ENTITY torSettings.bridgeQuestion "An bhfuil do Sholáthraí Seirbhíse Idirlín (ISP) ag cur cosc ar, nó ag déanamh cinsireacht ar Líonra Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, roghnaigh "Níl" (agus mura bhfuil tú in ann ceangal le líonra Tor gan droichead a úsáid, beidh tú ábalta ceann a shocrú ar ball)."> -<!ENTITY torSettings.bridgeExplanation2 "Má roghnaíonn tú "Tá", iarrfar ort Droichid Tor a chumrú. Tá sé níos deacra cosc a chur ar cheangail le Líonra Tor nuair a úsáideann tú na hathsheachadáin neamhliostaithe seo."> -<!ENTITY torSettings.bridgeSettingsPrompt "Is féidir leat na droichid ionsuite a úsáid, nó droichid de do chuid féin a fháil agus a chur isteach."> +<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> +<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  -<!ENTITY torsettings.startingTor "An fanacht go dtosóidh Tor..."> -<!ENTITY torsettings.restartTor "Atosaigh Tor"> -<!ENTITY torsettings.reconfigTor "Athchumraigh"> +<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigure"> -<!ENTITY torsettings.discardSettings.prompt "Chumraigh tú droichid Tor nó shocraigh tú seachfhreastalaí áitiúil roimhe seo.&160; Chun ceangal díreach le líonra Tor a bhunú, caithfidh tú na socruithe seo a scriosadh."> -<!ENTITY torsettings.discardSettings.proceed "Scrios na Socruithe agus Ceangail"> +<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> -<!ENTITY torsettings.optional "Roghnach"> +<!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "Teastaíonn seachfhreastalaí áitiúil ón ríomhaire seo chun ceangal leis an Idirlíon"> -<!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí:"> -<!ENTITY torsettings.useProxy.address "Seoladh:"> -<!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm"> +<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Ainm úsáideora:"> -<!ENTITY torsettings.useProxy.password "Focal faire:"> +<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.password "Password:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe"> -<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe:"> -<!ENTITY torsettings.useBridges.checkbox "Cuireann mo Sholáthraí Seirbhís Idirlín (ISP) cosc ar cheangail le líonra Tor"> -<!ENTITY torsettings.useBridges.default "Ceangail le droichead ionsuite"> -<!ENTITY torsettings.useBridges.note "Úsáideann gach cineál droichid modh difriúil leis an gcinsireacht a sheachaint.&160; Mura n-oibríonn droichead amháín, bain triail as ceann eile."> -<!ENTITY torsettings.useBridges.type "Cineál iompair:"> -<!ENTITY torsettings.useBridges.custom "Cuir isteach droichid saincheaptha"> -<!ENTITY torsettings.useBridges.label "Cuir isteach droichead nó droichid (ceann amháin ar gach líne)."> -<!ENTITY torsettings.useBridges.placeholder "cineál seoladh:port"> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> -<!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> -<!ENTITY torsettings.bridgeHelpTitle "Cabhair le Droichid"> -<!ENTITY torsettings.bridgeHelp1 "Mura bhfuil tú in ann ceangal le líonra Tor, b'fhéidir go bhfuil do Sholáthraí Seirbhíse Idirlín (ISP) nó eagraíocht eile ag cur cosc ar Tor.&160; Go minic, is féidir Droichid Tor a úsáid chun an fhadhb seo a sheachaint, toisc go bhfuil sé níos deacra cosc a chur orthu."> -<!ENTITY torsettings.bridgeHelp1B "Is féidir leat na droichid ionsuite réamhshocraithe a úsáid, nó seoltaí de do chuid féin a fháil trí cheann de na bealaí seo a leanas:"> -<!ENTITY torsettings.bridgeHelp2Heading "Tríd an nGréasán"> -<!ENTITY torsettings.bridgeHelp2 "Úsáid brabhsálaí Gréasáin chun cuairt a thabhairt ar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Tríd an Uathfhreagróir Ríomhphoist"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Seol teachtaireacht ríomhphoist chuig bridges(a)torproject.org leis an líne amháin 'get bridges' i gcorp na teachtaireachta.&160; Ionas go mbeidh sé níos deacra d'ionsaitheoir go leor seoltaí droichid a fhoghlaim, ní mór duit an t-iarratas seo a sheoladh ó cheann de na soláthraithe rphoist seo a leanas (in ord tosaíochta):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nó https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Tríd an Deasc Chabhrach"> -<!ENTITY torsettings.bridgeHelp4 "Mar an rogha dheiridh, is féidir leat seoltaí droichid a iarraidh trí theachtaireacht dhea-bhéasach a sheoladh chuig help(a)rt.torproject.org.  Tabhair faoi deara gurb é neach daonna a thabharfaidh freagra ar gach iarratas."> +<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index a4a4adf..24bb4d6 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -1,63 +1,63 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tosaitheoir Tor - -torlauncher.tor_exited_during_startup=Stop Tor le linn tosaithe. Seans gur tharla sé seo mar gheall ar earráid i do chomhad torrc, fabht i Tor nó i bhfeidhmchlár eile ar do chóras, nó crua-earra lochtach. Go dtí go mbeidh tú in ann an bhunfhadhb a réiteach agus Tor a atosú, ní thosóidh Brabhsálaí Tor. -torlauncher.tor_exited=Stop Tor go tobann. Seans gur tharla sé seo mar gheall ar fhabht i Tor féin nó i bhfeidhmchlár eile ar do chóras, nó mar gheall ar chrua-earra lochtach. Go dtí go dtosóidh tú Tor arís, ní bheidh Brabhsálaí Tor in ann aon suíomh Gréasáin a bhaint amach. Má mhaireann an fhadhb, seol cóip de do logchomhad Tor chuig an bhfoireann tacaíochta. -torlauncher.tor_exited2=Má atosaíonn tú Tor, ní dhúnfaidh do chuid cluaisíní brabhsálaí. -torlauncher.tor_controlconn_failed=Níorbh fhéidir ceangal le port rialaithe Tor. -torlauncher.tor_failed_to_start=Níor thosaigh Tor. -torlauncher.tor_control_failed=Níorbh fhéidir seilbh a ghabháil ar Tor. -torlauncher.tor_bootstrap_failed=Ní raibh Tor in ann ceangal le líonra Tor. -torlauncher.tor_bootstrap_failed_details=Theip ar %1$S (%2$S). - -torlauncher.unable_to_start_tor=Níorbh fhéidir Tor a thosú.\n\n%S -torlauncher.tor_missing=Tá an clár inrite Tor ar iarraidh. -torlauncher.torrc_missing=Tá an comhad torrc ar iarraidh agus níorbh fhéidir é a chruthú. -torlauncher.datadir_missing=Níl comhadlann sonraí Tor ann agus níorbh fhéidir é a chruthú. -torlauncher.password_hash_missing=Níl aon fháil ar an bhfocal faire haiseáilte. - -torlauncher.failed_to_get_settings=Ní féidir socruithe Tor a fháil.\n\n%S -torlauncher.failed_to_save_settings=Ní féidir socruithe Tor a shábháil.\n\n%S -torlauncher.ensure_tor_is_running=Ba cheart duit deimhniú go bhfuil Tor ar siúl. - -torlauncher.error_proxy_addr_missing=Caithfidh tú seoladh IP nó óstainm agus uimhir phoirt a sholáthar más mian leat seachfhreastalaí a úsáid chun teacht ar an Idirlíon trí Tor. -torlauncher.error_proxy_type_missing=Caithfidh tú cineál an tseachfhreastalaí a roghnú. -torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú. -torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. -torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. - -torlauncher.recommended_bridge=(molta) - -torlauncher.connect=Ceangail -torlauncher.restart_tor=Atosaigh Tor -torlauncher.quit=Éirigh as -torlauncher.quit_win=Scoir -torlauncher.done=Déanta - -torlauncher.forAssistance=Déan teagmháil le %S le cúnamh a fháil -torlauncher.forAssistance2=Tabhair cuairt ar %S le cúnamh a fháil - -torlauncher.copiedNLogMessages=Cóipeáílte. Tá %S teachtaireacht ón logchomhad Tor réidh le greamú in eagarthóir téacs nó i dteachtaireacht rphoist. - -torlauncher.bootstrapStatus.conn_dir=Ag ceangal le heolaire athsheachadán -torlauncher.bootstrapStatus.handshake_dir=Ceangal criptithe le heolaire á bhunú -torlauncher.bootstrapStatus.requesting_status=Stádas an líonra á fháil -torlauncher.bootstrapStatus.loading_status=Stádas an líonra á lódáil -torlauncher.bootstrapStatus.loading_keys=Teastais an údaráis á lódáil -torlauncher.bootstrapStatus.requesting_descriptors=Eolas faoin athsheachadán á iarraidh -torlauncher.bootstrapStatus.loading_descriptors=Eolas faoin athsheachadán á lódáil -torlauncher.bootstrapStatus.conn_or=Ag ceangal le líonra Tor -torlauncher.bootstrapStatus.handshake_or=Ciorcad Tor á bhunú -torlauncher.bootstrapStatus.done=Tá tú ceangailte le líonra Tor! - -torlauncher.bootstrapWarning.done=críochnaithe -torlauncher.bootstrapWarning.connectrefused=diúltaíodh an ceangal -torlauncher.bootstrapWarning.misc=éagsúil -torlauncher.bootstrapWarning.resourcelimit=easpa acmhainní -torlauncher.bootstrapWarning.identity=aitheantas mícheart -torlauncher.bootstrapWarning.timeout=ceangal thar am -torlauncher.bootstrapWarning.noroute=níl aon bhealach chuig an óstach -torlauncher.bootstrapWarning.ioerror=earráid léite/scríofa -torlauncher.bootstrapWarning.pt_missing=córas iompair ionphlugáilte ar iarraidh +torlauncher.error_title=Tor Launcher + +torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). + +torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.tor_missing=The Tor executable is missing. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.password_hash_missing=Failed to get hashed password. + +torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.ensure_tor_is_running=Please ensure that Tor is running. + +torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +torlauncher.error_proxy_type_missing=You must select the proxy type. +torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. + +torlauncher.recommended_bridge=(recommended) + +torlauncher.connect=Connect +torlauncher.restart_tor=Restart Tor +torlauncher.quit=Quit +torlauncher.quit_win=Exit +torlauncher.done=Done + +torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S + +torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. + +torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection +torlauncher.bootstrapStatus.requesting_status=Retrieving network status +torlauncher.bootstrapStatus.loading_status=Loading network status +torlauncher.bootstrapStatus.loading_keys=Loading authority certificates +torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information +torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit +torlauncher.bootstrapStatus.done=Connected to the Tor network! + +torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.resourcelimit=insufficient resources +torlauncher.bootstrapWarning.identity=identity mismatch +torlauncher.bootstrapWarning.timeout=connection timeout +torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.ioerror=read/write error +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index 7940a38..20c000f 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index b66952c..d5bf712 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index f1f9b10..cf3887c 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -1,75 +1,82 @@ <!ENTITY torsettings.dialog.title "הגדרות רשת Tor">  -<!ENTITY torlauncher.localePicker.title "שפת דפדפן Tor"> -<!ENTITY torlauncher.localePicker.prompt "אנא בחר שפה."> +<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> +<!ENTITY torlauncher.localePicker.prompt "Please select a language.">  -<!ENTITY torsettings.prompt "לפני שתתחבר לרשת Tor, אתה צריך לספק מידע על חיבור האינטרנט של מחשב זה."> +<!ENTITY torsettings.prompt "לפני שתתחבר לרשת Tor, עליך לספק מידע על חיבור האינטרנט של מחשב זה."> <!ENTITY torSettings.yes "כן"> <!ENTITY torSettings.no "לא"> -<!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר באופן הטוב ביותר את מצבך?"> -<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של מחשב זה מסונן או עובר דרך ייפוי-כוח."> -<!ENTITY torSettings.configurePrompt2 "אני צריך להגדיר הגדרות של גשר או ייפוי-כוח מקומי לפני שאתחבר לרשת Tor."> +<!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את מצבך בצורה המדויקת ביותר?"> +<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של מחשב זה מסונן או עובר דרך שרת פרוקסי."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "הגדר"> -<!ENTITY torSettings.connectPrompt2 "אני מעונין לעשות חיבור ישיר לרשת Tor."> -<!ENTITY torSettings.connectPrompt3 "זה יעבוד במרבית המצבים."> +<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt3 "דבר זה יעבוד במרבית המקרים."> <!ENTITY torSettings.connect "התחבר"> -<!ENTITY torSettings.proxyPageTitle "תצורת ייפוי-כוח מקומי"> -<!ENTITY torSettings.proxyQuestion "האם מחשב זה צריך להשתמש בייפוי-כוח מקומי כדי להשיג גישה לאינטרנט?"> +<!ENTITY torSettings.proxyPageTitle "הגדרות שרת פרוקסי מקומי"> +<!ENTITY torSettings.proxyQuestion "האם מחשב זה מוכרח להשתמש בשרת פרוקסי מקומי כדי לקבל גישה לאינטרנט?">  -<!ENTITY torSettings.proxyExplanation1 "ברוב המקרים ייפוי-כוח מקומי אינו נחוץ, אבל הוא עלול להיות דרוש בעת התחברות דרך רשת של חברה, בית ספר או אוניברסיטה."> -<!ENTITY torSettings.proxyExplanation2 "אם אינך בטוח כיצד לענות על שאלה זו, הבט בהגדרות האינטרנט בדפדפן אחר או בדוק בהגדרות הרשת של מערכתך כדי לראות האם ייפוי-כוח מקומי נחוץ."> -<!ENTITY torSettings.enterProxy "הכנס את הגדרות ייפוי-הכוח."> -<!ENTITY torSettings.bridgePageTitle "תצורת גשרי Tor"> -<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מצנזר חיבורים לרשת Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "אם אינך בטוח כיצד לענות על שאלה זו, בחר לא (אם אינך מסוגל להתחבר לרשת Tor ללא גשר, אתה יכול להוסיף אחד אחר כך)."> -<!ENTITY torSettings.bridgeExplanation2 "אם תבחר כן, תתבקש להגדיר גשרי Tor, שהם ממסרים שאינם ברשימה המקשים עוד יותר לחסום חיבורים לרשת Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "אתה יכול להשתמש בסדרת הגשרים המסופקת או שאתה יכול לקבל ולהכניס סדרת גשרים מותאמת."> +<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.enterProxy "הזן את הגדרות הפרוקסי."> +<!ENTITY torSettings.bridgePageTitle "הגדרת גשרים ל-Tor"> +<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מסנן חיבורים לרשת Tor ?"> +<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> +<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "באפשרותך להשתמש ברשימת הגשרים המוכנה או להשיג בעצמך ולהזין רשימת גשרים חדשה.">  -<!ENTITY torsettings.startingTor "ממתין אל Tor להתחיל..."> -<!ENTITY torsettings.restartTor "הפעל מחדש את Tor"> -<!ENTITY torsettings.reconfigTor "הגדר מחדש"> +<!ENTITY torsettings.startingTor "ממתין כעת עבור Tor כדי להתחיל…"> +<!ENTITY torsettings.restartTor "התחל מחדש את Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigure"> -<!ENTITY torsettings.discardSettings.prompt "הגדרת גשרי Tor או הכנסת הגדרות ייפוי-כוח מקומי.  כדי לעשות חיבור ישיר לרשת Tor, הגדרות אלו חייבות להיות מוסרות."> -<!ENTITY torsettings.discardSettings.proceed "הסר הגדרות והתחבר"> +<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> -<!ENTITY torsettings.optional "רשותי"> +<!ENTITY torsettings.optional "אופציונלי"> -<!ENTITY torsettings.useProxy.checkbox "מחשב זה צריך להשתמש בייפוי-כוח מקומי כדי להשיג גישה לאינטרנט"> -<!ENTITY torsettings.useProxy.type "סוג ייפוי-כוח:"> +<!ENTITY torsettings.useProxy.checkbox "מחשב זה חייב להשתמש בשרת פרוקסי מקומי על מנת להתחבר לאינטרנט"> +<!ENTITY torsettings.useProxy.type "סוג פרוקסי:"> <!ENTITY torsettings.useProxy.address "כתובת:"> <!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח"> -<!ENTITY torsettings.useProxy.port "פתחה:"> +<!ENTITY torsettings.useProxy.port "פורט:"> <!ENTITY torsettings.useProxy.username "שם משתמש:"> <!ENTITY torsettings.useProxy.password "סיסמה:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש המתירה חיבורים רק אל פתחות מסוימות"> -<!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות:"> -<!ENTITY torsettings.useBridges.checkbox "ספק שירותי האינטרנט שלי (ISP) חוסם חיבורים לרשת Tor"> -<!ENTITY torsettings.useBridges.default "התחבר עם גשרים מסופקים"> -<!ENTITY torsettings.useBridges.note "כל סוג של גשר משתמש בשיטה שונה כדי למנוע צנזורה.  אם גשר אחד אינו עובד, נסה שוב ע"י שימוש באחד אחר."> -<!ENTITY torsettings.useBridges.type "סוג תעבורה:"> -<!ENTITY torsettings.useBridges.custom "הכנס גשרים מותאמים"> -<!ENTITY torsettings.useBridges.label "הכנס ממסר גשר אחד או יותר (אחד לשורה):"> -<!ENTITY torsettings.useBridges.placeholder "הכנס כתובת:יציאה"> +<!ENTITY torsettings.firewall.checkbox "מחשב זה מחובר לאינטרנט דרך חומת אש המאפשר חיבורים רק לפורטים מסויימים "> +<!ENTITY torsettings.firewall.allowedPorts "פורטים מורשים:"> +<!ENTITY torsettings.useBridges.checkbox "ספק האינטרנט שלי (ISP) חוסם חיבורים לרשת Tor"> +<!ENTITY torsettings.useBridges.default "התחבר באמצעות הגשרים המוכנים מראש"> +<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.type "סוג מסווה תעבורה:"> +<!ENTITY torsettings.useBridges.custom "הזן רשימת גשרים חדשה"> +<!ENTITY torsettings.useBridges.label "הזן פרטי גשר אחד לפחות (אחד לכל שורה)"> +<!ENTITY torsettings.useBridges.placeholder "הזן כתובת:פורט address:port"> -<!ENTITY torsettings.copyLog "העתק את יומן Tor ללוח החיתוך"> -<!ENTITY torsettings.bridgeHelpTitle "עזרת ממסרי גשר"> +<!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה"> +<!ENTITY torsettings.bridgeHelpTitle "עזרה בנוגע לגשרים"> <!ENTITY torsettings.bridgeHelp1 "אם אין באפשרותך להתחבר לרשת Tor, ייתכן שהסיבה לכך היא שספק האינטרנט שלך או גורם אחר חוסמים את Tor. לעתים קרובות, ניתן להתגבר על בעיה זו באמצעות שימוש בגשרים, שהם שרתים חסויים שקשה יותר לחסום אותם."> -<!ENTITY torsettings.bridgeHelp1B "אתה יכול להשתמש בסדרה המוגדרת מראש המסופקת של כתובות גשר או שאתה יכול לקבל סדרת כתובות מותאמת ע"י שימוש באחת משיטות אלו:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "באמצעות רשת האינטרנט"> -<!ENTITY torsettings.bridgeHelp2 "השתמש בדפדפן רשת כדי לבקר ב-https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "באמצעות מגיב הדוא"לים האוטומטי"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "שלח דוא"ל אל bridges(a)torproject.org עם השורה 'get bridges' לבדה בגוף ההודעה.  אולם, כדי להקשות עוד יותר על תוקף ללמוד רבות על כתובות גשר, אתה חייב לשלוח בקשה זו מאחד מספקי הדוא"ל הבאים (כתובים ברשימה לפי סדר עדיפות):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com או https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "באמצעות מרכז התמיכה"> -<!ENTITY torsettings.bridgeHelp4 "כמוצא אחרון, אתה יכול לבקש כתובות גשר ע"י שליחה של הודעת דוא"ל מנומסת אל help(a)rt.torproject.org. אנא שים לב שבן-אדם יצטרך להגיב לכל בקשה."> +<!ENTITY torsettings.bridgeHelp2 "היעזר בדפדפן אינטרנט על מנת לבקר באתר https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "דרך שירות הדואל האוטומטי"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "שלח דואל לכתובת bridges(a)torproject.org עם השורה "get bridges" ללא גרשיים בתוך גוף ההודעה. אולם, כדי להקשות עוד יותר על תוקפים לצבור מאגר כתובות של גשרים, עליך לשלוח בקשה זו מתוך אחד מספקי הדואל הבאים בלבד (בסדר עדיפויות יורד):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net +https://mail.google.com +https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "באמצעות צוות התמיכה שלנו"> +<!ENTITY torsettings.bridgeHelp4 "כמוצא אחרון, תוכל לבקש רשימת גשרים באמצעות פנייה מנומסת בדואל לכתובת הבאה: +help(a)rt.torproject.org +אנא זכור שבן אנוש ייאלץ להשיב באופן אישי לכל בקשה שכזו."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index baf9d05..85265fb 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -1,63 +1,63 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=משגר Tor - -torlauncher.tor_exited_during_startup=Tor יצא במהלך ההזנק. ייתכן שזה עקב שגיאה בקובץ torrc שלך, תקל ב-Tor או בתכנית אחרת במערכתך, או חומרה תקולה. עד שלא תתקן את הבעיה המשתמעת ותפעיל מחדש את Tor, דפדפן Tor לא יתחיל. -torlauncher.tor_exited=Tor יצא באופן בלתי צפוי. ייתכן שזה עקב תקל ב-Tor עצמו, תכנית אחרת במערכתך או חומרה תקולה. עד שתפעיל מחדש את Tor, דפדפן Tor לא יהיה מסוגל להגיע לכל אתר שהוא. אם הבעיה נמשכת, אנא שלח עותק של יומן Tor שלך אל צוות התמיכה שלנו. -torlauncher.tor_exited2=הפעלת Tor מחדש לא תסגור את לשוניות הדפדפן שלך. -torlauncher.tor_controlconn_failed=לא היה יכול להתחבר אל פתחת הבקרה של Tor. -torlauncher.tor_failed_to_start=Tor נכשל להתחיל. -torlauncher.tor_control_failed=נכשל בלקיחת שליטה על Tor. -torlauncher.tor_bootstrap_failed=Tor נכשל בהקמת חיבור רשת Tor. +torlauncher.error_title=תוכנת ההפעלה של Tor + +torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited=Tor הפסיק לעבוד באופן פתאומי. ייתכן שהדבר אירע עקב תקלה ב-Tor עצמה, בשל תוכנה אחרת הפועלת על המערכת שלך, או בגין תקלת חומרה. כל עוד לא תפעיל מחדש את Tor, דפדפן Tor ימנע ממך לגלוש באינטרנט. אם הבעיה נמשכת, אנא שלח עותק מיומן הרישום של Tor לצוות התמיכה שלנו. +torlauncher.tor_exited2=התחלה מחדש של Tor לא תסגור את כרטיסיות הדפדפן שלך. +torlauncher.tor_controlconn_failed=נכשל החיבור לפורט השליטה של Tor. +torlauncher.tor_failed_to_start=הפעלת Tor נכשלה. +torlauncher.tor_control_failed=כשלה נטילת השליטה על Tor. +torlauncher.tor_bootstrap_failed=נכשל הניסיון להקים חיבור יציב לרשת Tor. torlauncher.tor_bootstrap_failed_details=%1$S נכשל (%2$S). -torlauncher.unable_to_start_tor=לא היה ניתן להתחיל את Tor.\n\n%S -torlauncher.tor_missing=קובץ ההפעלה של Tor חסר. -torlauncher.torrc_missing=קובץ ה-torrc חסר ולא היה יכול להיווצר. -torlauncher.datadir_missing=סיפריית הנתונים של Tor אינה קיימת ולא יכלה להיווצר. -torlauncher.password_hash_missing=נכשל בהשגת סיסמה מעורבלת. +torlauncher.unable_to_start_tor=אין אפשרות להפעיל את Tor.\n\n%S +torlauncher.tor_missing=קובץ ההפעלה של Tor איננו קיים. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.password_hash_missing=כשל בהשגת סיסמה מעורבלת. -torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות Tor.\n\n%S -torlauncher.failed_to_save_settings=לא היה ניתן לשמור הגדרות Tor.\n\n%S -torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל. +torlauncher.failed_to_get_settings=אין אפשרות לאחזר הגדרות Tor.\n\n%S +torlauncher.failed_to_save_settings=אין אפשרות לשמור הגדרות Tor.\n\n%S +torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל כעת. -torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי להגדיר את Tor להשתמש בייפוי-כוח כדי לגשת לאינטרנט. -torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. -torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. -torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. -torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. +torlauncher.error_proxy_addr_missing=עליך לציין גם כתובת IP או שם מארח וגם מספר פורט כדי לאפשר ל-Tor להיעזר בשרת פרוקסי על מנת לגשת לרשת האינטרנט. +torlauncher.error_proxy_type_missing=עליך לבחור את סוג שרת הפרוקסי. +torlauncher.error_bridges_missing=עליך לבחור בגשר אחד לפחות. +torlauncher.error_default_bridges_type_missing=עליך לבחור באיזה סוג של מסווה תעבורה תרצה להשתמש בגשרים שבחרת. +torlauncher.error_bridge_bad_default_type=גשרים בעלי מסווה תעבורה מסוג %S אינם זמינים כעת. אנא בחר סוג אחר. torlauncher.recommended_bridge=(מומלץ) torlauncher.connect=התחבר -torlauncher.restart_tor=הפעל מחדש את Tor +torlauncher.restart_tor=התחל מחדש את Tor torlauncher.quit=צא torlauncher.quit_win=יציאה torlauncher.done=בוצע torlauncher.forAssistance=לתמיכה, צור קשר עם %S -torlauncher.forAssistance2=לתמיכה, בקר ב-%S +torlauncher.forAssistance2=For assistance, visit %S -torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות יומן אירועים של Tor מוכנות להדבקה לתוך עורך מלל או להודעת דוא"ל. +torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות מיומן הרישום של Tor מוכנות להעתקה לתוך עורך טקסט או להודעת דואל. -torlauncher.bootstrapStatus.conn_dir=מתחבר לסיפריית ממסרים -torlauncher.bootstrapStatus.handshake_dir=מקים חיבור סיפרייה מוצפן -torlauncher.bootstrapStatus.requesting_status=מאחזר מיצב רשת -torlauncher.bootstrapStatus.loading_status=טוען מיצב רשת -torlauncher.bootstrapStatus.loading_keys=טוען אישורי רָשׁוּת -torlauncher.bootstrapStatus.requesting_descriptors=מבקש מידע ממסר -torlauncher.bootstrapStatus.loading_descriptors=טוען מידע ממסר +torlauncher.bootstrapStatus.conn_dir=מתחבר למאגר שרתים +torlauncher.bootstrapStatus.handshake_dir=מקים כעת חיבור מוצפן למאגר שרתים +torlauncher.bootstrapStatus.requesting_status=מתעדכן כעת במצב הרשת +torlauncher.bootstrapStatus.loading_status=טוען את מצב הרשת +torlauncher.bootstrapStatus.loading_keys=טוען את אישורי האבטחה של הרשות +torlauncher.bootstrapStatus.requesting_descriptors=מבקש רשימת שרתים +torlauncher.bootstrapStatus.loading_descriptors=טוען רשימת שרתים torlauncher.bootstrapStatus.conn_or=מתחבר אל רשת Tor -torlauncher.bootstrapStatus.handshake_or=מקים מעגל Tor +torlauncher.bootstrapStatus.handshake_or=מקים נתיב Tor torlauncher.bootstrapStatus.done=מחובר לרשת Tor! torlauncher.bootstrapWarning.done=בוצע torlauncher.bootstrapWarning.connectrefused=החיבור סורב torlauncher.bootstrapWarning.misc=שונות -torlauncher.bootstrapWarning.resourcelimit=משאבים בלתי מספיקים +torlauncher.bootstrapWarning.resourcelimit=משאבים לא מספיקים torlauncher.bootstrapWarning.identity=זהות אינה תואמת torlauncher.bootstrapWarning.timeout=החיבור פקע -torlauncher.bootstrapWarning.noroute=אין נתיב למארח -torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה -torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה +torlauncher.bootstrapWarning.noroute=אין נתיב לארח +torlauncher.bootstrapWarning.ioerror=שגיאת קריאה/כתיבה +torlauncher.bootstrapWarning.pt_missing=חסר מסווה תעבורה diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 3b7b724..61a87d4 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 0e4d96a..2834a8b 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -75,3 +75,6 @@ s Tor mrežom?"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ili https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Deska"> <!ENTITY torsettings.bridgeHelp4 "Na kraju, možete zatražiti adrese mostova tako što će te poslati pristojan email na help(a)rt.torproject.org.  Imajte na umu da će na svaki zahtjev morati odgovoriti osoba."> + + +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 874dda9..0ba50d8 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index e8fc42e..b52082e 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vagy https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A támogatáson keresztül."> <!ENTITY torsettings.bridgeHelp4 "Utolsó lehetőségként küldj egy udvarias bridge igénylő emailt ide: help(a)rt.torproject.org.  Légyszíves vedd figyelembe az adott személynek több emailt kell megválaszolnia."> + + +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index f6b89c5..84a2881 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index 213562d..e952b09 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index b9bd75e..58a9c71 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index c5815c6..3fbef36 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Sebagai pilihan terakhir anda dapat meminta alamat bridge dengan mengirimkan pesan email dengan sopan ke help(a)rt.torproject.org.  Silakan catat bahwa petugas akan merespon masing-masing permintaan"> + + +<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.  Ini mungkin memakan waktu beberapa menit."> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index c7c6164..28e8ddb 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -29,7 +29,7 @@ <!ENTITY torSettings.bridgeQuestion "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar inn á Tor-netið?"> <!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> <!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Þú gætir notað meðfylgjandi sett af brúartengingum eða að þú getur náð í og sett inn sérsniðið sett af brúm."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -57,19 +57,22 @@ <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.default "Tengjast með tiltækum brúm"> <!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Gerð tengileiðar:"> +<!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Settu inn sérsniðnar brýr"> <!ENTITY torsettings.useBridges.label "Settu inn einn eða fleiri endurvarpa fyrir brýr (einn á hverja línu)."> <!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt"> <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> <!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> -<!ENTITY torsettings.bridgeHelp1 "Ef þér tekst ekki að tengjast Tor-netinu, þá gæti það verið vegna þess að netþjónustuaðillinn þinn (ISP) eða einhver annar aðili sé að loka á Tor.  Oft er hægt að fara í kringum þetta með því að nota Tor-brýr (bridges), sem eru óskráðir endurvarpar sem erfitt er að loka á."> -<!ENTITY torsettings.bridgeHelp1B "Þú gætir notað forstillt, meðfylgjandi sett af brúarvistföngum eða að þú getur náð í sérsniðið sett af vistföngum með einhverri þessara aðferða."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Í gegnum vefinn"> <!ENTITY torsettings.bridgeHelp2 "Notaðu vafra til að skoða https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Í gegnum sjálfvirka tövupóstsvörun"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eða https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Í gegnum hjálparborðið"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c227b2f..5ac6c53 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -5,7 +5,7 @@ torlauncher.error_title=Tor-ræsir torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Endurræsing Tor mun ekki loka flipum vafrans. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor ræstist ekki. torlauncher.tor_control_failed=Mistókst að ná stjórn yfir Tor. @@ -45,9 +45,9 @@ torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection torlauncher.bootstrapStatus.requesting_status=Næ í stöðu netkerfis torlauncher.bootstrapStatus.loading_status=Hleð inn stöðu netkerfis -torlauncher.bootstrapStatus.loading_keys=Hleð inn skilríkjum vottunarstöðvar -torlauncher.bootstrapStatus.requesting_descriptors=Bið um upplýsingar endurvarpa -torlauncher.bootstrapStatus.loading_descriptors=Hleð inn upplýsingum endurvarpa +torlauncher.bootstrapStatus.loading_keys=Loading authority certificates +torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information +torlauncher.bootstrapStatus.loading_descriptors=Loading relay information torlauncher.bootstrapStatus.conn_or=Tengist Tor-netinu torlauncher.bootstrapStatus.handshake_or=Kem á Tor-rás torlauncher.bootstrapStatus.done=Tengdur við Tor-netið! diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index b7a4411..943e24c 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help(a)rt.torproject.org.  Tieni conto che una persona dovrà rispondere ad ogni singola richiesta."> + + +<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 724a4ee..16fee49 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由"> <!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)rt.torproject.org に丁寧なメールメッセージを送信して、ブリッジアドレスをリクエストすることができます。  人間が各リクエストに対応する必要があることにご注意ください。"> + + +<!ENTITY torprogress.pleaseWait "Torネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。"> diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index d75f96d..236b7ea 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index 478fe43..3787679 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index c58339f..0d10dbc 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "តាមរយៈជំនួយ"> <!ENTITY torsettings.bridgeHelp4 "នៅជម្រើសចុងក្រោយ អ្នកអាចស្នើអាសយដ្ឋានប៊្រីតដោយផ្ញើសារអ៊ីមែលគួរសមទៅ help(a)rt.torproject.org.  សូមចំណាំថា មនុស្សម្នាក់នឹងត្រូវឆ្លើយតបទៅសំណើនីមួយៗ។"> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index e18a7cc..2a9f2c7 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index e6e9760..0908a1d 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 8599b02..64e87cb 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 또는 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> <!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의 해주십시오"> + + +<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다."> diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index 74be4e1..a94a6ac 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index 9e4060c..77fa7af 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index 99bf72b..e28f84e 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yye"> -<!ENTITY torSettings.no "Nedda"> +<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index f0fdd8f..31cb0e6 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ."> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 0da969f..ecf78f0 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ar https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.  Tai gali užtrukti kelias minutes."> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index aeb6381..d10497d 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> + + +<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor.  tam var būt nepieciešamas vairākas minūtes."> diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 1f69d4f..00d6235 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 9c863a6..24bb4d6 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=കഴിഞ്ഞു +torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index ede666b..b0fef6d 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 237f08d..71a3a6e 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index 8f58545..80448c5 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 56f41f1..06e1054 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> <!ENTITY torsettings.bridgeHelp4 "Som en siste utvei, kan du be om bro-adresser ved å sende en høflig e-post til help(a)rt.torproject.org.  Tenk over at en person må svare på hver slik forespørsel."> + + +<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 0bb82b1..65951d6 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -26,7 +26,7 @@ torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller v torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. -torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. +torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Juster innstillingene dine. torlauncher.recommended_bridge=(anbefalt) diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 57eb5f2..9b1f1a7 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index 1c932a4..d313b6e 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via de Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index 373249e..e63e160 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -53,7 +53,7 @@ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! torlauncher.bootstrapWarning.done=klaar -torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd +torlauncher.bootstrapWarning.connectrefused=connection refused torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index d7fa414..bb0bbe8 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk"> <!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel kan je bridge-adressen aanvragen door een vriendelijke e-mail te sturen naar help(a)rt.torproject.org.  Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen."> + + +<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 3b23940..f631124 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index b02946f..32da454 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡੈਸਕ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index 9a2f3f6..de9ccac 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -53,3 +53,6 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + +<!ENTITY torprogress.pleaseWait "Przeglądarka Tor uruchomi się po połączeniu z siecią Tor"> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 18b1a48..cfb082d 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, lub https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk"> <!ENTITY torsettings.bridgeHelp4 "W ostateczności, można zażądać adresów mostów, wysyłając uprzejmą wiadomość e-mail do help(a)rt.torproject.org.  Należy pamiętać, że osoba będzie musiała odpowiedzieć na każde żądanie."> + + +<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index f7cf95b..7bbaedc 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pelo Serviço de Assistência"> <!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org.  Por favor, entenda que uma pessoa terá que responder a cada solicitação"> + + +<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 5c0ae5c..4250124 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help(a)rt.torproject.org.  Por favor, note que uma pessoa irá precisar de responder a cada pedido."> + + +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index d5f561a..c99dc80 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> + + +<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index ed79f3c..20117a1 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> <!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.  Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком."> + + +<!ENTITY torprogress.pleaseWait "Подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index 5eae3c6..adaa33f 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index 11e3069..eca83b0 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index 1831549..f6c15c9 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prostredníctvom Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help(a)rt.torproject.org a požiadať o adresy premostenia.  Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať."> + + +<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index f86e26a..17e8026 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, alebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Cez Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako poslednú možnosť si môžete vyžiadať adresy mostov zaslaním zdvorilého emailu na adresu help(a)rt.torproject.org.  Prosíme berte na vedomie, že príslušná osoba musí odpovedať na každú jednu podobnú žiadosť."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 6ddb6e3..5ba1f32 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Preko table Pomoči"> <!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s pošiljanjem olikanega e-sporočila na help(a)rt.torproject.org.  Prosimo, upoštevajte, da dotična oseba odgovarja na vsako zahtevo."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index b7c53c2..c89784c 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd index 75ece3b..9c78c3c 100644 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ b/src/chrome/locale/sq-AL/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index ffa38c1..c0fd25a 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Përmes Help Desk-ut"> <!ENTITY torsettings.bridgeHelp4 "Si mjet të fundit, ju mund të kërkoni adresat urë, duke dërguar një mesazh e-poste me politesë tek help(a)rt.torproject.org.  Ju lutemi vini re se një person do të duhet t'i përgjigjet çdo kërkese."> + + +<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index be5b44b..e27b1ab 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 67da423..9f1ed4a 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index 6ce1473..a62de6e 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -53,3 +53,6 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + +<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 0648ead..4b118b6 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> <!ENTITY torsettings.bridgeHelp4 "Som en sista utväg kan du skicka ett artigt e-post meddelande på engelska till help(a)rt.torproject.org, och fråga efter bryggadresser.  Tänk på att en person måste svara på varje sådan förfrågan."> + + +<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 02e8fad..70a6dd5 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index bb258de..19661a8 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index 1934a14..24bb4d6 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Иҷро шуд +torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index 240e71b..ded8092 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 2d99d30..1114d4a 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ya da https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Yardım masası yoluyla"> <!ENTITY torsettings.bridgeHelp4 "Son yol olarak, köprü adreslerini help(a)rt.torproject.org adresine göndereceğiniz nazik bir e-posta ile isteyebilirsiniz.  Her isteği bir kişinin yanıtlayacağını unutmayın."> + + +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 5df3df6..4ed6ade 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com або https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Через допомогу"> <!ENTITY torsettings.bridgeHelp4 "У крайньому випадку, Ви можете отримати адресу мосту, відправивши ввічливе повідомлення на адресу help(a)rt.torproject.org.  Зверніть увагу на те, що кожен запит обробляється людиною."> + + +<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index 67a1700..9243e1a 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index de0c4e6..bb905b0 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index c3dc757..f18ebee 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index e5d368a..b48aed1 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Thông qua Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Như là phương thức cuối cùng, bạn có thể yêu cầu địa chỉ cầu nối bằng cách gửi một email lịch sự tới help(a)rt.torproject.org.  Vui lòng lưu ý rằng một người cần phải phản hồi tới từng yêu cầu."> + + +<!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút."> diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index fe39f0f..bad6552 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net，https://mail.google.com 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> <!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。"> + + +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 27fe26a..03cf6a1 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> <!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> + + +<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 5e6d31e..dff397b 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> <!ENTITY torsettings.bridgeHelp4 "最後的方法是：您可以發送一封禮貌性的郵件到 help(a)rt.torproject.org.  請注意，對於此類郵件我們必需要一封封地手動回覆。"> + + +<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">

1 0

[tor-browser-build/master] Fix typo in Changelog
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 03d2028b3a49b1c98d91a6515537332810f12771 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 17:47:50 2017 +0000 Fix typo in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 94dedf2..a7d273a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 7.5a7 -- November 15 2017 +Tor Browser 7.5a8 -- November 15 2017 * All Platforms * Update Firefox to 52.5.0esr * Update Tor to 0.3.2.4-alpha

1 0

[tor-browser-build/master] Added missing sandboxed-tor-browser item in Changelog
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c753150dde708c77b74b5f673e7f2563828d9edf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 11:05:14 2017 +0000 Added missing sandboxed-tor-browser item in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 30b3cf9..aa33fff 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -28,6 +28,7 @@ Tor Browser 7.5a6 -- October 19 2017 * Update NoScript to 5.1.2 * Bug 23723: Loading entities from NoScript .dtd files is blocked * Bug 23724: NoScript update breaks Security Slider and its icon disappears + * Update sandboxed-tor-browser to 0.0.14 * Bug 23745: Tab crashes when using Tor Browser to access Google Drive * Bug 23694: Update the detailsURL in update responses * Bug 22501: Requests via javascript: violate FPI

1 0

[tor-browser-build/master] Release preparations for 7.5a8
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c66cabcdd8b364780be5ad6f80d31d7a414e8aac Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 11:18:02 2017 +0000 Release preparations for 7.5a8 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/sandbox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 3 ++- 9 files changed, 32 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 24bb711..5b64726 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.4.1 + firefox_platform_version: 52.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/sandbox/config b/projects/sandbox/config index 0a79ac9..03b6f6d 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.14 +version: 0.0.15 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aa33fff..94dedf2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 7.5a7 -- November 15 2017 + * All Platforms + * Update Firefox to 52.5.0esr + * Update Tor to 0.3.2.4-alpha + * Update Torbutton to 1.9.8.3 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + * Update Tor Launcher to 0.2.14 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Translations update + * Update HTTPS-Everywhere to 2017.10.30 + * Update NoScript to 5.1.5 + * Bug 23968: NoScript icon jumps to the right after update + * Update sandboxed-tor-browser to 0.0.15 + * Bug 10394: Don't autoupdate HTTPS Everywhere anymore + * Windows + * Bug 20636+10026: Create 64bit Tor Browser for Windows + * Bug 24052: Block file:// redirects early + Tor Browser 7.5a7 -- November 4 2017 * OS X * Bug 24052: Streamline handling of file:// resources diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6b7559a..06400be 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb + sha256sum: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ce9cc90..69da745 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.13 +version: 0.2.14 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index af829cd..e704f13 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.2-alpha +version: 0.3.2.4-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 6e45ef8..f92bb48 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.2 +version: 1.9.8.3 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 34a22bf..394be49 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a7' + torbrowser_version: '7.5a8' torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5a6 + - 7.5a7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 79eda21ffabcdd4c3b5b4e8aedccf0cf3111ad26 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 17:24:49 2017 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index ae44aa6..e660e2f 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.13</em:version> + <em:version>0.2.14</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-browser-build/master] Bug 20636: remove fte from bridge_prefs.js for Windows 64
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 3c517c1a36a4e9f1251679fc4c129569a874be76 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 9 11:18:18 2017 +0100 Bug 20636: remove fte from bridge_prefs.js for Windows 64 --- projects/tor-browser/build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f9740f7..022d6e9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -118,7 +118,10 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB [% END -%] [% IF c("var/windows") -%] # We don't have snowflake available on Windows yet - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + # We don't have fte available on Windows x86_64 yet + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ + >> $TBDIR/$EXTOVERRIDESPATH [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495.

1 0

[tor-browser/tor-browser-52.4.1esr-7.5-1] Bug 24052: Handle redirects by blocking them early
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit a99a3504e931768ce57dd26d3ae784576da7c5ac Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 1 02:33:18 2017 -0700 Bug 24052: Handle redirects by blocking them early This is the second part of the workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. --- netwerk/protocol/http/nsHttpChannel.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 0e570e8cb57d..b38be48bf0c9 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) return NS_ERROR_CORRUPTED_CONTENT; } + bool isRedirectToFile = false; + rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); + if (!NS_FAILED(rv) && isRedirectToFile) { + LOG(("Attempted to redirect from a remote page to a file:// URI.")); + return NS_ERROR_FAILURE; + } + if (mApplicationCache) { // if we are redirected to a different origin check if there is a fallback // cache entry to fall back to. we don't care about file strict

1 0

[tor-browser/tor-browser-52.4.1esr-7.5-1] Bug 24052: Streamline handling of file:// resources
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c6e2b905b793c803c73b7d3e5a1a2926e34df8f2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 27 20:40:57 2017 +0000 Bug 24052: Streamline handling of file:// resources We should make sure restrictions regarding loading of file:// resources are adhered to more strictly, at least on *nix platforms. This is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. --- netwerk/base/nsIOService.cpp | 8 ++++++++ netwerk/protocol/file/nsFileProtocolHandler.cpp | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index 0da79c18ae41..0cc67da7b18f 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -789,12 +789,20 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, // if calling newChannel2() fails we try to fall back to // creating a new channel by calling NewChannel(). if (NS_FAILED(rv)) { +#ifdef XP_UNIX + if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) { + return rv; + } else { +#endif rv = handler->NewChannel(aURI, getter_AddRefs(channel)); NS_ENSURE_SUCCESS(rv, rv); // The protocol handler does not implement NewChannel2, so // maybe we need to wrap the channel (see comment in MaybeWrap // function). channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo); +#ifdef XP_UNIX + } +#endif } } diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp index e55cb9d47460..c24c928b6f02 100644 --- a/netwerk/protocol/file/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp @@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri, nsILoadInfo* aLoadInfo, nsIChannel** result) { +#ifdef XP_UNIX + if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) { + if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) { + return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; + } + } +#endif nsFileChannel *chan = new nsFileChannel(uri); if (!chan) return NS_ERROR_OUT_OF_MEMORY;

1 0

[torbutton/master] Version bump and CHANGELOG update
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 787d41133a5bafc76fa88ec64707b89ef512df71 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 10:16:59 2017 +0000 Version bump and CHANGELOG update --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index d2209b0..f0dac84 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.9.8.3 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + 1.9.7.9 * Bug 23949: Fix donation banner display * Update locales with translated banner diff --git a/src/install.rdf b/src/install.rdf index 30f2ddd..423edd7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.8.2</em:version> + <em:version>1.9.8.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] Fold in stable changelogs
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit b4add1679579c443274987229963a14643290437 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 10:14:06 2017 +0000 Fold in stable changelogs --- src/CHANGELOG | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0eb1e0e..d2209b0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,7 +1,22 @@ +1.9.7.9 + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + 1.9.8.2 * Bug 23887: Update banner locales and Mozilla text * Translations update +1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + 1.9.8.1 * Bug 20375: Warn users after entering fullscreen mode * Bug 22989: Fix dimensions of new windows on macOS @@ -9,6 +24,14 @@ * Bug 23483: Donation banner on about:tor for 2017 (testing mode) * Translations Update +1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + +1.9.7.6 + * Bug 22989: Fix dimensions of new windows on macOS + * Translations update + 1.9.8 * Bug 22610: Avoid crashes when canceling external helper app related downloads * Bug 22472: Fix FTP downloads when external helper app dialog is shown @@ -22,6 +45,14 @@ * Code clean-up * Translations update +1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + 1.9.7.4 * Bug 22542: Security Settings window too small on macOS 10.12

1 0

[tor-browser-build/master] Bug 20636: fix tor-browser bundle step for Windows 64
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 5a89431f10be74e1f08cdd804d24999ffd899426 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 13:01:25 2017 +0100 Bug 20636: fix tor-browser bundle step for Windows 64 --- projects/tor-browser/build | 4 ++-- projects/tor-browser/config | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 6540245..f9740f7 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -270,7 +270,7 @@ cd $distdir python $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe torbrowser-install.exe rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe + mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe popd [% END %] rm -rf $distdir/${PKG_DIR} @@ -344,7 +344,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe torbrowser-install.exe rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install-[% c("var/torbrowser_version") %]_[% lang %].exe + mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_[% lang %].exe popd [% END %] rm -rf [% tbdir %] diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 54a0e9e..6b7559a 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,11 +24,20 @@ targets: - python - bzip2 - faketime - windows-i686: + windows: var: - mar_osname: win32 arch_deps: - python-pefile + windows-i686: + var: + mar_osname: win32 + windows-x86_64: + var: + mar_osname: win64 + # We use a 32bit container to be able to use a 32bit nsis and + # pe_checksum_fix.py + container: + arch: i386 input_files: - project: container-image

1 0

[tor-browser-build/master] Bug 20636: add Makefile rules for Windows 64 builds
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit fa215970fa0bd34454999ea5a92fe565f80dac7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 13:08:04 2017 +0100 Bug 20636: add Makefile rules for Windows 64 builds --- Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Makefile b/Makefile index ce63e54..54965ef 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,9 @@ release-linux-i686: submodule-update release-windows-i686: submodule-update $(rbm) build release --target release --target torbrowser-windows-i686 +release-windows-x86_64: submodule-update + $(rbm) build release --target release --target torbrowser-windows-x86_64 + release-osx-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-osx-x86_64 @@ -29,6 +32,9 @@ alpha-linux-i686: submodule-update alpha-windows-i686: submodule-update $(rbm) build release --target alpha --target torbrowser-windows-i686 +alpha-windows-x86_64: submodule-update + $(rbm) build release --target alpha --target torbrowser-windows-x86_64 + alpha-osx-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-osx-x86_64 @@ -44,6 +50,9 @@ nightly-linux-i686: submodule-update nightly-windows-i686: submodule-update $(rbm) build release --target nightly --target torbrowser-windows-i686 +nightly-windows-x86_64: submodule-update + $(rbm) build release --target nightly --target torbrowser-windows-x86_64 + nightly-osx-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-osx-x86_64 @@ -59,6 +68,9 @@ alpha_nightly-linux-i686: submodule-update alpha_nightly-windows-i686: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-windows-i686 +alpha_nightly-windows-x86_64: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-windows-x86_64 + alpha_nightly-osx-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 @@ -71,6 +83,9 @@ testbuild-linux-x86_64: submodule-update testbuild-linux-i686: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-i686 +testbuild-windows-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-windows-x86_64 + testbuild-windows-i686: submodule-update $(rbm) build release --target testbuild --target torbrowser-windows-i686

1 0

[tor-browser-build/master] Bug 20636: add Windows 64 to projects/release/config
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c00ea668caa435a6e7aa56fefc0470102df2fcbf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 13:21:04 2017 +0100 Bug 20636: add Windows 64 to projects/release/config --- projects/release/build | 4 ++++ projects/release/config | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/projects/release/build b/projects/release/build index db265c7..2be0c49 100644 --- a/projects/release/build +++ b/projects/release/build @@ -8,6 +8,10 @@ mkdir -p "$destdir" mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-windows-x86_64") -%] + mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ [% END -%] diff --git a/projects/release/config b/projects/release/config index 4ecbc0a..674ec80 100644 --- a/projects/release/config +++ b/projects/release/config @@ -12,6 +12,7 @@ targets: - torbrowser-linux-x86_64 - torbrowser-linux-i686 - torbrowser-windows-i686 + - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 torbrowser-linux-x86_64: var: @@ -22,6 +23,9 @@ targets: torbrowser-windows-i686: var: torbrowser-windows-i686: 1 + torbrowser-windows-x86_64: + var: + torbrowser-windows-x86_64: 1 torbrowser-osx-x86_64: var: torbrowser-osx-x86_64: 1 @@ -96,6 +100,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-windows-i686 + - name: windows-x86_64 + project: tor-browser + enable: '[% c("var/torbrowser-windows-x86_64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-windows-x86_64 + - name: osx-x86_64 project: tor-browser enable: '[% c("var/torbrowser-osx-x86_64") %]' @@ -111,6 +122,14 @@ input_files: - torbrowser-windows-i686 - expert-bundle + - name: windows64-expert-bundle + project: tor + enable: '[% c("var/torbrowser-windows-x86_64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-windows-x86_64 + - expert-bundle + steps: signtag: build_log: '-'

1 0

[tor-browser-build/master] Bug 20636: fix Windows 64 expert bundle filename
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit d37b7a0e0de0057a7a44ae36ac6f10a849299e2a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 21:18:19 2017 +0100 Bug 20636: fix Windows 64 expert bundle filename --- projects/tor/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor/build b/projects/tor/build index 86d4384..24617ce 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -105,9 +105,10 @@ cd $distdir mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/expert_bundle"); + SET win_arch = c('var/windows-x86_64') ? 'win64' : 'win32'; c('zip', { zip_src => [ 'Data', 'Tor', ], - zip_args => dest_dir _ '/' _ c('filename') _ '/tor-win32-' _ c("version") _ '.zip', + zip_args => dest_dir _ '/' _ c('filename') _ '/tor-' _ win_arch _ '-' _ c("version") _ '.zip', }); ELSE; IF c("var/osx");

1 0

[tor-browser-build/master] Bug 20636: fix projects/fonts for Windows 64
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit d0a79f2f2422cfac5155a7f455136e295b50ef95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 12:26:40 2017 +0100 Bug 20636: fix projects/fonts for Windows 64 --- projects/fonts/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fonts/config b/projects/fonts/config index 382804d..e939ad1 100644 --- a/projects/fonts/config +++ b/projects/fonts/config @@ -75,7 +75,7 @@ targets: - NotoSansCherokee-Regular.ttf - NotoSansMongolian-Regular.ttf - NotoSansYi-Regular.ttf - windows-i686: + windows: var: noto_fonts_hinted: - NotoSansKhmer-Regular.ttf

1 0

[tor-browser-build/master] Bug 20636: don't build fteproxy for Windows 64 for now
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 5341706993dfa6ee3b2c8b674e003eeb9e09c1c0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 30 12:09:37 2017 +0100 Bug 20636: don't build fteproxy for Windows 64 for now --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 79d7055..34a22bf 100644 --- a/rbm.conf +++ b/rbm.conf @@ -198,6 +198,7 @@ targets: export RBM_SETARCH=1 exec setarch i686 ./build fi + fteproxy: 1 windows: var: windows: 1 @@ -217,7 +218,6 @@ targets: - zip - unzip faketime_path: /usr/lib/faketime/libfaketime.so.1 - fteproxy: 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

1 0

[tor-browser-build/master] Bug 23229: build firefox for Windows 64
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 4f71f0121be989e80a74cc7f0d476407bf7fc329 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 8 12:10:25 2017 +0200 Bug 23229: build firefox for Windows 64 --- projects/firefox-langpacks/config | 3 +++ projects/firefox/config | 4 ++++ projects/firefox/mozconfig-windows-x86_64 | 29 +++++++++++++++++++++++++++++ projects/gcc/config | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -12,6 +12,9 @@ targets: windows-i686: var: ff_arch: win32 + windows-x86_64: + var: + ff_arch: win64 osx-x86_64: var: ff_arch: mac diff --git a/projects/firefox/config b/projects/firefox/config index 055fe57..24bb711 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -66,6 +66,10 @@ targets: var: martools_filename: mar-tools-win32.zip + windows-x86_64: + var: + martools_filename: mar-tools-win64.zip + input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 new file mode 100644 index 0000000..669c124 --- /dev/null +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -0,0 +1,29 @@ +CROSS_COMPILE=1 + +ac_add_options --enable-application=browser +ac_add_options --target=x86_64-w64-mingw32 +ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- +ac_add_options --enable-default-toolkit=cairo-windows +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-official-branding + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar + +# We can't build the sandbox code with mingw-w64: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 +ac_add_options --disable-sandbox +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --disable-crashreporter +ac_add_options --disable-maintenance-service +ac_add_options --disable-webrtc +ac_add_options --disable-tests diff --git a/projects/gcc/config b/projects/gcc/config index de4ecc5..03241ef 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -37,7 +37,7 @@ var: popd targets: - windows-i686: + windows: var: configure_opt: --disable-multilib --enable-languages=c,c++ arch_deps:

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 34eeec4bd5d1f73da11a78b8aa4e9d78211b213b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 08:36:27 2017 +0000 Translations update --- src/chrome/locale/ach/network-settings.dtd | 3 - src/chrome/locale/ady/network-settings.dtd | 3 - src/chrome/locale/af/network-settings.dtd | 3 - src/chrome/locale/ak/network-settings.dtd | 3 - src/chrome/locale/am-ET/network-settings.dtd | 3 - src/chrome/locale/am/network-settings.dtd | 3 - src/chrome/locale/ar/network-settings.dtd | 3 - src/chrome/locale/arn/network-settings.dtd | 3 - src/chrome/locale/ast/network-settings.dtd | 3 - src/chrome/locale/az/network-settings.dtd | 3 - src/chrome/locale/be/network-settings.dtd | 3 - src/chrome/locale/bg/network-settings.dtd | 3 - src/chrome/locale/bn-BD/network-settings.dtd | 3 - src/chrome/locale/bn-IN/network-settings.dtd | 3 - src/chrome/locale/bn/network-settings.dtd | 3 - src/chrome/locale/bo/network-settings.dtd | 3 - src/chrome/locale/br/network-settings.dtd | 3 - src/chrome/locale/bs/network-settings.dtd | 3 - src/chrome/locale/ca/network-settings.dtd | 3 - src/chrome/locale/ca(a)valencia/network-settings.dtd | 3 - src/chrome/locale/cs-CZ/network-settings.dtd | 3 - src/chrome/locale/cs/network-settings.dtd | 3 - src/chrome/locale/csb/network-settings.dtd | 3 - src/chrome/locale/cv/network-settings.dtd | 3 - src/chrome/locale/cy/network-settings.dtd | 3 - src/chrome/locale/da/network-settings.dtd | 3 - src/chrome/locale/de/network-settings.dtd | 3 - src/chrome/locale/dz/network-settings.dtd | 3 - src/chrome/locale/el/network-settings.dtd | 3 - src/chrome/locale/en-GB/network-settings.dtd | 3 - src/chrome/locale/en/network-settings.dtd | 61 +++++++---- src/chrome/locale/en/torlauncher.properties | 3 +- src/chrome/locale/eo/network-settings.dtd | 3 - src/chrome/locale/es-AR/network-settings.dtd | 3 - src/chrome/locale/es-CL/network-settings.dtd | 3 - src/chrome/locale/es-CO/network-settings.dtd | 3 - src/chrome/locale/es-MX/network-settings.dtd | 3 - src/chrome/locale/es/network-settings.dtd | 3 - src/chrome/locale/et/network-settings.dtd | 5 +- src/chrome/locale/et/torlauncher.properties | 2 +- src/chrome/locale/eu/network-settings.dtd | 3 - src/chrome/locale/fa/network-settings.dtd | 3 - src/chrome/locale/fi/network-settings.dtd | 3 - src/chrome/locale/fil/network-settings.dtd | 3 - src/chrome/locale/fo/network-settings.dtd | 3 - src/chrome/locale/fr-CA/network-settings.dtd | 27 +++-- src/chrome/locale/fr-CA/torlauncher.properties | 40 +++---- src/chrome/locale/fr/network-settings.dtd | 31 +++--- src/chrome/locale/fr/torlauncher.properties | 40 +++---- src/chrome/locale/fur/network-settings.dtd | 3 - src/chrome/locale/fy/network-settings.dtd | 3 - src/chrome/locale/ga/network-settings.dtd | 113 ++++++++++--------- src/chrome/locale/ga/torlauncher.properties | 120 ++++++++++----------- src/chrome/locale/gl/network-settings.dtd | 3 - src/chrome/locale/gu-IN/network-settings.dtd | 3 - src/chrome/locale/gu/network-settings.dtd | 3 - src/chrome/locale/gun/network-settings.dtd | 3 - src/chrome/locale/ha/network-settings.dtd | 3 - src/chrome/locale/he/network-settings.dtd | 97 ++++++++--------- src/chrome/locale/he/torlauncher.properties | 74 ++++++------- src/chrome/locale/hi/network-settings.dtd | 3 - src/chrome/locale/hr-HR/network-settings.dtd | 3 - src/chrome/locale/hr/network-settings.dtd | 3 - src/chrome/locale/ht/network-settings.dtd | 3 - src/chrome/locale/hu/network-settings.dtd | 3 - src/chrome/locale/hy-AM/network-settings.dtd | 3 - src/chrome/locale/hy/network-settings.dtd | 3 - src/chrome/locale/ia/network-settings.dtd | 3 - src/chrome/locale/id/network-settings.dtd | 3 - src/chrome/locale/is/network-settings.dtd | 15 ++- src/chrome/locale/is/torlauncher.properties | 8 +- src/chrome/locale/it/network-settings.dtd | 3 - src/chrome/locale/ja/network-settings.dtd | 3 - src/chrome/locale/jv/network-settings.dtd | 3 - src/chrome/locale/ka/network-settings.dtd | 3 - src/chrome/locale/kk/network-settings.dtd | 3 - src/chrome/locale/km/network-settings.dtd | 3 - src/chrome/locale/kn/network-settings.dtd | 3 - src/chrome/locale/ko-KR/network-settings.dtd | 3 - src/chrome/locale/ko/network-settings.dtd | 3 - src/chrome/locale/ku/network-settings.dtd | 3 - src/chrome/locale/kw/network-settings.dtd | 3 - src/chrome/locale/ky/network-settings.dtd | 3 - src/chrome/locale/lb/network-settings.dtd | 3 - src/chrome/locale/lg/network-settings.dtd | 7 +- src/chrome/locale/ln/network-settings.dtd | 3 - src/chrome/locale/lo/network-settings.dtd | 3 - src/chrome/locale/lt/network-settings.dtd | 3 - src/chrome/locale/lv/network-settings.dtd | 3 - src/chrome/locale/mg/network-settings.dtd | 3 - src/chrome/locale/mi/network-settings.dtd | 3 - src/chrome/locale/mk/network-settings.dtd | 3 - src/chrome/locale/ml/network-settings.dtd | 3 - src/chrome/locale/ml/torlauncher.properties | 2 +- src/chrome/locale/mn/network-settings.dtd | 3 - src/chrome/locale/mr/network-settings.dtd | 3 - src/chrome/locale/ms-MY/network-settings.dtd | 3 - src/chrome/locale/mt/network-settings.dtd | 3 - src/chrome/locale/my/network-settings.dtd | 3 - src/chrome/locale/nah/network-settings.dtd | 3 - src/chrome/locale/nap/network-settings.dtd | 3 - src/chrome/locale/nb/network-settings.dtd | 3 - src/chrome/locale/nb/torlauncher.properties | 2 +- src/chrome/locale/nds/network-settings.dtd | 3 - src/chrome/locale/ne/network-settings.dtd | 3 - src/chrome/locale/nl-BE/network-settings.dtd | 3 - src/chrome/locale/nl-BE/torlauncher.properties | 2 +- src/chrome/locale/nl/network-settings.dtd | 3 - src/chrome/locale/nn/network-settings.dtd | 3 - src/chrome/locale/nso/network-settings.dtd | 3 - src/chrome/locale/oc/network-settings.dtd | 3 - src/chrome/locale/or/network-settings.dtd | 3 - src/chrome/locale/pa/network-settings.dtd | 3 - src/chrome/locale/pap/network-settings.dtd | 3 - src/chrome/locale/pl-PL/network-settings.dtd | 3 - src/chrome/locale/pl/network-settings.dtd | 3 - src/chrome/locale/pms/network-settings.dtd | 3 - src/chrome/locale/ps/network-settings.dtd | 3 - src/chrome/locale/pt-BR/network-settings.dtd | 3 - src/chrome/locale/pt/network-settings.dtd | 3 - src/chrome/locale/ro/network-settings.dtd | 3 - src/chrome/locale/ru/network-settings.dtd | 3 - src/chrome/locale/ru(a)petr1708/network-settings.dtd | 3 - src/chrome/locale/sco/network-settings.dtd | 3 - src/chrome/locale/si-LK/network-settings.dtd | 3 - src/chrome/locale/sk-SK/network-settings.dtd | 3 - src/chrome/locale/sk/network-settings.dtd | 3 - src/chrome/locale/sl-SI/network-settings.dtd | 3 - src/chrome/locale/sl/network-settings.dtd | 3 - src/chrome/locale/sn/network-settings.dtd | 3 - src/chrome/locale/so/network-settings.dtd | 3 - src/chrome/locale/son/network-settings.dtd | 3 - src/chrome/locale/sq-AL/network-settings.dtd | 3 - src/chrome/locale/sq/network-settings.dtd | 3 - src/chrome/locale/sr/network-settings.dtd | 3 - src/chrome/locale/sr(a)latin/network-settings.dtd | 3 - src/chrome/locale/st/network-settings.dtd | 3 - src/chrome/locale/su/network-settings.dtd | 3 - src/chrome/locale/sv-SE/network-settings.dtd | 3 - src/chrome/locale/sv/network-settings.dtd | 3 - src/chrome/locale/sw/network-settings.dtd | 3 - src/chrome/locale/szl/network-settings.dtd | 3 - src/chrome/locale/ta/network-settings.dtd | 3 - src/chrome/locale/te-IN/network-settings.dtd | 3 - src/chrome/locale/te/network-settings.dtd | 3 - src/chrome/locale/tg/network-settings.dtd | 3 - src/chrome/locale/tg/torlauncher.properties | 2 +- src/chrome/locale/th/network-settings.dtd | 3 - src/chrome/locale/ti/network-settings.dtd | 3 - src/chrome/locale/tk/network-settings.dtd | 3 - src/chrome/locale/tr/network-settings.dtd | 3 - src/chrome/locale/uk/network-settings.dtd | 3 - src/chrome/locale/ur-PK/network-settings.dtd | 3 - src/chrome/locale/ur/network-settings.dtd | 3 - src/chrome/locale/uz/network-settings.dtd | 3 - src/chrome/locale/ve/network-settings.dtd | 3 - src/chrome/locale/vi/network-settings.dtd | 3 - src/chrome/locale/wa/network-settings.dtd | 3 - src/chrome/locale/wo/network-settings.dtd | 3 - src/chrome/locale/zh-CN/network-settings.dtd | 3 - src/chrome/locale/zh-HK/network-settings.dtd | 3 - src/chrome/locale/zh-TW/network-settings.dtd | 3 - src/chrome/locale/zu/network-settings.dtd | 3 - 163 files changed, 321 insertions(+), 762 deletions(-) diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index ff231bb..d226ca3 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd index 003e255..23aae0a 100644 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ b/src/chrome/locale/am-ET/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index b6d2e03..2e81470 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index cd31eed..a20acd8 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net او https://mail.google.com, او https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "من خلال مكتب المساعدة"> <!ENTITY torsettings.bridgeHelp4 "يمكنك طلب عناوين الجسر، كحل أخير، من خلال إرسال رسالة بريد إلكتروني مهذبة إلى help(a)rt.torproject.org.  يرجى ملاحظة أنه يجب أن يرد شخص ما على كل طلب."> - - -<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index e85cb26..6f12432 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 7ef8cd1..9e96619 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, və ya https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Dəstək Masası Vasitəsilə"> <!ENTITY torsettings.bridgeHelp4 "Son çarə olaraq körpü ünvanlarını help(a)rt.torproject.org ünvanına mədəni tələb emaili göndərməklə əldə edə bilərsən.  Lütfən, unutma ki, yazdığın insan hər bir tələbə ayrı ayrı cavab yazacaq."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index c235b1c..9e0d430 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index ce13b61..7972c72 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "През бюрото за помощ"> <!ENTITY torsettings.bridgeHelp4 "Като последна стъпка, вие може да изисквате адреси чрез пращане на учтив имейл до help(a)rt.torproject.org.  Моля обърнете внимание, че на всяка молба за bridge се отговаря персонално."> - - -<!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index db4e635..5ebd2d0 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index 2a7e408..5a33a60 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 9eb7945..bff8120 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -74,6 +74,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A través de l'Escriptori d'Ajuda"> <!ENTITY torsettings.bridgeHelp4 "Com a última opció, podeu demanar adreces de pont enviant un missatge a help(a)rt.torproject.org.  Una persona respondrà cada petició."> - - -<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index e666423..0458e75 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -52,6 +52,3 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> - - -<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd index 9c78c3c..75ece3b 100644 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ b/src/chrome/locale/cs-CZ/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index d5241e1..a69caff 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> <!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk."> - - -<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index 6a95899..dfe657e 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index 2ed3e89..6f3cc56 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 4257722..2851032 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> - - -<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index d976ea2..c635745 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle"> <!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help(a)rt.torproject.org angefordert werden.  Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss."> - - -<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 85d7b78..aa2b6f4 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -74,6 +74,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> <!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> - - -<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 240154c..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,7 +1,4 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -9,11 +6,31 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> + +<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.no "No"> + +<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> + +<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> +<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -25,9 +42,8 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +54,22 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> - <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index b09753e..24bb4d6 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -28,8 +28,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index f6d763a..0c3fa75 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 5be6fa5..49e95dd 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos."> diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 30d3940..6303509 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index 4a458a0..cb4c106 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 85b97c0..ad001f4 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 45ff7f0..dc01bb3 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -74,6 +74,3 @@ <!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario"> <!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help(a)rt.torproject.org .  Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición."> - - -<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index 35b5fe3..d471080 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -14,7 +14,7 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.configure "Häälesta"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 57528a5..8b40330 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -33,7 +33,7 @@ torlauncher.recommended_bridge=(soovitatud) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=Välju torlauncher.done=Valmis torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 9753df9..0efb96c 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> - - -<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake."> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 76cb386..490a77b 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -74,6 +74,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, یا https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> <!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> - - -<!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index bbd6db8..f0ddb4c 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com tai https:://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen läpi"> <!ENTITY torsettings.bridgeHelp4 "Viimeisenä keinona voit pyytää siltaosoitteita lähettämällä kohteliaan viestin osoitteeseen: help(a)rt.torproject.org.  Huomioi, että henkilön tulee vastata kuhunkin pyyntöön."> - - -<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index b73700b..bd9412b 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index bf6c933..78bc505 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index af3ea91..b52cf71 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -15,20 +15,20 @@ <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> <!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> +<!ENTITY torSettings.connectPrompt2 "J’aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet?">  -<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> -<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> +<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n’est pas requis, mais il pourrait être exigé pour une connexion par un réseau d’entreprise, d’école ou d’université."> +<!ENTITY torSettings.proxyExplanation2 "Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur de services Internet (FSI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> -<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n’êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n’arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l’on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé.">  @@ -45,14 +45,14 @@ <!ENTITY torsettings.useProxy.checkbox "Cet ordinateur doit utiliser un mandataire local pour accéder à Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> <!ENTITY torsettings.useProxy.address "Adresse :"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> <!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon fournisseur de services Internet (FSI) bloque les connexions vers le réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> @@ -65,14 +65,11 @@ <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> <!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur de services Internet (FSI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d’adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d’adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu’il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d’un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> - - -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> +<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d’assistance"> +<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu’une personne devra répondre à chaque demande."> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index e213ea0..14c76a1 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -3,30 +3,30 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s'est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu'à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s'est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l'équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera par les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. +torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l'exécutable Tor. -torlauncher.torrc_missing=Le fichier torrc manque et n'a pas pu être créé. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas et n'a pas pu être créé. -torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. +torlauncher.tor_missing=Il manque l’exécutable Tor. +torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. +torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S -torlauncher.failed_to_save_settings=Impossible d'enregistrer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez choisir un type de transport pour les ponts fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) @@ -36,28 +36,28 @@ torlauncher.quit=Quitter torlauncher.quit_win=Sortie torlauncher.done=Terminé -torlauncher.forAssistance=Pour de l'assistance, contacter %S -torlauncher.forAssistance2=Pour de l'assistance, visiter %S +torlauncher.forAssistance=Pour de l’assistance, contacter %S +torlauncher.forAssistance2=Pour de l’assistance, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrée à l'annuaire -torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau -torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité -torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais +torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire +torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes -torlauncher.bootstrapWarning.identity=mauvaise concordance de l'identité +torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité torlauncher.bootstrapWarning.timeout=expiration du temps de connexion -torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte +torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 5cdbd06..fa9fd6e 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -15,19 +15,19 @@ <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> <!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont (Bridge) ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> +<!ENTITY torSettings.connectPrompt2 "J’aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du mandataire local"> <!ENTITY torSettings.proxyQuestion "Cet ordinateur doit-il utiliser un serveur mandataire local pour accéder à Internet ?">  -<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> -<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> +<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n’est pas requis, mais il pourrait être exigé pour une connexion par un réseau d’entreprise, d’école ou d’université."> +<!ENTITY torSettings.proxyExplanation2 "Si vous n’êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d’un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts (Bridges) Tor"> -<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d’accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n’êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n’arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> <!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts (Bridges) Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts (Bridges) fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> @@ -45,16 +45,16 @@ <!ENTITY torsettings.useProxy.checkbox "Cet ordinateur doit utiliser un mandataire local pour accéder à Internet"> <!ENTITY torsettings.useProxy.type "Type de mandataire :"> <!ENTITY torsettings.useProxy.address "Adresse :"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> <!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions vers le réseau Tor"> +<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d’accès à Internet (FAI) bloque les connexions vers le réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts (Bridges) fournis"> <!ENTITY torsettings.useBridges.note "Chaque type de pont (Bridge) utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> @@ -64,15 +64,12 @@ <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts ((Bridges Relays)"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d’accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d’adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d’adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu’il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d’un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> - - -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> +<!ENTITY torsettings.bridgeHelp4Heading "Par le centre d’assistance"> +<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu’une personne devra répondre à chaque demande."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 8a5f37f..dddd060 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,30 +3,30 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s'est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu'à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s'est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l'équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. +torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l'exécutable Tor. -torlauncher.torrc_missing=Le fichier torrc manque et n'a pas pu être créé. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas et n'a pas pu être créé. -torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. +torlauncher.tor_missing=Il manque l’exécutable Tor. +torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. +torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S -torlauncher.failed_to_save_settings=Impossible d'enregistrer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor pour qu'il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts (Bridges). torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts (Bridges) fournis. -torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n’est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) @@ -36,28 +36,28 @@ torlauncher.quit=Quitter torlauncher.quit_win=Sortie torlauncher.done=Terminé -torlauncher.forAssistance=Pour de l'assistance, contacter %S -torlauncher.forAssistance2=Pour de l'assistance, visiter %S +torlauncher.forAssistance=Pour de l’assistance, contacter %S +torlauncher.forAssistance2=Pour de l’assistance, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Mise en place d'une connexion chiffrée à l'annuaire -torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau -torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité -torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais +torlauncher.bootstrapStatus.handshake_dir=Mise en place d’une connexion chiffrée à l’annuaire +torlauncher.bootstrapStatus.requesting_status=Récupération de l’état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l’état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d’autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d’informations sur le relais torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Mise en place d'un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Mise en place d’un circuit Tor torlauncher.bootstrapStatus.done=Vous êtes connecté au réseau Tor ! torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes -torlauncher.bootstrapWarning.identity=mauvaise concordance de l'identité +torlauncher.bootstrapWarning.identity=mauvaise concordance de l’identité torlauncher.bootstrapWarning.timeout=expiration du temps de connexion -torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte +torlauncher.bootstrapWarning.noroute=pas de route vers l’hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture torlauncher.bootstrapWarning.pt_missing=le transport enfichable manque diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 1753adb..477705a 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index e28f84e..c76302b 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -1,78 +1,75 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Socruithe Líonra Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Teanga Bhrabhsálaí Tor"> +<!ENTITY torlauncher.localePicker.prompt "Roghnaigh teanga.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Sular féidir leat ceangal a bhunú le líonra Tor, caithfidh tú tuilleadh eolais a sholáthar maidir le ceangal Idirlín an ríomhaire seo."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Tá"> +<!ENTITY torSettings.no "Níl"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.firstQuestion "Cé acu díobh seo a leanas a dhéanann an cur síos is fearr ar do chás-sa?"> +<!ENTITY torSettings.configurePrompt1 "Úsáideann an ríomhaire seo ceangal Idirlín faoi chinsireacht nó úsáideann sé seachfhreastalaí."> +<!ENTITY torSettings.configurePrompt2 "Caithfidh mé droichead nó seachfhreastalaí áitiúil a chumrú sula ndéanfaidh mé ceangal le líonra&160;Tor."> +<!ENTITY torSettings.configure "Cumraigh"> +<!ENTITY torSettings.connectPrompt2 "Ba mhaith liom ceangal go díreach le líonra Tor."> +<!ENTITY torSettings.connectPrompt3 "Oibreoidh sé seo an chuid is mó den am."> +<!ENTITY torSettings.connect "Ceangail"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Cumraíocht Sheachfhreastalaí Áitiúil"> +<!ENTITY torSettings.proxyQuestion "An bhfuil seachfhreastalaí áitiúil ag teastáil ón ríomhaire seo le ceangal leis an Idirlíon?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyExplanation1 "Ní bhíonn seachfhreastalaí áitiúil ag teastáil an chuid is mó den am, ach b'fhéidir go mbeadh gá leis dá mbeifeá ag ceangal trí chomhlacht, scoil, nó ollscoil."> +<!ENTITY torSettings.proxyExplanation2 "Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais, le fáil amach an bhfuil seachfhreastalaí de dhíth."> +<!ENTITY torSettings.enterProxy "Cuir isteach socruithe an tseachfhreastalaí."> +<!ENTITY torSettings.bridgePageTitle "Cumraíocht Droichead Tor"> +<!ENTITY torSettings.bridgeQuestion "An bhfuil do Sholáthraí Seirbhíse Idirlín (ISP) ag cur cosc ar, nó ag déanamh cinsireacht ar Líonra Tor?"> +<!ENTITY torSettings.bridgeExplanation1 "Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, roghnaigh "Níl" (agus mura bhfuil tú in ann ceangal le líonra Tor gan droichead a úsáid, beidh tú ábalta ceann a shocrú ar ball)."> +<!ENTITY torSettings.bridgeExplanation2 "Má roghnaíonn tú "Tá", iarrfar ort Droichid Tor a chumrú. Tá sé níos deacra cosc a chur ar cheangail le Líonra Tor nuair a úsáideann tú na hathsheachadáin neamhliostaithe seo."> +<!ENTITY torSettings.bridgeSettingsPrompt "Is féidir leat na droichid ionsuite a úsáid, nó droichid de do chuid féin a fháil agus a chur isteach.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "An fanacht go dtosóidh Tor..."> +<!ENTITY torsettings.restartTor "Atosaigh Tor"> +<!ENTITY torsettings.reconfigTor "Athchumraigh"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Chumraigh tú droichid Tor nó shocraigh tú seachfhreastalaí áitiúil roimhe seo.&160; Chun ceangal díreach le líonra Tor a bhunú, caithfidh tú na socruithe seo a scriosadh."> +<!ENTITY torsettings.discardSettings.proceed "Scrios na Socruithe agus Ceangail"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Roghnach"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "Teastaíonn seachfhreastalaí áitiúil ón ríomhaire seo chun ceangal leis an Idirlíon"> +<!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí:"> +<!ENTITY torsettings.useProxy.address "Seoladh:"> +<!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "Ainm úsáideora:"> +<!ENTITY torsettings.useProxy.password "Focal faire:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe"> +<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe:"> +<!ENTITY torsettings.useBridges.checkbox "Cuireann mo Sholáthraí Seirbhís Idirlín (ISP) cosc ar cheangail le líonra Tor"> +<!ENTITY torsettings.useBridges.default "Ceangail le droichead ionsuite"> +<!ENTITY torsettings.useBridges.note "Úsáideann gach cineál droichid modh difriúil leis an gcinsireacht a sheachaint.&160; Mura n-oibríonn droichead amháín, bain triail as ceann eile."> +<!ENTITY torsettings.useBridges.type "Cineál iompair:"> +<!ENTITY torsettings.useBridges.custom "Cuir isteach droichid saincheaptha"> +<!ENTITY torsettings.useBridges.label "Cuir isteach droichead nó droichid (ceann amháin ar gach líne)."> +<!ENTITY torsettings.useBridges.placeholder "cineál seoladh:port"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> +<!ENTITY torsettings.bridgeHelpTitle "Cabhair le Droichid"> +<!ENTITY torsettings.bridgeHelp1 "Mura bhfuil tú in ann ceangal le líonra Tor, b'fhéidir go bhfuil do Sholáthraí Seirbhíse Idirlín (ISP) nó eagraíocht eile ag cur cosc ar Tor.&160; Go minic, is féidir Droichid Tor a úsáid chun an fhadhb seo a sheachaint, toisc go bhfuil sé níos deacra cosc a chur orthu."> +<!ENTITY torsettings.bridgeHelp1B "Is féidir leat na droichid ionsuite réamhshocraithe a úsáid, nó seoltaí de do chuid féin a fháil trí cheann de na bealaí seo a leanas:"> +<!ENTITY torsettings.bridgeHelp2Heading "Tríd an nGréasán"> +<!ENTITY torsettings.bridgeHelp2 "Úsáid brabhsálaí Gréasáin chun cuairt a thabhairt ar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Tríd an Uathfhreagróir Ríomhphoist"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Seol teachtaireacht ríomhphoist chuig bridges(a)torproject.org leis an líne amháin 'get bridges' i gcorp na teachtaireachta.&160; Ionas go mbeidh sé níos deacra d'ionsaitheoir go leor seoltaí droichid a fhoghlaim, ní mór duit an t-iarratas seo a sheoladh ó cheann de na soláthraithe rphoist seo a leanas (in ord tosaíochta):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nó https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Tríd an Deasc Chabhrach"> +<!ENTITY torsettings.bridgeHelp4 "Mar an rogha dheiridh, is féidir leat seoltaí droichid a iarraidh trí theachtaireacht dhea-bhéasach a sheoladh chuig help(a)rt.torproject.org.  Tabhair faoi deara gurb é neach daonna a thabharfaidh freagra ar gach iarratas."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 24bb4d6..a4a4adf 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -1,63 +1,63 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.error_title=Tosaitheoir Tor + +torlauncher.tor_exited_during_startup=Stop Tor le linn tosaithe. Seans gur tharla sé seo mar gheall ar earráid i do chomhad torrc, fabht i Tor nó i bhfeidhmchlár eile ar do chóras, nó crua-earra lochtach. Go dtí go mbeidh tú in ann an bhunfhadhb a réiteach agus Tor a atosú, ní thosóidh Brabhsálaí Tor. +torlauncher.tor_exited=Stop Tor go tobann. Seans gur tharla sé seo mar gheall ar fhabht i Tor féin nó i bhfeidhmchlár eile ar do chóras, nó mar gheall ar chrua-earra lochtach. Go dtí go dtosóidh tú Tor arís, ní bheidh Brabhsálaí Tor in ann aon suíomh Gréasáin a bhaint amach. Má mhaireann an fhadhb, seol cóip de do logchomhad Tor chuig an bhfoireann tacaíochta. +torlauncher.tor_exited2=Má atosaíonn tú Tor, ní dhúnfaidh do chuid cluaisíní brabhsálaí. +torlauncher.tor_controlconn_failed=Níorbh fhéidir ceangal le port rialaithe Tor. +torlauncher.tor_failed_to_start=Níor thosaigh Tor. +torlauncher.tor_control_failed=Níorbh fhéidir seilbh a ghabháil ar Tor. +torlauncher.tor_bootstrap_failed=Ní raibh Tor in ann ceangal le líonra Tor. +torlauncher.tor_bootstrap_failed_details=Theip ar %1$S (%2$S). + +torlauncher.unable_to_start_tor=Níorbh fhéidir Tor a thosú.\n\n%S +torlauncher.tor_missing=Tá an clár inrite Tor ar iarraidh. +torlauncher.torrc_missing=Tá an comhad torrc ar iarraidh agus níorbh fhéidir é a chruthú. +torlauncher.datadir_missing=Níl comhadlann sonraí Tor ann agus níorbh fhéidir é a chruthú. +torlauncher.password_hash_missing=Níl aon fháil ar an bhfocal faire haiseáilte. + +torlauncher.failed_to_get_settings=Ní féidir socruithe Tor a fháil.\n\n%S +torlauncher.failed_to_save_settings=Ní féidir socruithe Tor a shábháil.\n\n%S +torlauncher.ensure_tor_is_running=Ba cheart duit deimhniú go bhfuil Tor ar siúl. + +torlauncher.error_proxy_addr_missing=Caithfidh tú seoladh IP nó óstainm agus uimhir phoirt a sholáthar más mian leat seachfhreastalaí a úsáid chun teacht ar an Idirlíon trí Tor. +torlauncher.error_proxy_type_missing=Caithfidh tú cineál an tseachfhreastalaí a roghnú. +torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú. +torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. +torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. + +torlauncher.recommended_bridge=(molta) + +torlauncher.connect=Ceangail +torlauncher.restart_tor=Atosaigh Tor +torlauncher.quit=Éirigh as +torlauncher.quit_win=Scoir +torlauncher.done=Déanta + +torlauncher.forAssistance=Déan teagmháil le %S le cúnamh a fháil +torlauncher.forAssistance2=Tabhair cuairt ar %S le cúnamh a fháil + +torlauncher.copiedNLogMessages=Cóipeáílte. Tá %S teachtaireacht ón logchomhad Tor réidh le greamú in eagarthóir téacs nó i dteachtaireacht rphoist. + +torlauncher.bootstrapStatus.conn_dir=Ag ceangal le heolaire athsheachadán +torlauncher.bootstrapStatus.handshake_dir=Ceangal criptithe le heolaire á bhunú +torlauncher.bootstrapStatus.requesting_status=Stádas an líonra á fháil +torlauncher.bootstrapStatus.loading_status=Stádas an líonra á lódáil +torlauncher.bootstrapStatus.loading_keys=Teastais an údaráis á lódáil +torlauncher.bootstrapStatus.requesting_descriptors=Eolas faoin athsheachadán á iarraidh +torlauncher.bootstrapStatus.loading_descriptors=Eolas faoin athsheachadán á lódáil +torlauncher.bootstrapStatus.conn_or=Ag ceangal le líonra Tor +torlauncher.bootstrapStatus.handshake_or=Ciorcad Tor á bhunú +torlauncher.bootstrapStatus.done=Tá tú ceangailte le líonra Tor! + +torlauncher.bootstrapWarning.done=críochnaithe +torlauncher.bootstrapWarning.connectrefused=diúltaíodh an ceangal +torlauncher.bootstrapWarning.misc=éagsúil +torlauncher.bootstrapWarning.resourcelimit=easpa acmhainní +torlauncher.bootstrapWarning.identity=aitheantas mícheart +torlauncher.bootstrapWarning.timeout=ceangal thar am +torlauncher.bootstrapWarning.noroute=níl aon bhealach chuig an óstach +torlauncher.bootstrapWarning.ioerror=earráid léite/scríofa +torlauncher.bootstrapWarning.pt_missing=córas iompair ionphlugáilte ar iarraidh diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index 20c000f..7940a38 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index d5bf712..b66952c 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index cf3887c..f1f9b10 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -1,82 +1,75 @@ <!ENTITY torsettings.dialog.title "הגדרות רשת Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "שפת דפדפן Tor"> +<!ENTITY torlauncher.localePicker.prompt "אנא בחר שפה.">  -<!ENTITY torsettings.prompt "לפני שתתחבר לרשת Tor, עליך לספק מידע על חיבור האינטרנט של מחשב זה."> +<!ENTITY torsettings.prompt "לפני שתתחבר לרשת Tor, אתה צריך לספק מידע על חיבור האינטרנט של מחשב זה."> <!ENTITY torSettings.yes "כן"> <!ENTITY torSettings.no "לא"> -<!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את מצבך בצורה המדויקת ביותר?"> -<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של מחשב זה מסונן או עובר דרך שרת פרוקסי."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר באופן הטוב ביותר את מצבך?"> +<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של מחשב זה מסונן או עובר דרך ייפוי-כוח."> +<!ENTITY torSettings.configurePrompt2 "אני צריך להגדיר הגדרות של גשר או ייפוי-כוח מקומי לפני שאתחבר לרשת Tor."> <!ENTITY torSettings.configure "הגדר"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "דבר זה יעבוד במרבית המקרים."> +<!ENTITY torSettings.connectPrompt2 "אני מעונין לעשות חיבור ישיר לרשת Tor."> +<!ENTITY torSettings.connectPrompt3 "זה יעבוד במרבית המצבים."> <!ENTITY torSettings.connect "התחבר"> -<!ENTITY torSettings.proxyPageTitle "הגדרות שרת פרוקסי מקומי"> -<!ENTITY torSettings.proxyQuestion "האם מחשב זה מוכרח להשתמש בשרת פרוקסי מקומי כדי לקבל גישה לאינטרנט?"> +<!ENTITY torSettings.proxyPageTitle "תצורת ייפוי-כוח מקומי"> +<!ENTITY torSettings.proxyQuestion "האם מחשב זה צריך להשתמש בייפוי-כוח מקומי כדי להשיג גישה לאינטרנט?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "הזן את הגדרות הפרוקסי."> -<!ENTITY torSettings.bridgePageTitle "הגדרת גשרים ל-Tor"> -<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מסנן חיבורים לרשת Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "באפשרותך להשתמש ברשימת הגשרים המוכנה או להשיג בעצמך ולהזין רשימת גשרים חדשה."> +<!ENTITY torSettings.proxyExplanation1 "ברוב המקרים ייפוי-כוח מקומי אינו נחוץ, אבל הוא עלול להיות דרוש בעת התחברות דרך רשת של חברה, בית ספר או אוניברסיטה."> +<!ENTITY torSettings.proxyExplanation2 "אם אינך בטוח כיצד לענות על שאלה זו, הבט בהגדרות האינטרנט בדפדפן אחר או בדוק בהגדרות הרשת של מערכתך כדי לראות האם ייפוי-כוח מקומי נחוץ."> +<!ENTITY torSettings.enterProxy "הכנס את הגדרות ייפוי-הכוח."> +<!ENTITY torSettings.bridgePageTitle "תצורת גשרי Tor"> +<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מצנזר חיבורים לרשת Tor?"> +<!ENTITY torSettings.bridgeExplanation1 "אם אינך בטוח כיצד לענות על שאלה זו, בחר לא (אם אינך מסוגל להתחבר לרשת Tor ללא גשר, אתה יכול להוסיף אחד אחר כך)."> +<!ENTITY torSettings.bridgeExplanation2 "אם תבחר כן, תתבקש להגדיר גשרי Tor, שהם ממסרים שאינם ברשימה המקשים עוד יותר לחסום חיבורים לרשת Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "אתה יכול להשתמש בסדרת הגשרים המסופקת או שאתה יכול לקבל ולהכניס סדרת גשרים מותאמת.">  -<!ENTITY torsettings.startingTor "ממתין כעת עבור Tor כדי להתחיל…"> -<!ENTITY torsettings.restartTor "התחל מחדש את Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "ממתין אל Tor להתחיל..."> +<!ENTITY torsettings.restartTor "הפעל מחדש את Tor"> +<!ENTITY torsettings.reconfigTor "הגדר מחדש"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "הגדרת גשרי Tor או הכנסת הגדרות ייפוי-כוח מקומי.  כדי לעשות חיבור ישיר לרשת Tor, הגדרות אלו חייבות להיות מוסרות."> +<!ENTITY torsettings.discardSettings.proceed "הסר הגדרות והתחבר"> -<!ENTITY torsettings.optional "אופציונלי"> +<!ENTITY torsettings.optional "רשותי"> -<!ENTITY torsettings.useProxy.checkbox "מחשב זה חייב להשתמש בשרת פרוקסי מקומי על מנת להתחבר לאינטרנט"> -<!ENTITY torsettings.useProxy.type "סוג פרוקסי:"> +<!ENTITY torsettings.useProxy.checkbox "מחשב זה צריך להשתמש בייפוי-כוח מקומי כדי להשיג גישה לאינטרנט"> +<!ENTITY torsettings.useProxy.type "סוג ייפוי-כוח:"> <!ENTITY torsettings.useProxy.address "כתובת:"> <!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח"> -<!ENTITY torsettings.useProxy.port "פורט:"> +<!ENTITY torsettings.useProxy.port "פתחה:"> <!ENTITY torsettings.useProxy.username "שם משתמש:"> <!ENTITY torsettings.useProxy.password "סיסמה:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "מחשב זה מחובר לאינטרנט דרך חומת אש המאפשר חיבורים רק לפורטים מסויימים "> -<!ENTITY torsettings.firewall.allowedPorts "פורטים מורשים:"> -<!ENTITY torsettings.useBridges.checkbox "ספק האינטרנט שלי (ISP) חוסם חיבורים לרשת Tor"> -<!ENTITY torsettings.useBridges.default "התחבר באמצעות הגשרים המוכנים מראש"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "סוג מסווה תעבורה:"> -<!ENTITY torsettings.useBridges.custom "הזן רשימת גשרים חדשה"> -<!ENTITY torsettings.useBridges.label "הזן פרטי גשר אחד לפחות (אחד לכל שורה)"> -<!ENTITY torsettings.useBridges.placeholder "הזן כתובת:פורט address:port"> +<!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש המתירה חיבורים רק אל פתחות מסוימות"> +<!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות:"> +<!ENTITY torsettings.useBridges.checkbox "ספק שירותי האינטרנט שלי (ISP) חוסם חיבורים לרשת Tor"> +<!ENTITY torsettings.useBridges.default "התחבר עם גשרים מסופקים"> +<!ENTITY torsettings.useBridges.note "כל סוג של גשר משתמש בשיטה שונה כדי למנוע צנזורה.  אם גשר אחד אינו עובד, נסה שוב ע"י שימוש באחד אחר."> +<!ENTITY torsettings.useBridges.type "סוג תעבורה:"> +<!ENTITY torsettings.useBridges.custom "הכנס גשרים מותאמים"> +<!ENTITY torsettings.useBridges.label "הכנס ממסר גשר אחד או יותר (אחד לשורה):"> +<!ENTITY torsettings.useBridges.placeholder "הכנס כתובת:יציאה"> -<!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה"> -<!ENTITY torsettings.bridgeHelpTitle "עזרה בנוגע לגשרים"> +<!ENTITY torsettings.copyLog "העתק את יומן Tor ללוח החיתוך"> +<!ENTITY torsettings.bridgeHelpTitle "עזרת ממסרי גשר"> <!ENTITY torsettings.bridgeHelp1 "אם אין באפשרותך להתחבר לרשת Tor, ייתכן שהסיבה לכך היא שספק האינטרנט שלך או גורם אחר חוסמים את Tor. לעתים קרובות, ניתן להתגבר על בעיה זו באמצעות שימוש בגשרים, שהם שרתים חסויים שקשה יותר לחסום אותם."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "אתה יכול להשתמש בסדרה המוגדרת מראש המסופקת של כתובות גשר או שאתה יכול לקבל סדרת כתובות מותאמת ע"י שימוש באחת משיטות אלו:"> <!ENTITY torsettings.bridgeHelp2Heading "באמצעות רשת האינטרנט"> -<!ENTITY torsettings.bridgeHelp2 "היעזר בדפדפן אינטרנט על מנת לבקר באתר https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "דרך שירות הדואל האוטומטי"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "שלח דואל לכתובת bridges(a)torproject.org עם השורה "get bridges" ללא גרשיים בתוך גוף ההודעה. אולם, כדי להקשות עוד יותר על תוקפים לצבור מאגר כתובות של גשרים, עליך לשלוח בקשה זו מתוך אחד מספקי הדואל הבאים בלבד (בסדר עדיפויות יורד):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net -https://mail.google.com -https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "באמצעות צוות התמיכה שלנו"> -<!ENTITY torsettings.bridgeHelp4 "כמוצא אחרון, תוכל לבקש רשימת גשרים באמצעות פנייה מנומסת בדואל לכתובת הבאה: -help(a)rt.torproject.org -אנא זכור שבן אנוש ייאלץ להשיב באופן אישי לכל בקשה שכזו."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torsettings.bridgeHelp2 "השתמש בדפדפן רשת כדי לבקר ב-https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "באמצעות מגיב הדוא"לים האוטומטי"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "שלח דוא"ל אל bridges(a)torproject.org עם השורה 'get bridges' לבדה בגוף ההודעה.  אולם, כדי להקשות עוד יותר על תוקף ללמוד רבות על כתובות גשר, אתה חייב לשלוח בקשה זו מאחד מספקי הדוא"ל הבאים (כתובים ברשימה לפי סדר עדיפות):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com או https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "באמצעות מרכז התמיכה"> +<!ENTITY torsettings.bridgeHelp4 "כמוצא אחרון, אתה יכול לבקש כתובות גשר ע"י שליחה של הודעת דוא"ל מנומסת אל help(a)rt.torproject.org. אנא שים לב שבן-אדם יצטרך להגיב לכל בקשה."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 85265fb..baf9d05 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -1,63 +1,63 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=תוכנת ההפעלה של Tor - -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor הפסיק לעבוד באופן פתאומי. ייתכן שהדבר אירע עקב תקלה ב-Tor עצמה, בשל תוכנה אחרת הפועלת על המערכת שלך, או בגין תקלת חומרה. כל עוד לא תפעיל מחדש את Tor, דפדפן Tor ימנע ממך לגלוש באינטרנט. אם הבעיה נמשכת, אנא שלח עותק מיומן הרישום של Tor לצוות התמיכה שלנו. -torlauncher.tor_exited2=התחלה מחדש של Tor לא תסגור את כרטיסיות הדפדפן שלך. -torlauncher.tor_controlconn_failed=נכשל החיבור לפורט השליטה של Tor. -torlauncher.tor_failed_to_start=הפעלת Tor נכשלה. -torlauncher.tor_control_failed=כשלה נטילת השליטה על Tor. -torlauncher.tor_bootstrap_failed=נכשל הניסיון להקים חיבור יציב לרשת Tor. +torlauncher.error_title=משגר Tor + +torlauncher.tor_exited_during_startup=Tor יצא במהלך ההזנק. ייתכן שזה עקב שגיאה בקובץ torrc שלך, תקל ב-Tor או בתכנית אחרת במערכתך, או חומרה תקולה. עד שלא תתקן את הבעיה המשתמעת ותפעיל מחדש את Tor, דפדפן Tor לא יתחיל. +torlauncher.tor_exited=Tor יצא באופן בלתי צפוי. ייתכן שזה עקב תקל ב-Tor עצמו, תכנית אחרת במערכתך או חומרה תקולה. עד שתפעיל מחדש את Tor, דפדפן Tor לא יהיה מסוגל להגיע לכל אתר שהוא. אם הבעיה נמשכת, אנא שלח עותק של יומן Tor שלך אל צוות התמיכה שלנו. +torlauncher.tor_exited2=הפעלת Tor מחדש לא תסגור את לשוניות הדפדפן שלך. +torlauncher.tor_controlconn_failed=לא היה יכול להתחבר אל פתחת הבקרה של Tor. +torlauncher.tor_failed_to_start=Tor נכשל להתחיל. +torlauncher.tor_control_failed=נכשל בלקיחת שליטה על Tor. +torlauncher.tor_bootstrap_failed=Tor נכשל בהקמת חיבור רשת Tor. torlauncher.tor_bootstrap_failed_details=%1$S נכשל (%2$S). -torlauncher.unable_to_start_tor=אין אפשרות להפעיל את Tor.\n\n%S -torlauncher.tor_missing=קובץ ההפעלה של Tor איננו קיים. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=כשל בהשגת סיסמה מעורבלת. +torlauncher.unable_to_start_tor=לא היה ניתן להתחיל את Tor.\n\n%S +torlauncher.tor_missing=קובץ ההפעלה של Tor חסר. +torlauncher.torrc_missing=קובץ ה-torrc חסר ולא היה יכול להיווצר. +torlauncher.datadir_missing=סיפריית הנתונים של Tor אינה קיימת ולא יכלה להיווצר. +torlauncher.password_hash_missing=נכשל בהשגת סיסמה מעורבלת. -torlauncher.failed_to_get_settings=אין אפשרות לאחזר הגדרות Tor.\n\n%S -torlauncher.failed_to_save_settings=אין אפשרות לשמור הגדרות Tor.\n\n%S -torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל כעת. +torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות Tor.\n\n%S +torlauncher.failed_to_save_settings=לא היה ניתן לשמור הגדרות Tor.\n\n%S +torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל. -torlauncher.error_proxy_addr_missing=עליך לציין גם כתובת IP או שם מארח וגם מספר פורט כדי לאפשר ל-Tor להיעזר בשרת פרוקסי על מנת לגשת לרשת האינטרנט. -torlauncher.error_proxy_type_missing=עליך לבחור את סוג שרת הפרוקסי. -torlauncher.error_bridges_missing=עליך לבחור בגשר אחד לפחות. -torlauncher.error_default_bridges_type_missing=עליך לבחור באיזה סוג של מסווה תעבורה תרצה להשתמש בגשרים שבחרת. -torlauncher.error_bridge_bad_default_type=גשרים בעלי מסווה תעבורה מסוג %S אינם זמינים כעת. אנא בחר סוג אחר. +torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי להגדיר את Tor להשתמש בייפוי-כוח כדי לגשת לאינטרנט. +torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. +torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. +torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. +torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. torlauncher.recommended_bridge=(מומלץ) torlauncher.connect=התחבר -torlauncher.restart_tor=התחל מחדש את Tor +torlauncher.restart_tor=הפעל מחדש את Tor torlauncher.quit=צא torlauncher.quit_win=יציאה torlauncher.done=בוצע torlauncher.forAssistance=לתמיכה, צור קשר עם %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=לתמיכה, בקר ב-%S -torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות מיומן הרישום של Tor מוכנות להעתקה לתוך עורך טקסט או להודעת דואל. +torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות יומן אירועים של Tor מוכנות להדבקה לתוך עורך מלל או להודעת דוא"ל. -torlauncher.bootstrapStatus.conn_dir=מתחבר למאגר שרתים -torlauncher.bootstrapStatus.handshake_dir=מקים כעת חיבור מוצפן למאגר שרתים -torlauncher.bootstrapStatus.requesting_status=מתעדכן כעת במצב הרשת -torlauncher.bootstrapStatus.loading_status=טוען את מצב הרשת -torlauncher.bootstrapStatus.loading_keys=טוען את אישורי האבטחה של הרשות -torlauncher.bootstrapStatus.requesting_descriptors=מבקש רשימת שרתים -torlauncher.bootstrapStatus.loading_descriptors=טוען רשימת שרתים +torlauncher.bootstrapStatus.conn_dir=מתחבר לסיפריית ממסרים +torlauncher.bootstrapStatus.handshake_dir=מקים חיבור סיפרייה מוצפן +torlauncher.bootstrapStatus.requesting_status=מאחזר מיצב רשת +torlauncher.bootstrapStatus.loading_status=טוען מיצב רשת +torlauncher.bootstrapStatus.loading_keys=טוען אישורי רָשׁוּת +torlauncher.bootstrapStatus.requesting_descriptors=מבקש מידע ממסר +torlauncher.bootstrapStatus.loading_descriptors=טוען מידע ממסר torlauncher.bootstrapStatus.conn_or=מתחבר אל רשת Tor -torlauncher.bootstrapStatus.handshake_or=מקים נתיב Tor +torlauncher.bootstrapStatus.handshake_or=מקים מעגל Tor torlauncher.bootstrapStatus.done=מחובר לרשת Tor! torlauncher.bootstrapWarning.done=בוצע torlauncher.bootstrapWarning.connectrefused=החיבור סורב torlauncher.bootstrapWarning.misc=שונות -torlauncher.bootstrapWarning.resourcelimit=משאבים לא מספיקים +torlauncher.bootstrapWarning.resourcelimit=משאבים בלתי מספיקים torlauncher.bootstrapWarning.identity=זהות אינה תואמת torlauncher.bootstrapWarning.timeout=החיבור פקע -torlauncher.bootstrapWarning.noroute=אין נתיב לארח -torlauncher.bootstrapWarning.ioerror=שגיאת קריאה/כתיבה -torlauncher.bootstrapWarning.pt_missing=חסר מסווה תעבורה +torlauncher.bootstrapWarning.noroute=אין נתיב למארח +torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה +torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 61a87d4..3b7b724 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 2834a8b..0e4d96a 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -75,6 +75,3 @@ s Tor mrežom?"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ili https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Deska"> <!ENTITY torsettings.bridgeHelp4 "Na kraju, možete zatražiti adrese mostova tako što će te poslati pristojan email na help(a)rt.torproject.org.  Imajte na umu da će na svaki zahtjev morati odgovoriti osoba."> - - -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 0ba50d8..874dda9 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index b52082e..e8fc42e 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vagy https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A támogatáson keresztül."> <!ENTITY torsettings.bridgeHelp4 "Utolsó lehetőségként küldj egy udvarias bridge igénylő emailt ide: help(a)rt.torproject.org.  Légyszíves vedd figyelembe az adott személynek több emailt kell megválaszolnia."> - - -<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index 84a2881..f6b89c5 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index e952b09..213562d 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index 58a9c71..b9bd75e 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 3fbef36..c5815c6 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Sebagai pilihan terakhir anda dapat meminta alamat bridge dengan mengirimkan pesan email dengan sopan ke help(a)rt.torproject.org.  Silakan catat bahwa petugas akan merespon masing-masing permintaan"> - - -<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.  Ini mungkin memakan waktu beberapa menit."> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 28e8ddb..c7c6164 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -29,7 +29,7 @@ <!ENTITY torSettings.bridgeQuestion "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar inn á Tor-netið?"> <!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> <!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "Þú gætir notað meðfylgjandi sett af brúartengingum eða að þú getur náð í og sett inn sérsniðið sett af brúm.">  @@ -57,22 +57,19 @@ <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.default "Tengjast með tiltækum brúm"> <!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.type "Gerð tengileiðar:"> <!ENTITY torsettings.useBridges.custom "Settu inn sérsniðnar brýr"> <!ENTITY torsettings.useBridges.label "Settu inn einn eða fleiri endurvarpa fyrir brýr (einn á hverja línu)."> <!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt"> <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> <!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1 "Ef þér tekst ekki að tengjast Tor-netinu, þá gæti það verið vegna þess að netþjónustuaðillinn þinn (ISP) eða einhver annar aðili sé að loka á Tor.  Oft er hægt að fara í kringum þetta með því að nota Tor-brýr (bridges), sem eru óskráðir endurvarpar sem erfitt er að loka á."> +<!ENTITY torsettings.bridgeHelp1B "Þú gætir notað forstillt, meðfylgjandi sett af brúarvistföngum eða að þú getur náð í sérsniðið sett af vistföngum með einhverri þessara aðferða."> <!ENTITY torsettings.bridgeHelp2Heading "Í gegnum vefinn"> <!ENTITY torsettings.bridgeHelp2 "Notaðu vafra til að skoða https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3Heading "Í gegnum sjálfvirka tövupóstsvörun"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eða https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Í gegnum hjálparborðið"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index 5ac6c53..c227b2f 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -5,7 +5,7 @@ torlauncher.error_title=Tor-ræsir torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Endurræsing Tor mun ekki loka flipum vafrans. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor ræstist ekki. torlauncher.tor_control_failed=Mistókst að ná stjórn yfir Tor. @@ -45,9 +45,9 @@ torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection torlauncher.bootstrapStatus.requesting_status=Næ í stöðu netkerfis torlauncher.bootstrapStatus.loading_status=Hleð inn stöðu netkerfis -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.loading_keys=Hleð inn skilríkjum vottunarstöðvar +torlauncher.bootstrapStatus.requesting_descriptors=Bið um upplýsingar endurvarpa +torlauncher.bootstrapStatus.loading_descriptors=Hleð inn upplýsingum endurvarpa torlauncher.bootstrapStatus.conn_or=Tengist Tor-netinu torlauncher.bootstrapStatus.handshake_or=Kem á Tor-rás torlauncher.bootstrapStatus.done=Tengdur við Tor-netið! diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 943e24c..b7a4411 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help(a)rt.torproject.org.  Tieni conto che una persona dovrà rispondere ad ogni singola richiesta."> - - -<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 16fee49..724a4ee 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由"> <!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)rt.torproject.org に丁寧なメールメッセージを送信して、ブリッジアドレスをリクエストすることができます。  人間が各リクエストに対応する必要があることにご注意ください。"> - - -<!ENTITY torprogress.pleaseWait "Torネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。"> diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 236b7ea..d75f96d 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index 3787679..478fe43 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index 0d10dbc..c58339f 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "តាមរយៈជំនួយ"> <!ENTITY torsettings.bridgeHelp4 "នៅជម្រើសចុងក្រោយ អ្នកអាចស្នើអាសយដ្ឋានប៊្រីតដោយផ្ញើសារអ៊ីមែលគួរសមទៅ help(a)rt.torproject.org.  សូមចំណាំថា មនុស្សម្នាក់នឹងត្រូវឆ្លើយតបទៅសំណើនីមួយៗ។"> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index 2a9f2c7..e18a7cc 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index 0908a1d..e6e9760 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 64e87cb..8599b02 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 또는 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> <!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의 해주십시오"> - - -<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다."> diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index a94a6ac..74be4e1 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index 77fa7af..9e4060c 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index e28f84e..99bf72b 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Yye"> +<!ENTITY torSettings.no "Nedda"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index 31cb0e6..f0fdd8f 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ."> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index ecf78f0..0da969f 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ar https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.  Tai gali užtrukti kelias minutes."> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index d10497d..aeb6381 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> - - -<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor.  tam var būt nepieciešamas vairākas minūtes."> diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 00d6235..1f69d4f 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 24bb4d6..9c863a6 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=കഴിഞ്ഞു torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index b0fef6d..ede666b 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 71a3a6e..237f08d 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index 80448c5..8f58545 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 06e1054..56f41f1 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -74,6 +74,3 @@ <!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> <!ENTITY torsettings.bridgeHelp4 "Som en siste utvei, kan du be om bro-adresser ved å sende en høflig e-post til help(a)rt.torproject.org.  Tenk over at en person må svare på hver slik forespørsel."> - - -<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 65951d6..0bb82b1 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -26,7 +26,7 @@ torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller v torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. -torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Juster innstillingene dine. +torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. torlauncher.recommended_bridge=(anbefalt) diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 9b1f1a7..57eb5f2 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index d313b6e..1c932a4 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via de Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index e63e160..373249e 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -53,7 +53,7 @@ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! torlauncher.bootstrapWarning.done=klaar -torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index bb0bbe8..d7fa414 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk"> <!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel kan je bridge-adressen aanvragen door een vriendelijke e-mail te sturen naar help(a)rt.torproject.org.  Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen."> - - -<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index f631124..3b23940 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 32da454..b02946f 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡੈਸਕ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index de9ccac..9a2f3f6 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -53,6 +53,3 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> - - -<!ENTITY torprogress.pleaseWait "Przeglądarka Tor uruchomi się po połączeniu z siecią Tor"> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index cfb082d..18b1a48 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, lub https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk"> <!ENTITY torsettings.bridgeHelp4 "W ostateczności, można zażądać adresów mostów, wysyłając uprzejmą wiadomość e-mail do help(a)rt.torproject.org.  Należy pamiętać, że osoba będzie musiała odpowiedzieć na każde żądanie."> - - -<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 7bbaedc..f7cf95b 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pelo Serviço de Assistência"> <!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org.  Por favor, entenda que uma pessoa terá que responder a cada solicitação"> - - -<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 4250124..5c0ae5c 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help(a)rt.torproject.org.  Por favor, note que uma pessoa irá precisar de responder a cada pedido."> - - -<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index c99dc80..d5f561a 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> - - -<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 20117a1..ed79f3c 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> <!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.  Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком."> - - -<!ENTITY torprogress.pleaseWait "Подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index adaa33f..5eae3c6 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index eca83b0..11e3069 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index f6c15c9..1831549 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prostredníctvom Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help(a)rt.torproject.org a požiadať o adresy premostenia.  Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať."> - - -<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index 17e8026..f86e26a 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, alebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Cez Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako poslednú možnosť si môžete vyžiadať adresy mostov zaslaním zdvorilého emailu na adresu help(a)rt.torproject.org.  Prosíme berte na vedomie, že príslušná osoba musí odpovedať na každú jednu podobnú žiadosť."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 5ba1f32..6ddb6e3 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Preko table Pomoči"> <!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s pošiljanjem olikanega e-sporočila na help(a)rt.torproject.org.  Prosimo, upoštevajte, da dotična oseba odgovarja na vsako zahtevo."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index c89784c..b7c53c2 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd index 9c78c3c..75ece3b 100644 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ b/src/chrome/locale/sq-AL/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index c0fd25a..ffa38c1 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Përmes Help Desk-ut"> <!ENTITY torsettings.bridgeHelp4 "Si mjet të fundit, ju mund të kërkoni adresat urë, duke dërguar një mesazh e-poste me politesë tek help(a)rt.torproject.org.  Ju lutemi vini re se një person do të duhet t'i përgjigjet çdo kërkese."> - - -<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index e27b1ab..be5b44b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 9f1ed4a..67da423 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index a62de6e..6ce1473 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -53,6 +53,3 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> - - -<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 4b118b6..0648ead 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> <!ENTITY torsettings.bridgeHelp4 "Som en sista utväg kan du skicka ett artigt e-post meddelande på engelska till help(a)rt.torproject.org, och fråga efter bryggadresser.  Tänk på att en person måste svara på varje sådan förfrågan."> - - -<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 70a6dd5..02e8fad 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index 19661a8..bb258de 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index 24bb4d6..1934a14 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=Иҷро шуд torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index ded8092..240e71b 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 1114d4a..2d99d30 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ya da https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Yardım masası yoluyla"> <!ENTITY torsettings.bridgeHelp4 "Son yol olarak, köprü adreslerini help(a)rt.torproject.org adresine göndereceğiniz nazik bir e-posta ile isteyebilirsiniz.  Her isteği bir kişinin yanıtlayacağını unutmayın."> - - -<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 4ed6ade..5df3df6 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com або https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Через допомогу"> <!ENTITY torsettings.bridgeHelp4 "У крайньому випадку, Ви можете отримати адресу мосту, відправивши ввічливе повідомлення на адресу help(a)rt.torproject.org.  Зверніть увагу на те, що кожен запит обробляється людиною."> - - -<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index 9243e1a..67a1700 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index bb905b0..de0c4e6 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index f18ebee..c3dc757 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index b48aed1..e5d368a 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Thông qua Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Như là phương thức cuối cùng, bạn có thể yêu cầu địa chỉ cầu nối bằng cách gửi một email lịch sự tới help(a)rt.torproject.org.  Vui lòng lưu ý rằng một người cần phải phản hồi tới từng yêu cầu."> - - -<!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút."> diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index bad6552..fe39f0f 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net，https://mail.google.com 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> <!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。"> - - -<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 03cf6a1..27fe26a 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> <!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> - - -<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index dff397b..5e6d31e 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> <!ENTITY torsettings.bridgeHelp4 "最後的方法是：您可以發送一封禮貌性的郵件到 help(a)rt.torproject.org.  請注意，對於此類郵件我們必需要一封封地手動回覆。"> - - -<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index e28f84e..0d2e9dc 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -73,6 +73,3 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">

1 0

[tor-launcher/master] Bug 23261: implement configuration portion of new Tor Launcher UI
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 4f07910c678fe2179f200ea4dc777782e006fe0a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Oct 30 15:43:52 2017 -0400 Bug 23261: implement configuration portion of new Tor Launcher UI Eliminate several wizard pages and include all of the bridge and proxy settings on one page. Use the new Tor Browser logo. Reuse Mozilla's help button from the Firefox hamburger menu and add help for the proxy settings.. In the wizard, use a "pageshow" event listener to show page-specific titles and to hide/show the navigation buttons as needed. After the user chooses to restart the tor process, display the "Waiting for Tor to start" panel. When tor is restarted by the user, disable networking so that bootstrapping does not begin right away; this allows the user to make configuration choices first. Do not try to connect to the control port if tor is not running. --- src/chrome/content/localePicker.xul | 8 +- src/chrome/content/network-settings-overlay.xul | 204 ++++++------ src/chrome/content/network-settings-wizard.xul | 172 +++------- src/chrome/content/network-settings.js | 405 ++++++++++++------------ src/chrome/content/network-settings.xul | 29 +- src/chrome/locale/en/network-settings.dtd | 58 ++-- src/chrome/locale/en/torlauncher.properties | 3 +- src/chrome/skin/network-settings.css | 87 +++-- src/chrome/skin/tbb-logo.png | Bin 20231 -> 0 bytes src/chrome/skin/tbb-logo.svg | 139 ++++++++ src/components/tl-process.js | 33 +- 11 files changed, 594 insertions(+), 544 deletions(-) diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xul index 5b93825..2017baa 100644 --- a/src/chrome/content/localePicker.xul +++ b/src/chrome/content/localePicker.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -26,10 +26,8 @@ src="chrome://torlauncher/content/network-settings.js"/> <wizardpage pageid="localePicker"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> + <hbox class="tbb-header" pack="center"> + <image class="tbb-logo"/> </hbox> <separator /> <vbox> diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 10751d1..8f1bc45 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -11,59 +11,73 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"> - <groupbox id="proxySpecificSettings"> - <grid flex="1"> - <columns> - <column/> - <column/> - </columns> - <rows> - <row align="center"> - <label value="&torsettings.useProxy.type;" control="proxyType" - style="text-align:right" /> - <hbox align="center"> - <menulist id="proxyType" oncommand="onProxyTypeChange()"> - <menupopup id="proxyType_menuPopup"> - <menuitem label="-" value="" selected="true" /> - <menuitem label="&torsettings.useProxy.type.socks4;" - value="SOCKS4"/> - <menuitem label="&torsettings.useProxy.type.socks5;" - value="SOCKS5"/> - <menuitem label="&torsettings.useProxy.type.http;" - value="HTTP"/> - </menupopup> - </menulist> - </hbox> - </row> - <row align="center"> - <label value="&torsettings.useProxy.address;" control="proxyAddr" - style="text-align:right" /> - <hbox align="center"> - <textbox id="proxyAddr" size="20" flex="1" - placeholder="&torsettings.useProxy.address.placeholder;" /> - <separator orient="vertical" /> - <label value="&torsettings.useProxy.port;" control="proxyPort"/> - <textbox id="proxyPort" size="4" /> - </hbox> - </row> - <row align="center"> - <label id="proxyUsernameLabel" - value="&torsettings.useProxy.username;" - control="proxyUsername" style="text-align:right" /> - <hbox align="center"> - <textbox id="proxyUsername" size="14" flex="1" - placeholder="&torsettings.optional;" /> - <separator orient="vertical" /> - <label id="proxyPasswordLabel" - value="&torsettings.useProxy.password;" - control="proxyPassword"/> - <textbox id="proxyPassword" size="14" type="password" - placeholder="&torsettings.optional;" /> - </hbox> - </row> - </rows> - </grid> - </groupbox> + <vbox id="proxySettings"> + <hbox align="center"> + <checkbox id="useProxy" groupboxID="proxySpecificSettings" + label="&torsettings.useProxy.checkbox;" + oncommand="toggleElemUI(this)"/> + <button class="helpButton" oncommand="onOpenHelp('proxyHelpContent')"/> + </hbox> + <groupbox id="proxySpecificSettings"> + <grid flex="1"> + <columns> + <column/> + <column/> + </columns> + <rows> + <row align="center"> + <label value="&torsettings.useProxy.type;" control="proxyType" + style="text-align:right"/> + <hbox align="center"> + <menulist id="proxyType" sizetopopup="always" + placeholder="&torsettings.useProxy.type.placeholder;" + oncommand="onProxyTypeChange()"> + <menupopup id="proxyType_menuPopup"> + <menuitem label="&torsettings.useProxy.type.socks4;" + value="SOCKS4"/> + <menuitem label="&torsettings.useProxy.type.socks5;" + value="SOCKS5"/> + <menuitem label="&torsettings.useProxy.type.http;" + value="HTTP"/> + </menupopup> + </menulist> + </hbox> + </row> + <row align="center"> + <label value="&torsettings.useProxy.address;" control="proxyAddr" + style="text-align:right"/> + <hbox align="center"> + <textbox id="proxyAddr" size="20" flex="1" + placeholder="&torsettings.useProxy.address.placeholder;"/> + <separator orient="vertical"/> + <label value="&torsettings.useProxy.port;" control="proxyPort"/> + <textbox id="proxyPort" size="4"/> + </hbox> + </row> + <row align="center"> + <label id="proxyUsernameLabel" + value="&torsettings.useProxy.username;" + control="proxyUsername" style="text-align:right"/> + <hbox align="center"> + <textbox id="proxyUsername" size="14" flex="1" + placeholder="&torsettings.optional;"/> + <separator orient="vertical"/> + <label id="proxyPasswordLabel" + value="&torsettings.useProxy.password;" + control="proxyPassword"/> + <textbox id="proxyPassword" size="14" type="password" + placeholder="&torsettings.optional;"/> + </hbox> + </row> + </rows> + </grid> + </groupbox> + </vbox> + + <vbox id="proxyHelpContent"> + <hbox align="middle"><label>&torsettings.proxyHelpTitle;</label></hbox> + <description>&torsettings.proxyHelp1;</description> + </vbox> <groupbox id="firewallSpecificSettings"> <hbox align="center"> @@ -73,59 +87,47 @@ </hbox> </groupbox> - <groupbox id="bridgeSpecificSettings"> - <hbox align="end" pack="end"> - <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px" - oncommand="onBridgeTypeRadioChange()"> - <radio id="bridgeRadioDefault" - label="&torsettings.useBridges.default;" selected="true" /> - <hbox id="bridgeDefaultEntry" align="baseline" style="margin-top: -5px"> - <label id="defaultBridgeTypeLabel" - value="&torsettings.useBridges.type;" - control="defaultBridgeType"/> - <menulist id="defaultBridgeType"> - <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> - <spacer style="height: 0.5em" /> + <vbox id="bridgeSettings"> + <checkbox id="useBridges" groupboxID="bridgeSpecificSettings" + label="&torsettings.useBridges.checkbox;" + oncommand="toggleElemUI(this);"/> + <groupbox id="bridgeSpecificSettings"> + <hbox align="end" pack="end"> + <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px" + oncommand="onBridgeTypeRadioChange()"> + <hbox align="center"> + <radio id="bridgeRadioDefault" + label="&torsettings.useBridges.default;" selected="true"/> + <button class="helpButton" + oncommand="onOpenHelp('bridgeHelpContent')"/> + <spacer style="width: 3em"/> + <menulist id="defaultBridgeType" sizetopopup="always" + placeholder="&torsettings.useBridges.default.placeholder;"> + <menupopup id="defaultBridgeType_menuPopup"/> + </menulist> + <spring/> + </hbox> - <radio align="start" id="bridgeRadioCustom" - label="&torsettings.useBridges.custom;" /> - </radiogroup> - <button dlgtype="help" oncommand="onOpenHelp()" /> - </hbox> - <vbox id="bridgeCustomEntry"> - <label id="bridgeListLabel" style="margin-top:0px;" - value="&torsettings.useBridges.label;" control="bridgeList"/> - <textbox id="bridgeList" multiline="true" rows="3" wrap="off" - oninput="onCustomBridgesTextInput();" - placeholder="&torsettings.useBridges.placeholder;" /> - </vbox> - </groupbox> + <radio align="start" id="bridgeRadioCustom" + label="&torsettings.useBridges.custom;"/> + </radiogroup> + </hbox> + <vbox id="bridgeCustomEntry"> + <label id="bridgeListLabel" style="margin-top:0px;" + value="&torsettings.useBridges.label;" control="bridgeList"/> + <textbox id="bridgeList" multiline="true" rows="3" wrap="off" + oninput="onCustomBridgesTextInput();" + placeholder="&torsettings.useBridges.placeholder;"/> + </vbox> + </groupbox> + </vbox> <vbox id="bridgeHelpContent"> <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> <description>&torsettings.bridgeHelp1;</description> - <description class="prelist">&torsettings.bridgeHelp1B;</description> - <html:ol> - <html:li> - <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div> - <html:div>&torsettings.bridgeHelp2;</html:div> - </html:li> - <html:li> - <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div> - <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> - <html:div>&torsettings.bridgeHelp3.emailList;</html:div> - </html:li> - - </html:ol> + <description>&torsettings.bridgeHelp2;</description> </vbox> + <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" onclick="closeCopyLogFeedbackPanel()"> <description flex="1" /> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 56217c5..5d76331 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -15,7 +15,7 @@ <wizard id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - title="&torsettings.dialog.title;" + defaulttitle="&torsettings.wizard.title.default;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" buttonlabelextra2="&torsettings.copyLog;" @@ -27,132 +27,39 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> -  - <wizardpage pageid="first" next="proxy" onextra2="onCopyLog();" - onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" orient="vertical" /> - <groupbox flex="1"> - <description>&torsettings.prompt;</description> - </groupbox> + <wizardpage pageid="first" next="configureSettings" onextra2="onCopyLog();" + torShowNavButtons="false"> + <hbox class="tbb-header" pack="center"> + <image class="tbb-logo"/> </hbox> - <separator /> - <vbox class="firstResponses" align="start"> - <label class="question">&torSettings.firstQuestion;</label> - <separator/> - <label>&torSettings.connectPrompt2;</label> - <label>&torSettings.connectPrompt3;</label> - <button label="&torSettings.connect;" - oncommand="onWizardFirstPanelConnect();"/> - <separator class="tall"/> - <label>&torSettings.configurePrompt1;</label> - <label>&torSettings.configurePrompt2;</label> - <button label="&torSettings.configure;" oncommand="onWizardConfigure();"/> - </vbox> - </wizardpage> - <wizardpage pageid="bridges" next="proxy" onextra2="onCopyLog();" - onpageshow="showWizardNavButtons(true);" - onpageadvanced="return onWizardUseBridgesNext(this)"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" orient="vertical" /> - <vbox pack="end"> - <label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/> - </vbox> - </hbox> - <separator /> - <hbox> - <vbox flex="1"> - <label class="question">&torSettings.bridgeQuestion;</label> - <radiogroup id="useBridgesRadioGroup"> - <radio id="bridgesRadioYes" label="&torSettings.yes;" /> - <radio id="bridgesRadioNo" label="&torSettings.no;" selected="true" /> - </radiogroup> - <description class="questionHelp">&torSettings.bridgeExplanation1; - </description> - <description class="questionHelp">&torSettings.bridgeExplanation2; - </description> - </vbox> - </hbox> - </wizardpage> - - <wizardpage pageid="bridgeSettings" next="proxy" onextra2="onCopyLog();" - onpageshow="onWizardBridgeSettingsShow();"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" orient="vertical" /> - <vbox pack="end"> - <label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/> - </vbox> - </hbox> - <separator /> - <vbox> - <label id="bridgeSettingsPrompt" - class="question">&torSettings.bridgeSettingsPrompt;  -&torsettings.useBridges.note;</label> - <groupbox id="bridgeSpecificSettings" /> + <separator class="tall"/> + <vbox class="firstResponses" align="center"> + <label>&torSettings.connectPrompt;</label> + <label>&torSettings.configurePrompt;</label> + <separator/> + <hbox> + <button label="&torSettings.connect;" + oncommand="onWizardFirstPanelConnect();"/> + <button label="&torSettings.configure;" + oncommand="onWizardConfigure();"/> + </hbox> </vbox> </wizardpage> - <wizardpage pageid="proxy" onextra2="onCopyLog();" - onpageshow="onWizardUseProxyRadioChange()" - onpageadvanced="return onWizardProxyNext(this);"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" orient="vertical" /> - <vbox pack="end"> - <label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/> - </vbox> - </hbox> - <separator /> - <hbox> - <vbox flex="1"> - <label class="question">&torSettings.proxyQuestion;</label> - <radiogroup id="proxyRadioGroup" - oncommand="onWizardUseProxyRadioChange()"> - <radio id="proxyRadioYes" label="&torSettings.yes;" /> - <radio id="proxyRadioNo" label="&torSettings.no;" selected="true" /> - </radiogroup> - <description class="questionHelp">&torSettings.proxyExplanation1; - </description> - <description class="questionHelp">&torSettings.proxyExplanation2; - </description> - </vbox> - </hbox> + <wizardpage pageid="configureSettings" onextra2="onCopyLog();" + windowtitle="&torsettings.wizard.title.configure;" + torShowNavButtons="true"> + <separator class="tall"/> + <vbox id="bridgeSettings"/> + <separator/> + <vbox id="proxySettings"/> </wizardpage> - <wizardpage pageid="proxyYES" onextra2="onCopyLog();" - onpageshow="onWizardProxySettingsShow()" - onpageadvanced="return (getAndValidateProxySettings() != null)"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" orient="vertical" /> - <vbox pack="end"> - <label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/> - </vbox> + <wizardpage pageid="startingTor" next="notUsed" torShowNavButtons="false"> + <hbox class="tbb-header" pack="center"> + <image class="tbb-logo"/> </hbox> - <separator /> - <label class="instructions">&torSettings.enterProxy;</label> - <groupbox id="proxySpecificSettings" /> - </wizardpage> - -  - <wizardpage pageid="startingTor" next="notUsed" - onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> <spring flex="1" /> <hbox> <spring flex="1" /> @@ -162,8 +69,7 @@ <spring flex="1" /> </wizardpage> - <wizardpage pageid="errorPanel" next="notUsed" - onpageshow="showWizardNavButtons(false);" + <wizardpage pageid="errorPanel" next="notUsed" torShowNavButtons="false" onextra2="onCopyLog();"> <spring flex="1" /> <hbox> @@ -183,35 +89,29 @@ <spring flex="1" /> </wizardpage> - <wizardpage pageid="discardSettings" next="notUsed" - onpageshow="showWizardNavButtons(false);" + <wizardpage pageid="discardSettings" next="notUsed" torShowNavButtons="false" onextra2="onCopyLog();"> - <hbox class="tbb-header"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> + <hbox class="tbb-header" pack="center"> + <image class="tbb-logo"/> </hbox> <spring flex="1" /> - <hbox> - <spring flex="1" /> + <hbox pack="center"> <description flex="1">&torsettings.discardSettings.prompt;</description> - <spring flex="1" /> </hbox> <separator/> - <hbox> - <spring flex="1" /> + <hbox pack="center"> <button id="discardSettingsGoBack" oncommand="showPanel();"/> <separator/> <button label="&torsettings.discardSettings.proceed;" oncommand="removeSettingsAndConnect()" /> - <spring flex="1" /> </hbox> <spring flex="1" /> </wizardpage> - <wizardpage class="help" pageid="bridgeHelp" next="notUsed" + <wizardpage class="help" pageid="helpPanel" next="notUsed" onpageadvanced="closeHelp(); return false;"> - <vbox id="bridgeHelpContent" /> + <vbox id="bridgeHelpContent" hidden="true"/> + <vbox id="proxyHelpContent" hidden="true"/> </wizardpage> <hbox pack="start"> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 830ef31..f8dcb3b 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2016, The Tor Project, Inc. +// Copyright (c) 2017, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,6 +19,7 @@ const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; const kPrefLocale = "general.useragent.locale"; const kPrefMatchOSLocale = "intl.locale.matchOS"; +// The recommended type is listed first in the dropdown menu. const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; @@ -34,9 +35,6 @@ const kTorOpenProgressTopic = "TorOpenProgressDialog"; const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; -const kWizardProxyRadioGroup = "proxyRadioGroup"; -const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; - const kWizardFirstPageID = "first"; const kLocaleList = "localeList"; @@ -67,17 +65,16 @@ const kTorConfKeyBridgeList = "Bridge"; var gProtocolSvc = null; var gTorProcessService = null; var gObsService = null; -var gHasQuitButton = false; var gIsInitialBootstrap = false; +var gInitialPanelID = undefined; var gIsBootstrapComplete = false; var gRestoreAfterHelpPanelID = null; +var gIsPostRestartBootstrapNeeded = false; var gActiveTopics = []; // Topics for which an observer is currently installed. function initDialogCommon(aHasQuitButton) { - gHasQuitButton = aHasQuitButton; - gObsService = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); @@ -140,9 +137,8 @@ function initDialog() gIsInitialBootstrap = window.arguments[0]; initDialogCommon(gIsInitialBootstrap); - var startAtPanel; if (window.arguments.length > 1) - startAtPanel = window.arguments[1]; + gInitialPanelID = window.arguments[1]; if (gIsInitialBootstrap) { @@ -187,22 +183,12 @@ function initDialog() showCopyLogButton(true); } - // Use "Connect" as the finish button label (on the last wizard page).. + // Use "Connect" as the finish button label (on the last wizard page). var finishBtn = document.documentElement.getButton("finish"); if (finishBtn) - finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); - - // Add label and access key to Help button. - var helpBtn = document.documentElement.getButton("help"); - if (helpBtn) { - var strBundle = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService) - .createBundle("chrome://global/locale/dialog.properties"); - helpBtn.setAttribute("label", strBundle.GetStringFromName("button-help")); - var accessKey = strBundle.GetStringFromName("accesskey-help"); - if (accessKey) - helpBtn.setAttribute("accesskey", accessKey); + finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); + finishBtn.removeAttribute("default"); // We do not want a default button. } // Set Discard Settings back button label to match the wizard Back button. @@ -232,12 +218,14 @@ function initDialog() } else { - readTorSettings(); + onTorStarted(); + } - if (startAtPanel) - advanceToWizardPanel(startAtPanel); - else - showPanel(); + if (haveWizard) + { + onWizardPageShow(); + document.addEventListener("pageshow", + aEvent => { onWizardPageShow(); }, false); } resizeDialogToFitContent(); @@ -368,7 +356,7 @@ function maxWidthOfContent() // Show all buttons so we can get an accurate width measurement. // They will be hidden, as necessary, by the wizard. - let buttons = "back,next,cancel,extra2,help".split(','); + let buttons = "back,next,cancel,extra2".split(','); for (let i = 0; i < buttons.length; ++i) showOrHideButton(buttons[i], true, false); @@ -385,6 +373,28 @@ function maxWidthOfContent() } +function onWizardPageShow() +{ + let wizardElem = getWizard(); + // Update page title. + let title = wizardElem.currentPage.getAttribute("windowtitle"); + if (!title) + title = wizardElem.getAttribute("defaulttitle"); + document.title = title; + + // Hide or show navigation buttons as appropriate. + // setTimeout() is needed for the first panel that is displayed. + let val = wizardElem.currentPage.getAttribute("torShowNavButtons"); + setTimeout(function() { + showOrHideButton("back", (val == "true"), false); + + // The "next" button is only used by the bridgeHelp wizard panel. + let isShowingHelp = (wizardElem.currentPage.pageid == "helpPanel"); + showOrHideButton("next", isShowingHelp, false); + }, 0); +} + + function getWizard() { let elem = document.getElementById("TorNetworkSettings"); @@ -415,62 +425,7 @@ function removeSettingsAndConnect() function onWizardConfigure() { - getWizard().advance("bridges"); -} - - -function onWizardProxyNext(aWizPage) -{ - if (aWizPage) - { - var hasProxy = getElemValue("proxyRadioYes", false); - aWizPage.next = (hasProxy) ? "proxyYES" : ""; - } - - return true; -} - - -function onWizardUseProxyRadioChange() -{ - var wizard = getWizard(); - if (wizard && wizard.currentPage) - { - var hasProxy = getElemValue("proxyRadioYes", false); - wizard.setAttribute("lastpage", !hasProxy); - wizard._wizardButtons.onPageChange(); - } -} - - -function onWizardProxySettingsShow() -{ - var wizard = getWizard(); - if (wizard) - { - wizard.setAttribute("lastpage", true); - wizard._wizardButtons.onPageChange(); - } -} - - -function onWizardUseBridgesNext(aWizPage) -{ - if (aWizPage) - { - var useBridges = getElemValue("bridgesRadioYes", false); - aWizPage.next = (useBridges) ? "bridgeSettings" : "proxy"; - } - - return true; -} - - -function onWizardBridgeSettingsShow() -{ - var btn = document.documentElement.getButton("next"); - if (btn) - btn.focus(); + getWizard().advance("configureSettings"); } @@ -486,8 +441,8 @@ function onCustomBridgesTextInput() function onBridgeTypeRadioChange() { var useCustom = getElemValue(kCustomBridgesRadio, false); - enableElemWithLabel(kDefaultBridgeTypeMenuList, !useCustom); - enableElemWithLabel(kBridgeList + "Label", useCustom); + setBoolAttrForElemWithLabel(kDefaultBridgeTypeMenuList, "hidden", useCustom); + setBoolAttrForElemWithLabel(kBridgeList, "hidden", !useCustom); var focusElemID = (useCustom) ? kBridgeList : kDefaultBridgeTypeMenuList; var elem = document.getElementById(focusElemID); if (elem) @@ -495,13 +450,6 @@ function onBridgeTypeRadioChange() } -function showWizardNavButtons(aShowBtns) -{ - showOrHideButton("back", aShowBtns, false); - showOrHideButton("next", aShowBtns, false); -} - - var gObserver = { observe: function(aSubject, aTopic, aData) { @@ -516,11 +464,7 @@ var gObserver = { { removeObserver(kTorProcessReadyTopic); removeObserver(kTorProcessDidNotStartTopic); - var haveWizard = (getWizard() != null); - showPanel(); - if (haveWizard) - showWizardNavButtons(true); - readTorSettings(); + onTorStarted(); } else if (kTorProcessDidNotStartTopic == aTopic) { @@ -577,7 +521,7 @@ function readTorSettings() TorLauncherLogger.log(2, "readTorSettings " + "----------------------------------------------"); - var didSucceed = false; + let didSucceed = false; try { // TODO: retrieve > 1 key at one time inside initProxySettings() et al. @@ -593,15 +537,28 @@ function readTorSettings() setTimeout(function() { - var details = TorLauncherUtil.getLocalizedString( + let details = TorLauncherUtil.getLocalizedString( "ensure_tor_is_running"); - var s = TorLauncherUtil.getFormattedLocalizedString( + let s = TorLauncherUtil.getFormattedLocalizedString( "failed_to_get_settings", [details], 1); TorLauncherUtil.showAlert(window, s); close(); }, 0); } - TorLauncherLogger.log(2, "readTorSettings done"); + + TorLauncherLogger.log(2, "readTorSettings done; didSucceed: " + didSucceed); + return didSucceed; +} + + +function onTorStarted() +{ + if (readTorSettings()) + { + showPanel(); + if (gInitialPanelID) + advanceToWizardPanel(gInitialPanelID); + } } @@ -618,9 +575,6 @@ function showPanel(aPanelID) else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); - if (wizard && (aPanelID == kWizardFirstPageID)) - setTimeout( function() { showWizardNavButtons(false); }, 0); - showOrHideButton("accept", (aPanelID == "settings"), true); } @@ -648,10 +602,6 @@ function advanceToWizardPanel(aPanelID) function showStartingTorPanel() { - var haveWizard = (getWizard() != null); - if (haveWizard) - showWizardNavButtons(false); - showPanel("startingTor"); } @@ -693,10 +643,6 @@ function showErrorMessage(aTorExited, aErrorMsg, aShowReconfigButton) showPanel("errorPanel"); - var haveWizard = (getWizard() != null); - if (haveWizard) - showWizardNavButtons(false); - var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || gProtocolSvc.TorLogHasWarnOrErr) showCopyLogButton(haveErrorOrWarning); @@ -775,8 +721,8 @@ function setButtonAttr(aID, aAttr, aValue) } -// Enables / disables aID as well as optional aID+"Label" element. -function enableElemWithLabel(aID, aEnable) +// Sets or removes aAttr for aID as well as optional aID+"Label" element. +function setBoolAttrForElemWithLabel(aID, aAttr, aValue) { if (!aID) return; @@ -785,24 +731,31 @@ function enableElemWithLabel(aID, aEnable) if (elem) { var label = document.getElementById(aID + "Label"); - if (aEnable) + if (aValue) { if (label) - label.removeAttribute("disabled"); + label.setAttribute(aAttr, true); - elem.removeAttribute("disabled"); + elem.setAttribute(aAttr, true); } else { if (label) - label.setAttribute("disabled", true); + label.removeAttribute(aAttr); - elem.setAttribute("disabled", true); + elem.removeAttribute(aAttr); } } } +// Enables / disables aID as well as optional aID+"Label" element. +function enableElemWithLabel(aID, aEnable) +{ + setBoolAttrForElemWithLabel(aID, "disabled", !aEnable); +} + + // Removes placeholder text when disabled. function enableTextBox(aID, aEnable) { @@ -825,6 +778,19 @@ function enableTextBox(aID, aEnable) } +function showMenuListPlaceholderText(aElemID) +{ + let menu = document.getElementById(aElemID); + if (menu) + { + menu.selectedItem = undefined; + let placeholder = menu.getAttribute("placeholder"); + if (placeholder) + menu.setAttribute("label", placeholder); + } +} + + function overrideButtonLabel(aID, aLabelKey) { var btn = document.documentElement.getButton(aID); @@ -889,8 +855,11 @@ function onRestartTor() addObserver(kTorProcessDidNotStartTopic); addObserver(kTorProcessExitedTopic); - gTorProcessService._startTor(); - gTorProcessService._controlTor(); + // Start tor with networking disabled so that the user has a chance to + // make configuration changes before bootstrapping begins. + gIsPostRestartBootstrapNeeded = true; + showStartingTorPanel(); + gTorProcessService.TorStartAndControlTor(true); } @@ -898,10 +867,6 @@ function onWizardReconfig() { showPanel(kWizardFirstPageID); onWizardConfigure(); - // Because a similar delayed call is used to hide the buttons when the - // first wizard page is displayed, we use setTimeout() here to ensure - // that the navigation buttons are visible. - window.setTimeout(function() { showWizardNavButtons(true); }, 0); } @@ -913,15 +878,37 @@ function onCancel() return false; } - if (gHasQuitButton) try + // If this is a wizard (initial config or locale picker), the cancel + // button is "Quit" + if (getWizard()) { - gObsService.notifyObservers(null, "TorUserRequestedQuit", null); - } catch (e) {} + try + { + gObsService.notifyObservers(null, "TorUserRequestedQuit", null); + } catch (e) {} + } + else if (gIsPostRestartBootstrapNeeded) + { + useSettings(); + return false; + } return true; } +function onNetworkSettingsFinish() +{ + if (gRestoreAfterHelpPanelID) // Is help open? + { + closeHelp(); + return false; + } + + return applySettings(false); +} + + function onCopyLog() { // Copy tor log messages to the system clipboard. @@ -931,14 +918,13 @@ function onCopyLog() chSvc.copyString(gProtocolSvc.TorGetLog(countObj)); // Display a feedback popup that fades away after a few seconds. - let forAssistance = document.getElementById("forAssistance"); + let copyLogBtn = document.documentElement.getButton("extra2"); let panel = document.getElementById("copyLogFeedbackPanel"); - if (forAssistance && panel) + if (copyLogBtn && panel) { panel.firstChild.textContent = TorLauncherUtil.getFormattedLocalizedString( "copiedNLogMessages", [countObj.value], 1); - let rectObj = forAssistance.getBoundingClientRect(); - panel.openPopup(null, null, rectObj.left, rectObj.top, false, false); + panel.openPopup(copyLogBtn, "before_start", 0, 0, false, false); } } @@ -951,7 +937,7 @@ function closeCopyLogFeedbackPanel() } -function onOpenHelp() +function onOpenHelp(aHelpContentID) { if (gRestoreAfterHelpPanelID) // Already open? return; @@ -962,7 +948,11 @@ function onOpenHelp() else gRestoreAfterHelpPanelID = getWizard().currentPage.pageid; - showPanel("bridgeHelp"); + let contentElem = document.getElementById(aHelpContentID); + if (contentElem) + contentElem.removeAttribute("hidden"); + + showPanel("helpPanel"); showOrHideButton("extra2", false, false); // Hide "Copy Tor Log To Clipboard" @@ -971,6 +961,7 @@ function onOpenHelp() showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); overrideButtonLabel("next", "done"); + showOrHideButton("next", true, false); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) forAssistance.setAttribute("hidden", true); @@ -989,30 +980,41 @@ function closeHelp() restoreCopyLogVisibility(); - if (getWizard()) + let helpPanel; + let wizardElem = getWizard(); + if (wizardElem) { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); + showOrHideButton("next", false, false); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) forAssistance.removeAttribute("hidden"); + helpPanel = wizardElem.currentPage; } else { restoreButtonLabel("cancel"); + helpPanel = document.getElementById("helpPanel"); } showPanel(gRestoreAfterHelpPanelID); gRestoreAfterHelpPanelID = null; + + for (let childElem = helpPanel.firstChild; childElem; + childElem = childElem.nextSibling) + { + childElem.setAttribute("hidden", true); + } } // Returns true if successful. function initProxySettings() { - var proxyType, proxyAddrPort, proxyUsername, proxyPassword; - var reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks4Proxy, null); + let proxyType, proxyAddrPort, proxyUsername, proxyPassword; + let reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks4Proxy, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; @@ -1023,7 +1025,7 @@ function initProxySettings() } else { - var reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks5Proxy, null); + reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks5Proxy, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; @@ -1031,14 +1033,12 @@ function initProxySettings() { proxyType = "SOCKS5"; proxyAddrPort = reply.retVal; - var reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks5ProxyUsername, - null); + reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks5ProxyUsername, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; proxyUsername = reply.retVal; - var reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks5ProxyPassword, - null); + reply = gProtocolSvc.TorGetConfStr(kTorConfKeySocks5ProxyPassword, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; @@ -1046,7 +1046,7 @@ function initProxySettings() } else { - var reply = gProtocolSvc.TorGetConfStr(kTorConfKeyHTTPSProxy, null); + reply = gProtocolSvc.TorGetConfStr(kTorConfKeyHTTPSProxy, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; @@ -1054,28 +1054,30 @@ function initProxySettings() { proxyType = "HTTP"; proxyAddrPort = reply.retVal; - var reply = gProtocolSvc.TorGetConfStr( + reply = gProtocolSvc.TorGetConfStr( kTorConfKeyHTTPSProxyAuthenticator, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; - var values = parseColonStr(reply.retVal); + let values = parseColonStr(reply.retVal); proxyUsername = values[0]; proxyPassword = values[1]; } } } - var haveProxy = (proxyType != undefined); - setYesNoRadioValue(kWizardProxyRadioGroup, haveProxy); + let haveProxy = (proxyType != undefined); setElemValue(kUseProxyCheckbox, haveProxy); setElemValue(kProxyTypeMenulist, proxyType); + if (!proxyType) + showMenuListPlaceholderText(kProxyTypeMenulist); + onProxyTypeChange(); - var proxyAddr, proxyPort; + let proxyAddr, proxyPort; if (proxyAddrPort) { - var values = parseColonStr(proxyAddrPort); + let values = parseColonStr(proxyAddrPort); proxyAddr = values[0]; proxyPort = values[1]; } @@ -1128,24 +1130,26 @@ function initFirewallSettings() // Returns true if successful. function initBridgeSettings() { - var typeList = TorLauncherUtil.defaultBridgeTypes; - var canUseDefaultBridges = (typeList && (typeList.length > 0)); - var defaultType = TorLauncherUtil.getCharPref(kPrefDefaultBridgeType); - var useDefault = canUseDefaultBridges && !!defaultType; + let typeList = TorLauncherUtil.defaultBridgeTypes; + let canUseDefaultBridges = (typeList && (typeList.length > 0)); + let defaultType = TorLauncherUtil.getCharPref(kPrefDefaultBridgeType); + let useDefault = canUseDefaultBridges && !!defaultType; // If not configured to use a default set of bridges, get UseBridges setting // from tor. - var useBridges = useDefault; + let useBridges = useDefault; if (!useDefault) { - var reply = gProtocolSvc.TorGetConfBool(kTorConfKeyUseBridges, false); + showMenuListPlaceholderText(kDefaultBridgeTypeMenuList); + + let reply = gProtocolSvc.TorGetConfBool(kTorConfKeyUseBridges, false); if (!gProtocolSvc.TorCommandSucceeded(reply)) return false; useBridges = reply.retVal; // Get bridge list from tor. - var bridgeReply = gProtocolSvc.TorGetConf(kTorConfKeyBridgeList); + let bridgeReply = gProtocolSvc.TorGetConf(kTorConfKeyBridgeList); if (!gProtocolSvc.TorCommandSucceeded(bridgeReply)) return false; @@ -1159,21 +1163,16 @@ function initBridgeSettings() } setElemValue(kUseBridgesCheckbox, useBridges); - setYesNoRadioValue(kWizardUseBridgesRadioGroup, useBridges); if (!canUseDefaultBridges) { - var label = document.getElementById("bridgeSettingsPrompt"); - if (label) - label.setAttribute("hidden", true); - var radioGroup = document.getElementById("bridgeTypeRadioGroup"); if (radioGroup) radioGroup.setAttribute("hidden", true); } - var radioID = (useDefault) ? "bridgeRadioDefault" : "bridgeRadioCustom"; - var radio = document.getElementById(radioID); + let radioID = (useDefault) ? "bridgeRadioDefault" : "bridgeRadioCustom"; + let radio = document.getElementById(radioID); if (radio) radio.control.selectedItem = radio; onBridgeTypeRadioChange(); @@ -1213,6 +1212,8 @@ function useSettings() if (!didApply) return; + gIsPostRestartBootstrapNeeded = false; + gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); @@ -1272,7 +1273,7 @@ function applyProxySettings(aUseDefaults) if (!settings) return false; - return setConfAndReportErrors(settings, "proxyYES"); + return setConfAndReportErrors(settings, "configureSettings"); } @@ -1344,8 +1345,7 @@ function getAndValidateProxySettings() function isProxyConfigured() { - return (getWizard()) ? getYesNoRadioValue(kWizardProxyRadioGroup) - : getElemValue(kUseProxyCheckbox, false); + return getElemValue(kUseProxyCheckbox, false); } @@ -1451,34 +1451,44 @@ function constructFirewallSettings(aAllowedPorts) function initDefaultBridgeTypeMenu() { - var menu = document.getElementById(kDefaultBridgeTypeMenuList); + let menu = document.getElementById(kDefaultBridgeTypeMenuList); if (!menu) return; menu.removeAllItems(); - var typeArray = TorLauncherUtil.defaultBridgeTypes; + let typeArray = TorLauncherUtil.defaultBridgeTypes; if (!typeArray || typeArray.length == 0) return; - var recommendedType = TorLauncherUtil.getCharPref( + // Move the recommended type to the top of the list. + let recommendedType = TorLauncherUtil.getCharPref( kPrefDefaultBridgeRecommendedType, null); - var selectedType = TorLauncherUtil.getCharPref(kPrefDefaultBridgeType, null); - if (!selectedType) - selectedType = recommendedType; - - for (var i=0; i < typeArray.length; i++) + if (recommendedType) { - var bridgeType = typeArray[i]; - - var menuItemLabel = bridgeType; - if (bridgeType == recommendedType) + for (let i = 0; i < typeArray.length; i++) { - const key = "recommended_bridge"; - menuItemLabel += " " + TorLauncherUtil.getLocalizedString(key); + if (typeArray[i] == recommendedType) + { + typeArray.splice(i, 1); // remove + typeArray.unshift(recommendedType); // add to the beginning + break; + } } + } + + // Build the popup menu. + let selectedType = TorLauncherUtil.getCharPref(kPrefDefaultBridgeType, null); + for (let i = 0; i < typeArray.length; i++) + { + let bridgeType = typeArray[i]; + let menuItemLabel = bridgeType; + let key = "bridge_suffix." + bridgeType; + let suffix = TorLauncherUtil.getLocalizedString(key); + if (suffix != key) + menuItemLabel += " " + suffix; - var mi = menu.appendItem(menuItemLabel, bridgeType); + let mi = menu.appendItem(menuItemLabel, bridgeType); if (bridgeType == selectedType) menu.selectedItem = mi; } @@ -1496,7 +1506,7 @@ function applyBridgeSettings(aUseDefaults) if (aUseDefaults) TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, ""); - return setConfAndReportErrors(settings, "bridgeSettings"); + return setConfAndReportErrors(settings, "configureSettings"); } @@ -1561,8 +1571,7 @@ function getAndValidateBridgeSettings() function isBridgeConfigured() { - return (getWizard()) ? getElemValue("bridgesRadioYes", false) - : getElemValue(kUseBridgesCheckbox, false); + return getElemValue(kUseBridgesCheckbox, false); } @@ -1715,34 +1724,20 @@ function getElemValue(aID, aDefaultValue) } -// This assumes that first radio button is yes. -function setYesNoRadioValue(aGroupID, aIsYes) -{ - var elem = document.getElementById(aGroupID); - if (elem) - elem.selectedIndex = (aIsYes) ? 0 : 1; -} - - -// This assumes that first radio button is yes. -function getYesNoRadioValue(aGroupID) -{ - var elem = document.getElementById(aGroupID); - return (elem) ? (0 == elem.selectedIndex) : false; -} - - +// Hide and show groupbox based on aElem's checked state. aElem may be a +// checkbox or radio element. function toggleElemUI(aElem) { if (!aElem) return; - var gbID = aElem.getAttribute("groupboxID"); + let gbID = aElem.getAttribute("groupboxID"); if (gbID) { - var gb = document.getElementById(gbID); + let isOn = getElemValue(aElem.id, false); + let gb = document.getElementById(gbID); if (gb) - gb.hidden = !aElem.checked; + gb.hidden = !isOn; } } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 727e7f6..e6d3531 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -18,12 +18,11 @@ title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttons="accept,cancel,extra2,help" + buttons="accept,cancel,extra2" buttonlabelextra2="&torsettings.copyLog;" - ondialogaccept="return applySettings(false);" + ondialogaccept="return onNetworkSettingsFinish();" ondialogcancel="return onCancel();" ondialogextra2="onCopyLog();" - ondialoghelp="onOpenHelp();" onload="initDialog();" onunload="deinitDialog();"> @@ -32,20 +31,9 @@ <deck id="deck"> <vbox id="settings"> - <vbox> - <checkbox id="useBridges" groupboxID="bridgeSpecificSettings" - label="&torsettings.useBridges.checkbox;" - oncommand="toggleElemUI(this);" /> - <groupbox id="bridgeSpecificSettings" /> - </vbox> - - <vbox> - <separator orient="horizontal" class="thin" /> - <checkbox id="useProxy" groupboxID="proxySpecificSettings" - label="&torsettings.useProxy.checkbox;" - oncommand="toggleElemUI(this)"/> - <groupbox id="proxySpecificSettings" /> - </vbox> + <vbox id="bridgeSettings"/> + <separator orient="horizontal" class="thin"/> + <vbox id="proxySettings"/> <vbox> <checkbox id="useFirewallPorts" groupboxID="firewallSpecificSettings" @@ -79,8 +67,9 @@ </hbox> <spring flex="1" /> </vbox> - <vbox id="bridgeHelp" class="help"> - <vbox id="bridgeHelpContent" /> + <vbox id="helpPanel" class="help"> + <vbox id="bridgeHelpContent" hidden="true"/> + <vbox id="proxyHelpContent" hidden="true"/> </vbox> </deck> <spring flex="1" /> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 0d2e9dc..dc666dd 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,22 +38,18 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 24bb4d6..b09753e 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 20d3528..3b6faba 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, The Tor Project, Inc. + * Copyright (c) 2017, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -18,14 +18,14 @@ dialog.os-windows { wizard { width: 45em; - height: 35em; + height: 36em; font: -moz-dialog; padding-top: 0px; } wizard.os-windows { width: 49em; - height: 41em; + height: 42em; } .wizard-page-box { @@ -57,9 +57,14 @@ wizard radiogroup { margin-bottom: 0px; } +.firstResponses label { + text-align: center; + margin-top: 1.2em; +} + .firstResponses button { min-width: 85px; - margin-top: 9px; + margin: 9px 40px; } separator.tall { @@ -71,31 +76,17 @@ separator.tall { font-weight: bold; } -.questionHelp { - margin: 0px 0px 12px 20px; -} - -.instructions { - margin-bottom: 8px; -} - button.firstAnswer { margin-top: 0px; } -.tbb-logo-box { - height: 80px; -} - .tbb-logo { - list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); - width: 115px; - height: 80px; - margin-right: 20px; + list-style-image: url("chrome://torlauncher/skin/tbb-logo.svg"); + width: 40em; + height: 60px; } -wizard[tor_hide_browser_logo="true"] .tbb-logo, -wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { +wizard[tor_hide_browser_logo="true"] .tbb-logo { display: none; } @@ -104,9 +95,12 @@ wizard#TorLauncherLocalePicker button[dlgtype="next"] { display: none; } -.tbb-wizardpage-title { - font-size: 115%; - font-weight: bold; +/* Show menulist placeholder text in gray. */ +#defaultBridgeType:not([value]) .menulist-label, +#defaultBridgeType[value=""] .menulist-label, +#proxyType:not([value]) .menulist-label, +#proxyType[value=""] .menulist-label { + color: #777; } #bridgeNote, @@ -120,6 +114,49 @@ wizard.os-mac #bridgeList { font-size: 90%; } +/* reuse Mozilla's help button from the Firefox hamburger menu */ +.helpButton { + list-style-image: url(chrome://browser/skin/menuPanel-help.png); + -moz-image-region: rect(0, 16px, 16px, 0); + -moz-appearance: none; + height: 16px; + width: 16px; + min-height: 16px; + min-width: 16px; + margin: 0; + border: none; + box-shadow: none; +} + +.helpButton .button-box { + padding: 0; + margin: 0; + border: none; +} + +.helpButton:hover { + -moz-image-region: rect(0, 32px, 16px, 16px); +} + +.helpButton:hover:active { + -moz-image-region: rect(0, 48px, 16px, 32px); +} + +@media (min-resolution: 8.1dppx) { + .helpButton { + list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png); + -moz-image-region: rect(0, 32px, 32px, 0); + } + + .helpButton:hover { + -moz-image-region: rect(0, 64px, 32px, 32px); + } + + .helpButton:hover:active { + -moz-image-region: rect(0, 96px, 32px, 64px); + } +} + wizardpage[pageid="startingTor"] description, wizardpage[pageid="errorPanel"] description, #errorPanel description, diff --git a/src/chrome/skin/tbb-logo.png b/src/chrome/skin/tbb-logo.png deleted file mode 100644 index 5499203..0000000 Binary files a/src/chrome/skin/tbb-logo.png and /dev/null differ diff --git a/src/chrome/skin/tbb-logo.svg b/src/chrome/skin/tbb-logo.svg new file mode 100644 index 0000000..26cd158 --- /dev/null +++ b/src/chrome/skin/tbb-logo.svg @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 328.6 66.3" enable-background="new 0 0 328.6 66.3" xml:space="preserve"> +<g> + <g> + <g> + <path fill="#68B044" d="M138.8,28.3h11.9c7.6,0,13.3,2.3,13.3,9.2c0,3.5-2,7-6.4,8.1v0.2c5.4,0.9,8.4,3.8,8.4,8.8 + c0,7.5-6.1,10.9-14.3,10.9h-12.9V28.3z M150.1,43.7c5.2,0,7.4-2,7.4-5.5c0-3.4-2.4-4.8-7.2-4.8h-4.8v10.3H150.1z M151,60.4 + c5.5,0,8.5-2.1,8.5-6.3c0-3.9-3-5.7-8.5-5.7h-5.6v12H151z"/> + </g> + <g> + <path fill="#68B044" d="M170.7,37.6h5.4l0.5,5h0.2c2-3.6,5-5.6,7.9-5.6c1.4,0,2.3,0.2,3.2,0.6l-1.1,5.7c-1-0.3-1.7-0.5-2.9-0.5 + c-2.2,0-4.9,1.5-6.6,5.8v17.1h-6.6V37.6z"/> + </g> + <g> + <path fill="#68B044" d="M201.4,36.9c7,0,13.3,5.4,13.3,14.7c0,9.3-6.3,14.7-13.3,14.7c-7,0-13.3-5.4-13.3-14.7 + C188.1,42.2,194.5,36.9,201.4,36.9z M201.4,60.9c4.1,0,6.6-3.7,6.6-9.3c0-5.6-2.5-9.4-6.6-9.4s-6.6,3.7-6.6,9.4 + C194.9,57.2,197.3,60.9,201.4,60.9z"/> + </g> + <g> + <path fill="#68B044" d="M216.7,37.6h6.6l3.4,14.5c0.6,2.7,1,5.3,1.5,8h0.2c0.5-2.7,1.1-5.4,1.8-8l3.6-14.5h6l3.7,14.5 + c0.7,2.7,1.3,5.3,1.9,8h0.2c0.5-2.7,1-5.4,1.5-8l3.4-14.5h6.2l-7.1,28h-7.8l-3.3-13.1c-0.6-2.6-1.1-5.2-1.7-8.2h-0.2 + c-0.5,3-1,5.6-1.7,8.2l-3.2,13h-7.5L216.7,37.6z"/> + </g> + <g> + <path fill="#68B044" d="M261,58.2c2.5,1.9,4.9,3.1,7.8,3.1c3,0,4.4-1.4,4.4-3.4c0-2.3-3-3.4-6-4.5c-3.7-1.4-7.9-3.5-7.9-8.2 + c0-4.9,3.9-8.4,10.2-8.4c3.9,0,7,1.6,9.3,3.4l-3,4c-1.9-1.4-3.9-2.4-6.2-2.4c-2.8,0-4.1,1.3-4.1,3.1c0,2.2,2.8,3.1,5.8,4.2 + c3.8,1.4,8,3.3,8,8.5c0,4.8-3.8,8.7-10.9,8.7c-3.8,0-7.9-1.7-10.6-3.9L261,58.2z"/> + </g> + <g> + <path fill="#68B044" d="M294.9,36.9c7.6,0,11.6,5.5,11.6,13.3c0,1.3-0.1,2.4-0.3,3.1h-17.8c0.6,5.1,3.8,7.9,8.3,7.9 + c2.4,0,4.4-0.7,6.5-2.1l2.2,4.1c-2.7,1.8-6,3-9.6,3c-7.8,0-13.8-5.4-13.8-14.7C282,42.5,288.4,36.9,294.9,36.9z M300.8,49.1 + c0-4.4-1.9-7.1-5.7-7.1c-3.3,0-6.2,2.5-6.7,7.1H300.8z"/> + </g> + <g> + <path fill="#68B044" d="M311.4,37.6h5.4l0.5,5h0.2c2-3.6,5-5.6,7.9-5.6c1.4,0,2.3,0.2,3.2,0.6l-1.1,5.7c-1-0.3-1.7-0.5-2.9-0.5 + c-2.2,0-4.9,1.5-6.6,5.8v17.1h-6.6V37.6z"/> + </g> + </g> + <g> + <g> + <rect x="120.4" y="6.2" fill="#494949" width="3" height="58"/> + </g> + </g> + <g> + <g> + <g id="layer3_17_" transform="translate(-92,-63.999774)"> + <g id="layer5_17_"> + <g id="path2554_28_"> + <g> + <path fill="#68B044" d="M152.1,68.8l-1.7,6.8c2.4-4.8,6.3-8.4,10.7-11.6c-3.2,3.8-6.2,7.5-8,11.3c3.1-4.3,7.2-6.7,11.8-8.2 + c-6.2,5.5-11,11.4-14.8,17.3l-3-1.3C147.7,78.3,149.5,73.5,152.1,68.8L152.1,68.8z"/> + </g> + </g> + <g id="path2534_7_"> + <g> + <path fill="#F5F8DE" d="M144.2,81.8l5.6,2.3c0,1.4-0.1,5.8,0.8,7.1c9.4,12.1,7.8,36.2-1.9,36.8c-14.7,0-20.4-10-20.4-19.2 + c0-8.4,10.1-14,16.1-18.9C146,88.6,145.7,85.6,144.2,81.8L144.2,81.8z"/> + </g> + </g> + <g id="path2536_18_"> + <g> + <path fill="#7E4798" d="M149.9,84l2,1c-0.2,1.3,0.1,4.3,1.4,5.1c5.9,3.7,11.5,7.7,13.7,11.7c7.8,14.1-5.5,27.2-17,25.9 + c6.2-4.6,8.1-14.1,5.7-24.5c-1-4.1-2.4-7.7-5.1-11.9C149.6,89.4,150,86.9,149.9,84L149.9,84z"/> + </g> + </g> + </g> + <g id="layer4_17_"> + <g id="path2540_18_"> + <g> + <path fill="#010101" d="M147.6,90.8c-0.4,2.2-0.9,6.2-2.8,7.6c-0.8,0.6-1.6,1.1-2.5,1.7c-3.4,2.3-6.9,4.5-8.4,10.2 + c-0.3,1.2,0,2.5,0.2,3.7c0.9,3.4,3.3,7.2,5.2,9.3c0,0.1,0.4,0.3,0.4,0.4c1.6,1.9,2.1,2.4,8,3.7l-0.1,0.7 + c-3.6-1-6.5-1.8-8.4-4c0,0-0.3-0.4-0.3-0.4c-2-2.3-4.4-6.1-5.3-9.7c-0.3-1.4-0.6-2.5-0.2-4c1.6-5.8,5.2-8.1,8.7-10.5 + c0.8-0.5,1.8-1,2.5-1.6C146,96.8,146.8,93.5,147.6,90.8L147.6,90.8z"/> + </g> + </g> + <g id="path2542_18_"> + <g> + <path fill="#010101" d="M149.1,99.9c0,2.5-0.2,3.7,0.4,5.5c0.4,1,1.7,2.5,2.1,3.9c0.5,1.9,1.1,3.9,1,5.2c0,1.4-0.1,4.1-0.7,7 + c-0.5,2.4-1.6,4.4-3.4,5.5c-1.9-0.4-4.1-1-5.4-2.2c-2.5-2.2-4.8-5.9-5.1-9.1c-0.2-2.6,2.2-6.5,5.6-8.4 + c2.9-1.7,3.5-3.6,4.1-6.6c-0.9,2.7-1.7,4.9-4.4,6.3c-4,2.1-6.1,5.6-5.9,9c0.3,4.3,2,7.2,5.4,9.5c1.4,1,4.1,2.1,5.8,2.3v-0.2 + c1.3-0.2,2.9-2.3,3.7-5.1c0.7-2.5,1-5.8,0.9-7.8c0-1.2-0.6-3.8-1.5-6.1c-0.5-1.3-1.3-2.6-1.9-3.5 + C149.4,104.2,149.4,102.2,149.1,99.9z"/> + </g> + </g> + <g id="path2544_18_"> + <g> + <path fill="#010101" d="M148.7,109.7c0,1.7,0.7,3.8,1,6c0.2,1.6,0.1,3.3,0.1,4.7c0,1.7-0.6,4.6-1.4,6.1 + c-0.7-0.3-1-0.7-1.5-1.3c-0.6-0.8-1-1.6-1.3-2.6c-0.3-0.7-0.6-1.5-0.8-2.5c-0.2-1.4-0.1-3.7,1.5-6c1.2-1.8,1.5-2,2-4 + c-0.6,1.9-1,2-2.3,3.6c-1.5,1.7-1.7,4.2-1.7,6.3c0,0.9,0.3,1.8,0.7,2.7c0.4,1,0.7,1.9,1.2,2.6c0.8,1.2,1.8,1.8,2.3,1.9 + c0,0,0,0,0,0c0,0,0,0,0,0v-0.1c0.9-1,1.5-2.1,1.7-3.1c0.2-1.2,0.3-2.5,0.4-4c0.1-1.2,0-2.9-0.3-4.6 + C149.8,113.4,149,111.2,148.7,109.7L148.7,109.7z"/> + </g> + </g> + <g id="path2550_18_"> + <g> + <path fill="#010101" d="M149,88.7c0,2.5,0.2,7.1,0.9,8.9c0.2,0.6,2,3.3,3.2,6.6c0.9,2.3,1,4.4,1.2,5 + c0.6,2.7-0.1,7.3-1.1,11.6c-0.5,2.3-2.1,5.2-4,6.4l-0.4,0.7c1,0,3.6-2.6,4.5-5.7c1.5-5.3,2.1-7.8,1.4-13.7 + c-0.1-0.6-0.3-2.5-1.2-4.6c-1.3-3.2-3.2-6.2-3.5-6.9C149.7,96,149.1,91.7,149,88.7L149,88.7z"/> + </g> + </g> + <g id="path2552_18_"> + <g> + <path fill="#010101" d="M149.9,84.3c-0.1,2.5-0.2,4.6,0.3,6.4c0.5,2.1,3.2,5,4.3,8.4c2.1,6.5,1.6,15,0,21.6 + c-0.6,2.3-3.3,5.7-6,6.8l2,0.5c1.1,0,3.9-2.7,5-5.7c1.8-4.7,2.1-10.3,1.4-16.3c0-0.6-1-5.7-1.9-7.8c-1.3-3.2-3.3-5.4-4.1-7.4 + c-0.6-1.5-0.8-5.4-0.4-6.3L149.9,84.3z"/> + </g> + </g> + </g> + </g> + <g id="path2528_14_"> + <g> + <path fill="#7E4798" d="M2.7,6.2H41c1.4,0,2.7,1.2,2.7,2.7v11.3c0,1.5-1.2,2.7-2.7,2.7h-7.9c-1.8,0-2.5,1-2.5,2.1v37 + c0,1.2-1,2.2-2.2,2.2h-13c-1.2,0-2.1-1-2.1-2.2V24.7c0-1.1-1-1.8-1.9-1.8H2.7c-1.5,0-2.7-1.2-2.7-2.7V8.9 + C0,7.4,1.2,6.2,2.7,6.2z"/> + </g> + </g> + <g id="path2532_14_"> + <g> + <path fill="#7E4798" d="M100.9,21.2h3.4c1.2,0,2.2,1,2.2,2.2v12.1c0,1.6,0.1,2.2-1.8,2.2c-3.8,0-5.5,2-5.5,4.2v20.5 + c0,1-0.9,1.8-2,1.8H85.1c-1.1,0-2-0.8-2-1.8V39.1c0-0.4,0-1,0-1.3c0.7-8.6,7.4-15.5,16-16.4C99.4,21.3,100.5,21.2,100.9,21.2 + L100.9,21.2z"/> + </g> + </g> + </g> + <g> + <g> + <path fill="#010101" d="M72,32.8c-2.1-1.9-4.6-3.4-7.3-4.9c-1.2-0.7-4.9-3.5-3.6-7.6l-9.3-3.8l-0.6,0.5c3.1,5.6,1.5,8.5,0,9.6 + c-3.1,2.1-7.6,4.8-9.9,7.2c-4.3,4.4-5.6,8.7-5.2,14.3c0.4,7.2,5.6,13.1,12.6,15.5c3.1,1,5.9,1.1,9,1.1c5.1,0,10.3-1.3,14-4.5 + c4-3.3,6.4-8.3,6.4-13.5C78.1,41.2,75.9,36.3,72,32.8z M70.6,58.9c-3.4,2.9-9.7,4.8-13,4.7c-3.7-0.2-7.3-0.8-10.4-2.3 + c-5.6-2.7-9.3-8.5-9.5-13.3c-0.5-9.7,4.1-12.5,8.4-16c2.4-2,5.8-3,7.7-6.5c0.4-0.8,0.6-2.5,0.1-4.2c-0.2-0.6-1.1-2.8-1.4-3.2 + l7,3.1c-0.9,3.2,1.8,6.5,3.9,7.7c2.1,1.2,5.5,3.4,7.5,5.3c3.6,3.2,5.5,7.7,5.5,12.5C76.3,51.2,74.3,55.8,70.6,58.9z"/> + </g> + </g> + </g> +</g> +</svg> diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ca38e9c..317dbd7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -95,7 +95,7 @@ TorProcessService.prototype = if (TorLauncherUtil.shouldOnlyConfigureTor) { - this._controlTor(); + this._controlTor(true, false); } else if (TorLauncherUtil.shouldStartAndOwnTor) { @@ -111,8 +111,7 @@ TorProcessService.prototype = TorLauncherUtil.setIntPref(kTorrcFixupPref, kTorrcFixupVersion); } - this._startTor(); - this._controlTor(); + this.TorStartAndControlTor(false); } } else if ("quit-application-granted" == aTopic) @@ -195,8 +194,7 @@ TorProcessService.prototype = if (TorLauncherUtil.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel) && !this.mIsQuitting) { - this._startTor(); - this._controlTor(); + this.TorStartAndControlTor(false); } } } @@ -301,6 +299,13 @@ TorProcessService.prototype = return this.mBootstrapErrorOccurred; }, + TorStartAndControlTor: function(aForceDisableNetwork) + { + this._startTor(aForceDisableNetwork); + let isRunningTor = (this.mTorProcessStatus == this.kStatusStarting) || + (this.mTorProcessStatus == this.kStatusRunning); + this._controlTor(isRunningTor, aForceDisableNetwork); + }, TorClearBootstrapError: function() { @@ -328,7 +333,7 @@ TorProcessService.prototype = // Private Methods ///////////////////////////////////////////////////////// - _startTor: function() + _startTor: function(aForceDisableNetwork) { this.mTorProcessStatus = this.kStatusUnknown; @@ -457,7 +462,8 @@ TorProcessService.prototype = TorLauncherUtil.showAlert(null, err); } - if (TorLauncherUtil.shouldShowNetworkSettings || defaultBridgeType) + if (aForceDisableNetwork || TorLauncherUtil.shouldShowNetworkSettings || + defaultBridgeType) { args.push("DisableNetwork"); args.push("1"); @@ -511,7 +517,7 @@ TorProcessService.prototype = return "unix:" + this.mProtocolSvc.TorEscapeString(aIPCFile.path); }, - _controlTor: function() + _controlTor: function(aIsRunningTor, aIsNetworkForceDisabled) { // Optionally prompt for locale. Blocks until dialog is closed. if (TorLauncherUtil.shouldPromptForLocale) @@ -526,7 +532,8 @@ TorProcessService.prototype = try { - this._monitorTorProcessStartup(); + if (aIsRunningTor) + this._monitorTorProcessStartup(); var bridgeConfigIsBad = (this._defaultBridgesStatus == this.kDefaultBridgesStatus_BadConfig); @@ -535,14 +542,16 @@ TorProcessService.prototype = if (this.mProtocolSvc) { // Show network settings wizard. Blocks until dialog is closed. - var panelID = (bridgeConfigIsBad) ? "bridgeSettings" : undefined; + var panelID = (bridgeConfigIsBad) ? "configureSettings" : undefined; this._openNetworkSettings(true, panelID); } } else if (this._networkSettingsWindow != null) { - // If network settings is open, open progress dialog via notification. - if (this.mObsSvc) + // The network settings window is open, which means the user asked + // for tor to be restarted. If networking is enabled, show the + // progress panel (since bootstrapping is underway). + if (!aIsNetworkForceDisabled && this.mObsSvc) this.mObsSvc.notifyObservers(null, "TorOpenProgressDialog", null); } else if (!this.TorIsBootstrapDone)

1 0

[tor-launcher/master] Bug 23262: implement integrated progress bar (Part 1)
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 09234581a042a648e99e2981799e2c4dbf53100c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Oct 30 16:58:21 2017 -0400 Bug 23262: implement integrated progress bar (Part 1) Replace the old progress window with a progress page that is part of the setup wizard and a progress panel that is part of the Network Settings window. --- src/chrome/content/network-settings-overlay.xul | 12 + src/chrome/content/network-settings-wizard.xul | 45 +-- src/chrome/content/network-settings.js | 318 +++++++++++++++++---- src/chrome/content/network-settings.xul | 5 +- src/chrome/content/progress.js | 249 ---------------- src/chrome/content/progress.xul | 45 --- src/chrome/locale/ach/network-settings.dtd | 3 + src/chrome/locale/ach/progress.dtd | 4 - src/chrome/locale/ady/network-settings.dtd | 3 + src/chrome/locale/ady/progress.dtd | 4 - src/chrome/locale/af-ZA/network-settings.dtd | 3 + src/chrome/locale/af-ZA/progress.dtd | 4 - src/chrome/locale/af/network-settings.dtd | 3 + src/chrome/locale/af/progress.dtd | 4 - src/chrome/locale/ak/network-settings.dtd | 3 + src/chrome/locale/ak/progress.dtd | 4 - src/chrome/locale/am-ET/network-settings.dtd | 3 + src/chrome/locale/am-ET/progress.dtd | 4 - src/chrome/locale/am/network-settings.dtd | 3 + src/chrome/locale/am/progress.dtd | 4 - src/chrome/locale/ar/network-settings.dtd | 3 + src/chrome/locale/ar/progress.dtd | 4 - src/chrome/locale/arn/network-settings.dtd | 3 + src/chrome/locale/arn/progress.dtd | 4 - src/chrome/locale/ast/network-settings.dtd | 3 + src/chrome/locale/ast/progress.dtd | 4 - src/chrome/locale/az/network-settings.dtd | 3 + src/chrome/locale/az/progress.dtd | 4 - src/chrome/locale/be/network-settings.dtd | 3 + src/chrome/locale/be/progress.dtd | 4 - src/chrome/locale/bg-BG/network-settings.dtd | 3 + src/chrome/locale/bg-BG/progress.dtd | 4 - src/chrome/locale/bg/network-settings.dtd | 3 + src/chrome/locale/bg/progress.dtd | 4 - src/chrome/locale/bn-BD/network-settings.dtd | 3 + src/chrome/locale/bn-BD/progress.dtd | 4 - src/chrome/locale/bn-IN/network-settings.dtd | 3 + src/chrome/locale/bn-IN/progress.dtd | 4 - src/chrome/locale/bn/network-settings.dtd | 3 + src/chrome/locale/bn/progress.dtd | 4 - src/chrome/locale/bo/network-settings.dtd | 3 + src/chrome/locale/bo/progress.dtd | 4 - src/chrome/locale/br/network-settings.dtd | 3 + src/chrome/locale/br/progress.dtd | 4 - src/chrome/locale/bs/network-settings.dtd | 3 + src/chrome/locale/bs/progress.dtd | 4 - src/chrome/locale/ca/network-settings.dtd | 3 + src/chrome/locale/ca/progress.dtd | 4 - src/chrome/locale/ca(a)valencia/network-settings.dtd | 3 + src/chrome/locale/ca(a)valencia/progress.dtd | 4 - src/chrome/locale/cs-CZ/network-settings.dtd | 3 + src/chrome/locale/cs-CZ/progress.dtd | 4 - src/chrome/locale/cs/network-settings.dtd | 3 + src/chrome/locale/cs/progress.dtd | 4 - src/chrome/locale/csb/network-settings.dtd | 3 + src/chrome/locale/csb/progress.dtd | 4 - src/chrome/locale/cv/network-settings.dtd | 3 + src/chrome/locale/cv/progress.dtd | 4 - src/chrome/locale/cy/network-settings.dtd | 3 + src/chrome/locale/cy/progress.dtd | 4 - src/chrome/locale/da/network-settings.dtd | 3 + src/chrome/locale/da/progress.dtd | 4 - src/chrome/locale/de/network-settings.dtd | 3 + src/chrome/locale/de/progress.dtd | 4 - src/chrome/locale/dz/network-settings.dtd | 3 + src/chrome/locale/dz/progress.dtd | 4 - src/chrome/locale/el-GR/network-settings.dtd | 3 + src/chrome/locale/el-GR/progress.dtd | 4 - src/chrome/locale/el/network-settings.dtd | 3 + src/chrome/locale/el/progress.dtd | 4 - src/chrome/locale/en-GB/network-settings.dtd | 3 + src/chrome/locale/en-GB/progress.dtd | 4 - src/chrome/locale/en/network-settings.dtd | 3 + src/chrome/locale/en/progress.dtd | 4 - src/chrome/locale/eo/network-settings.dtd | 3 + src/chrome/locale/eo/progress.dtd | 4 - src/chrome/locale/es-AR/network-settings.dtd | 3 + src/chrome/locale/es-AR/progress.dtd | 4 - src/chrome/locale/es-CL/network-settings.dtd | 3 + src/chrome/locale/es-CL/progress.dtd | 4 - src/chrome/locale/es-CO/network-settings.dtd | 3 + src/chrome/locale/es-CO/progress.dtd | 4 - src/chrome/locale/es-MX/network-settings.dtd | 3 + src/chrome/locale/es-MX/progress.dtd | 4 - src/chrome/locale/es-NI/network-settings.dtd | 3 + src/chrome/locale/es-NI/progress.dtd | 4 - src/chrome/locale/es/network-settings.dtd | 3 + src/chrome/locale/es/progress.dtd | 4 - src/chrome/locale/et/network-settings.dtd | 3 + src/chrome/locale/et/progress.dtd | 4 - src/chrome/locale/eu/network-settings.dtd | 3 + src/chrome/locale/eu/progress.dtd | 4 - src/chrome/locale/fa/network-settings.dtd | 3 + src/chrome/locale/fa/progress.dtd | 4 - src/chrome/locale/fi/network-settings.dtd | 3 + src/chrome/locale/fi/progress.dtd | 5 - src/chrome/locale/fil/network-settings.dtd | 3 + src/chrome/locale/fil/progress.dtd | 4 - src/chrome/locale/fo/network-settings.dtd | 3 + src/chrome/locale/fo/progress.dtd | 4 - src/chrome/locale/fr-CA/network-settings.dtd | 3 + src/chrome/locale/fr-CA/progress.dtd | 4 - src/chrome/locale/fr/network-settings.dtd | 3 + src/chrome/locale/fr/progress.dtd | 4 - src/chrome/locale/fur/network-settings.dtd | 3 + src/chrome/locale/fur/progress.dtd | 4 - src/chrome/locale/fy/network-settings.dtd | 3 + src/chrome/locale/fy/progress.dtd | 4 - src/chrome/locale/ga/network-settings.dtd | 3 + src/chrome/locale/ga/progress.dtd | 4 - src/chrome/locale/gl/network-settings.dtd | 3 + src/chrome/locale/gl/progress.dtd | 4 - src/chrome/locale/gu-IN/network-settings.dtd | 3 + src/chrome/locale/gu-IN/progress.dtd | 4 - src/chrome/locale/gu/network-settings.dtd | 3 + src/chrome/locale/gu/progress.dtd | 4 - src/chrome/locale/gun/network-settings.dtd | 3 + src/chrome/locale/gun/progress.dtd | 4 - src/chrome/locale/ha/network-settings.dtd | 3 + src/chrome/locale/ha/progress.dtd | 4 - src/chrome/locale/he/network-settings.dtd | 3 + src/chrome/locale/he/progress.dtd | 4 - src/chrome/locale/hi/network-settings.dtd | 3 + src/chrome/locale/hi/progress.dtd | 4 - src/chrome/locale/hr-HR/network-settings.dtd | 3 + src/chrome/locale/hr-HR/progress.dtd | 4 - src/chrome/locale/hr/network-settings.dtd | 3 + src/chrome/locale/hr/progress.dtd | 4 - src/chrome/locale/ht/network-settings.dtd | 3 + src/chrome/locale/ht/progress.dtd | 4 - src/chrome/locale/hu/network-settings.dtd | 3 + src/chrome/locale/hu/progress.dtd | 4 - src/chrome/locale/hy-AM/network-settings.dtd | 3 + src/chrome/locale/hy-AM/progress.dtd | 4 - src/chrome/locale/hy/network-settings.dtd | 3 + src/chrome/locale/hy/progress.dtd | 4 - src/chrome/locale/ia/network-settings.dtd | 3 + src/chrome/locale/ia/progress.dtd | 4 - src/chrome/locale/id/network-settings.dtd | 3 + src/chrome/locale/id/progress.dtd | 4 - src/chrome/locale/is/network-settings.dtd | 3 + src/chrome/locale/is/progress.dtd | 4 - src/chrome/locale/it/network-settings.dtd | 3 + src/chrome/locale/it/progress.dtd | 4 - src/chrome/locale/ja/network-settings.dtd | 3 + src/chrome/locale/ja/progress.dtd | 4 - src/chrome/locale/jv/network-settings.dtd | 3 + src/chrome/locale/jv/progress.dtd | 4 - src/chrome/locale/ka/network-settings.dtd | 3 + src/chrome/locale/ka/progress.dtd | 4 - src/chrome/locale/kk/network-settings.dtd | 3 + src/chrome/locale/kk/progress.dtd | 4 - src/chrome/locale/km/network-settings.dtd | 3 + src/chrome/locale/km/progress.dtd | 4 - src/chrome/locale/kn/network-settings.dtd | 3 + src/chrome/locale/kn/progress.dtd | 4 - src/chrome/locale/ko-KR/network-settings.dtd | 3 + src/chrome/locale/ko-KR/progress.dtd | 4 - src/chrome/locale/ko/network-settings.dtd | 3 + src/chrome/locale/ko/progress.dtd | 4 - src/chrome/locale/ku/network-settings.dtd | 3 + src/chrome/locale/ku/progress.dtd | 4 - src/chrome/locale/kw/network-settings.dtd | 3 + src/chrome/locale/kw/progress.dtd | 4 - src/chrome/locale/ky/network-settings.dtd | 3 + src/chrome/locale/ky/progress.dtd | 4 - src/chrome/locale/lb/network-settings.dtd | 3 + src/chrome/locale/lb/progress.dtd | 4 - src/chrome/locale/lg/network-settings.dtd | 3 + src/chrome/locale/lg/progress.dtd | 4 - src/chrome/locale/ln/network-settings.dtd | 3 + src/chrome/locale/ln/progress.dtd | 4 - src/chrome/locale/lo/network-settings.dtd | 3 + src/chrome/locale/lo/progress.dtd | 4 - src/chrome/locale/lt/network-settings.dtd | 3 + src/chrome/locale/lt/progress.dtd | 4 - src/chrome/locale/lv/network-settings.dtd | 3 + src/chrome/locale/lv/progress.dtd | 4 - src/chrome/locale/mg/network-settings.dtd | 3 + src/chrome/locale/mg/progress.dtd | 4 - src/chrome/locale/mi/network-settings.dtd | 3 + src/chrome/locale/mi/progress.dtd | 4 - src/chrome/locale/mk/network-settings.dtd | 3 + src/chrome/locale/mk/progress.dtd | 4 - src/chrome/locale/ml/network-settings.dtd | 3 + src/chrome/locale/ml/progress.dtd | 4 - src/chrome/locale/mn/network-settings.dtd | 3 + src/chrome/locale/mn/progress.dtd | 4 - src/chrome/locale/mr/network-settings.dtd | 3 + src/chrome/locale/mr/progress.dtd | 4 - src/chrome/locale/ms-MY/network-settings.dtd | 3 + src/chrome/locale/ms-MY/progress.dtd | 4 - src/chrome/locale/mt/network-settings.dtd | 3 + src/chrome/locale/mt/progress.dtd | 4 - src/chrome/locale/my/network-settings.dtd | 3 + src/chrome/locale/my/progress.dtd | 4 - src/chrome/locale/nah/network-settings.dtd | 3 + src/chrome/locale/nah/progress.dtd | 4 - src/chrome/locale/nap/network-settings.dtd | 3 + src/chrome/locale/nap/progress.dtd | 4 - src/chrome/locale/nb/network-settings.dtd | 3 + src/chrome/locale/nb/progress.dtd | 4 - src/chrome/locale/nds/network-settings.dtd | 3 + src/chrome/locale/nds/progress.dtd | 4 - src/chrome/locale/ne/network-settings.dtd | 3 + src/chrome/locale/ne/progress.dtd | 4 - src/chrome/locale/nl-BE/network-settings.dtd | 3 + src/chrome/locale/nl-BE/progress.dtd | 4 - src/chrome/locale/nl/network-settings.dtd | 3 + src/chrome/locale/nl/progress.dtd | 5 - src/chrome/locale/nn/network-settings.dtd | 3 + src/chrome/locale/nn/progress.dtd | 4 - src/chrome/locale/nso/network-settings.dtd | 3 + src/chrome/locale/nso/progress.dtd | 4 - src/chrome/locale/oc/network-settings.dtd | 3 + src/chrome/locale/oc/progress.dtd | 4 - src/chrome/locale/or/network-settings.dtd | 3 + src/chrome/locale/or/progress.dtd | 4 - src/chrome/locale/pa/network-settings.dtd | 3 + src/chrome/locale/pa/progress.dtd | 4 - src/chrome/locale/pap/network-settings.dtd | 3 + src/chrome/locale/pap/progress.dtd | 4 - src/chrome/locale/pl-PL/network-settings.dtd | 3 + src/chrome/locale/pl-PL/progress.dtd | 4 - src/chrome/locale/pl/network-settings.dtd | 3 + src/chrome/locale/pl/progress.dtd | 4 - src/chrome/locale/pms/network-settings.dtd | 3 + src/chrome/locale/pms/progress.dtd | 4 - src/chrome/locale/ps/network-settings.dtd | 3 + src/chrome/locale/ps/progress.dtd | 4 - src/chrome/locale/pt-BR/network-settings.dtd | 3 + src/chrome/locale/pt-BR/progress.dtd | 4 - src/chrome/locale/pt/network-settings.dtd | 3 + src/chrome/locale/pt/progress.dtd | 4 - src/chrome/locale/ro/network-settings.dtd | 3 + src/chrome/locale/ro/progress.dtd | 4 - src/chrome/locale/ru/network-settings.dtd | 3 + src/chrome/locale/ru/progress.dtd | 4 - src/chrome/locale/ru(a)petr1708/network-settings.dtd | 3 + src/chrome/locale/ru(a)petr1708/progress.dtd | 4 - src/chrome/locale/sco/network-settings.dtd | 3 + src/chrome/locale/sco/progress.dtd | 4 - src/chrome/locale/si-LK/network-settings.dtd | 3 + src/chrome/locale/si-LK/progress.dtd | 4 - src/chrome/locale/sk-SK/network-settings.dtd | 3 + src/chrome/locale/sk-SK/progress.dtd | 4 - src/chrome/locale/sk/network-settings.dtd | 3 + src/chrome/locale/sk/progress.dtd | 4 - src/chrome/locale/sl-SI/network-settings.dtd | 3 + src/chrome/locale/sl-SI/progress.dtd | 4 - src/chrome/locale/sl/network-settings.dtd | 3 + src/chrome/locale/sl/progress.dtd | 4 - src/chrome/locale/sn/network-settings.dtd | 3 + src/chrome/locale/sn/progress.dtd | 4 - src/chrome/locale/so/network-settings.dtd | 3 + src/chrome/locale/so/progress.dtd | 4 - src/chrome/locale/son/network-settings.dtd | 3 + src/chrome/locale/son/progress.dtd | 4 - src/chrome/locale/sq-AL/network-settings.dtd | 3 + src/chrome/locale/sq-AL/progress.dtd | 4 - src/chrome/locale/sq/network-settings.dtd | 3 + src/chrome/locale/sq/progress.dtd | 4 - src/chrome/locale/sr/network-settings.dtd | 3 + src/chrome/locale/sr/progress.dtd | 4 - src/chrome/locale/sr(a)latin/network-settings.dtd | 3 + src/chrome/locale/sr(a)latin/progress.dtd | 4 - src/chrome/locale/st/network-settings.dtd | 3 + src/chrome/locale/st/progress.dtd | 4 - src/chrome/locale/su/network-settings.dtd | 3 + src/chrome/locale/su/progress.dtd | 4 - src/chrome/locale/sv-SE/network-settings.dtd | 3 + src/chrome/locale/sv-SE/progress.dtd | 4 - src/chrome/locale/sv/network-settings.dtd | 3 + src/chrome/locale/sv/progress.dtd | 4 - src/chrome/locale/sw/network-settings.dtd | 3 + src/chrome/locale/sw/progress.dtd | 4 - src/chrome/locale/szl/network-settings.dtd | 3 + src/chrome/locale/szl/progress.dtd | 4 - src/chrome/locale/ta/network-settings.dtd | 3 + src/chrome/locale/ta/progress.dtd | 4 - src/chrome/locale/te-IN/network-settings.dtd | 3 + src/chrome/locale/te-IN/progress.dtd | 4 - src/chrome/locale/te/network-settings.dtd | 3 + src/chrome/locale/te/progress.dtd | 4 - src/chrome/locale/tg/network-settings.dtd | 3 + src/chrome/locale/tg/progress.dtd | 4 - src/chrome/locale/th/network-settings.dtd | 3 + src/chrome/locale/th/progress.dtd | 4 - src/chrome/locale/ti/network-settings.dtd | 3 + src/chrome/locale/ti/progress.dtd | 4 - src/chrome/locale/tk/network-settings.dtd | 3 + src/chrome/locale/tk/progress.dtd | 4 - src/chrome/locale/tr/network-settings.dtd | 3 + src/chrome/locale/tr/progress.dtd | 4 - src/chrome/locale/uk/network-settings.dtd | 3 + src/chrome/locale/uk/progress.dtd | 4 - src/chrome/locale/ur-PK/network-settings.dtd | 3 + src/chrome/locale/ur-PK/progress.dtd | 4 - src/chrome/locale/ur/network-settings.dtd | 3 + src/chrome/locale/ur/progress.dtd | 4 - src/chrome/locale/uz/network-settings.dtd | 3 + src/chrome/locale/uz/progress.dtd | 4 - src/chrome/locale/ve/network-settings.dtd | 3 + src/chrome/locale/ve/progress.dtd | 4 - src/chrome/locale/vi/network-settings.dtd | 3 + src/chrome/locale/vi/progress.dtd | 4 - src/chrome/locale/wa/network-settings.dtd | 3 + src/chrome/locale/wa/progress.dtd | 4 - src/chrome/locale/wo/network-settings.dtd | 3 + src/chrome/locale/wo/progress.dtd | 4 - .../locale/zh-CN.GB2312/network-settings.dtd | 3 + src/chrome/locale/zh-CN.GB2312/progress.dtd | 4 - src/chrome/locale/zh-CN/network-settings.dtd | 3 + src/chrome/locale/zh-CN/progress.dtd | 4 - src/chrome/locale/zh-HK/network-settings.dtd | 3 + src/chrome/locale/zh-HK/progress.dtd | 4 - src/chrome/locale/zh-TW/network-settings.dtd | 3 + src/chrome/locale/zh-TW/progress.dtd | 4 - src/chrome/locale/zh/network-settings.dtd | 6 + src/chrome/locale/zh/progress.dtd | 4 - src/chrome/locale/zu/network-settings.dtd | 3 + src/chrome/locale/zu/progress.dtd | 4 - src/chrome/skin/network-settings.css | 13 + src/chrome/skin/progress.css | 44 --- src/components/tl-process.js | 29 +- 325 files changed, 804 insertions(+), 1067 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 8f1bc45..a709f0e 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -128,6 +128,18 @@ <description>&torsettings.bridgeHelp2;</description> </vbox> + <vbox id="progressContent"> + <hbox class="tbb-header" pack="center"> + <image class="tbb-logo"/> + </hbox> + <vbox flex="1"> + <description id="progressPleaseWait" + hidden="true">&torprogress.pleaseWait;</description> + <progressmeter id="progressMeter" mode="determined" value="0"/> + <description id="progressDesc"/> + </vbox> + </vbox> + <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" onclick="closeCopyLogFeedbackPanel()"> <description flex="1" /> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 5d76331..97e846c 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -19,7 +19,7 @@ windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" buttonlabelextra2="&torsettings.copyLog;" - onwizardfinish="return applySettings(false);" + onwizardfinish="return onWizardFinish();" onwizardcancel="return onCancel();" onload="initDialog();" onunload="deinitDialog();"> @@ -50,10 +50,22 @@ <wizardpage pageid="configureSettings" onextra2="onCopyLog();" windowtitle="&torsettings.wizard.title.configure;" torShowNavButtons="true"> - <separator class="tall"/> - <vbox id="bridgeSettings"/> - <separator/> - <vbox id="proxySettings"/> + <stack flex="1"> + <vbox> + <separator class="tall"/> + <vbox id="bridgeSettings"/> + <separator/> + <vbox id="proxySettings"/> + </vbox> + </stack> + </wizardpage> + + <wizardpage pageid="progress" onextra2="onCopyLog();" + windowtitle="&torsettings.wizard.title.connecting;" + torShowNavButtons="false" + onpageshow="onShowProgressPanel();" + onpagehide="return resetProgressNavButtons();"> + <vbox id="progressContent"/> </wizardpage> <wizardpage pageid="startingTor" next="notUsed" torShowNavButtons="false"> @@ -69,22 +81,21 @@ <spring flex="1" /> </wizardpage> - <wizardpage pageid="errorPanel" next="notUsed" torShowNavButtons="false" - onextra2="onCopyLog();"> + <wizardpage pageid="restartPanel" next="notUsed" + pack="center" torShowNavButtons="false" onextra2="onCopyLog();"> + <vbox id="restartContent"/> + </wizardpage> + + <wizardpage pageid="errorPanel" next="notUsed" + torShowNavButtons="false" onextra2="onCopyLog();"> <spring flex="1" /> - <hbox> - <spring flex="1" /> - <description id="errorPanelMessage" flex="1" /> - <spring flex="1" /> + <hbox pack="center"> + <description errorElemId="message" flex="1"/> </hbox> <separator/> - <hbox> - <spring flex="1" /> - <button id="restartTorButton" label="&torsettings.restartTor;" - hidden="true" oncommand="onRestartTor()" /> - <button id="reconfigTorButton" label="&torsettings.reconfigTor;" + <hbox pack="center"> + <button errorElemId="reconfigButton" label="&torsettings.reconfigTor;" hidden="true" oncommand="onWizardReconfig()" /> - <spring flex="1" /> </hbox> <spring flex="1" /> </wizardpage> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f8dcb3b..2237c85 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -31,11 +31,15 @@ const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; -const kTorOpenProgressTopic = "TorOpenProgressDialog"; +const kTorShowProgressPanelTopic = "TorShowProgressPanel"; +const kTorBootstrapStatusTopic = "TorBootstrapStatus"; const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardFirstPageID = "first"; +const kWizardDiscardSettingsPageID = "discardSettings"; +const kWizardProgressPageID = "progress"; // wizard +const kNetworkSettingsProgressPanelID = "progressPanel"; // non wizard const kLocaleList = "localeList"; const kUseProxyCheckbox = "useProxy"; @@ -65,15 +69,17 @@ const kTorConfKeyBridgeList = "Bridge"; var gProtocolSvc = null; var gTorProcessService = null; var gObsService = null; +var gCancelLabelStr = undefined; var gIsInitialBootstrap = false; var gInitialPanelID = undefined; -var gIsBootstrapComplete = false; +var gShowProgressTimer = undefined; var gRestoreAfterHelpPanelID = null; var gIsPostRestartBootstrapNeeded = false; +var gIsWindowScheduledToClose = false; var gActiveTopics = []; // Topics for which an observer is currently installed. -function initDialogCommon(aHasQuitButton) +function initDialogCommon() { gObsService = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); @@ -91,18 +97,20 @@ function initDialogCommon(aHasQuitButton) "forAssistance2", [kSupportURL], 1); } - if (aHasQuitButton) + let wizardElem = getWizard(); + let haveWizard = (wizardElem != null); + + let cancelBtn = document.documentElement.getButton("cancel"); + if (cancelBtn) { - let cancelBtn = document.documentElement.getButton("cancel"); - if (cancelBtn) + gCancelLabelStr = cancelBtn.label; + if (haveWizard) { let quitKey = isWindows ? "quit_win" : "quit"; cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey); } } - let wizardElem = getWizard(); - let haveWizard = (wizardElem != null); if (haveWizard) { // Hide the Tor Browser logo and associated separator element if the @@ -135,21 +143,14 @@ function resizeDialogToFitContent() function initDialog() { gIsInitialBootstrap = window.arguments[0]; - initDialogCommon(gIsInitialBootstrap); + initDialogCommon(); if (window.arguments.length > 1) gInitialPanelID = window.arguments[1]; - if (gIsInitialBootstrap) - { - var okBtn = document.documentElement.getButton("accept"); - if (okBtn) - okBtn.label = TorLauncherUtil.getLocalizedString("connect"); - } - try { - var svc = Cc["@torproject.org/torlauncher-protocol-service;1"] + let svc = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports); gProtocolSvc = svc.wrappedJSObject; } @@ -157,22 +158,27 @@ function initDialog() try { - var svc = Cc["@torproject.org/torlauncher-process-service;1"] + let svc = Cc["@torproject.org/torlauncher-process-service;1"] .getService(Ci.nsISupports); gTorProcessService = svc.wrappedJSObject; } catch (e) { dump(e + "\n"); } - var wizardElem = getWizard(); - var haveWizard = (wizardElem != null); + let wizardElem = getWizard(); + let haveWizard = (wizardElem != null); if (haveWizard) { + // Relabel the accept button to be "Connect" + let okBtn = document.documentElement.getButton("accept"); + if (okBtn) + okBtn.label = TorLauncherUtil.getLocalizedString("connect"); + // Set "Copy Tor Log" label and move it after the Quit (cancel) button. - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra2"); - var cancelBtn = document.documentElement.getButton("cancel"); + let cancelBtn = document.documentElement.getButton("cancel"); if (cancelBtn && TorLauncherUtil.isMac) cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); } @@ -184,7 +190,7 @@ function initDialog() } // Use "Connect" as the finish button label (on the last wizard page). - var finishBtn = document.documentElement.getButton("finish"); + let finishBtn = document.documentElement.getButton("finish"); if (finishBtn) { finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); @@ -200,12 +206,13 @@ function initDialog() initDefaultBridgeTypeMenu(); + addObserver(kTorBootstrapStatusTopic); addObserver(kTorBootstrapErrorTopic); addObserver(kTorLogHasWarnOrErrTopic); addObserver(kTorProcessExitedTopic); - addObserver(kTorOpenProgressTopic); + addObserver(kTorShowProgressPanelTopic); - var status = gTorProcessService.TorProcessStatus; + let status = gTorProcessService.TorProcessStatus; if (TorLauncherUtil.shouldStartAndOwnTor && (status != gTorProcessService.kStatusRunning)) { @@ -236,7 +243,7 @@ function initDialog() function initLocaleDialog() { - initDialogCommon(true); + initDialogCommon(); // Replace the finish button's label ("Done") with the next button's // label ("Next" or "Continue"). @@ -395,6 +402,20 @@ function onWizardPageShow() } +function isShowingProgress() +{ + let wizardElem = getWizard(); + if (wizardElem) + return (kWizardProgressPageID == wizardElem.currentPage.pageid); + + let deckElem = document.getElementById("deck"); + if (deckElem) + return (kNetworkSettingsProgressPanelID == deckElem.selectedPanel.id); + + return false; +} + + function getWizard() { let elem = document.getElementById("TorNetworkSettings"); @@ -409,7 +430,7 @@ function onWizardFirstPanelConnect() // If the user configured bridge or proxy settings, prompt before // discarding their data. if (isBridgeConfigured() || isProxyConfigured()) - showPanel("discardSettings"); + showPanel(kWizardDiscardSettingsPageID); else removeSettingsAndConnect() } @@ -418,7 +439,7 @@ function onWizardFirstPanelConnect() function removeSettingsAndConnect() { applySettings(true); // Use default settings. - if (!gIsBootstrapComplete) + if (!gTorProcessService.TorIsBootstrapDone) readTorSettings(); // Ensure UI matches the settings that were used. } @@ -450,6 +471,49 @@ function onBridgeTypeRadioChange() } +function onDeckSelect() +{ + let deckElem = document.getElementById("deck"); + if (kNetworkSettingsProgressPanelID == deckElem.id) + onShowProgressPanel(); +} + + +function onShowProgressPanel() +{ + if (gTorProcessService.TorIsBootstrapDone) + { + close(); + return; + } + + // Set up navigation buttons. + // setTimeout() is needed because this panel may be shown first. + // Because resetProgressNavButtons() is called without delay, it may + // be called before this timer fires. Therefore we store a reference + // to it so that we can cancel it inside resetProgressNavButtons(). + gShowProgressTimer = setTimeout(function() { + gShowProgressTimer = undefined; + showOrHideButton("cancel", false, false); // hide quit button + overrideButtonLabel("finish", gCancelLabelStr); + }, 0); +} + + +function resetProgressNavButtons() +{ + if (gShowProgressTimer) + { + clearTimeout(gShowProgressTimer); + gShowProgressTimer = undefined; + } + + restoreButtonLabel("finish"); + showOrHideButton("cancel", true, false); + return true; +} + + var gObserver = { observe: function(aSubject, aTopic, aData) { @@ -477,9 +541,13 @@ var gObserver = { removeObserver(kTorProcessExitedTopic); showErrorMessage(true, null, false); } - else if (kTorOpenProgressTopic == aTopic) + else if (kTorShowProgressPanelTopic == aTopic) + { + showProgressPanel(); + } + else if (kTorBootstrapStatusTopic == aTopic) { - openProgressDialog(); + updateBootstrapProgress(aSubject.wrappedJSObject); } } }; @@ -516,6 +584,44 @@ function removeAllObservers() } +function updateBootstrapProgress(aStatusObj) +{ + if (!isShowingProgress()) + return; + + let labelText = + TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, "TAG"); + let percentComplete = (aStatusObj.PROGRESS) ? aStatusObj.PROGRESS : 0; + + let meter = document.getElementById("progressMeter"); + if (meter) + { + meter.value = percentComplete; + showProgressMeterIfNoError(); + } + + if (percentComplete >= 100) + { + // To ensure that 100% progress is displayed, wait a short while before + // closing this window... but first, hide the cancel button to avoid a + // race where the user clicks Cancel when bootstrapping has already + // finished (and this window is scheduled to close in 250ms). Use CSS + // visibility=hidden instead of XUL hidden=true so that the "For + // Assistance" text does not move. + let btnID = getWizard() ? "finish" : "cancel"; + let btn = document.documentElement.getButton(btnID); + if (btn) + btn.style.visibility = "hidden"; + window.setTimeout(function() { close(); }, 250); + gIsWindowScheduledToClose = true; + } + + let desc = document.getElementById("progressDesc"); + if (labelText && desc) + desc.textContent = labelText; +} + + function readTorSettings() { TorLauncherLogger.log(2, "readTorSettings " + @@ -571,11 +677,21 @@ function showPanel(aPanelID) var deckElem = document.getElementById("deck"); if (deckElem) + { deckElem.selectedPanel = document.getElementById(aPanelID); + } else if (wizard.currentPage.pageid != aPanelID) + { + if (kWizardProgressPageID == wizard.currentPage.pageid) + resetProgressNavButtons(); // goTo() does not generate pagehide events. wizard.goTo(aPanelID); + } - showOrHideButton("accept", (aPanelID == "settings"), true); + if (!wizard) + { + // Ensure that the OK button is only shown on the main settings panel. + showOrHideButton("accept", (aPanelID == "settings"), true); + } } @@ -586,6 +702,12 @@ function advanceToWizardPanel(aPanelID) if (!wizard) return; + if (kWizardProgressPageID == aPanelID) + { + showProgressPanel(); + return; + } + onWizardConfigure(); // Equivalent to pressing "Configure" const kMaxTries = 10; @@ -791,17 +913,24 @@ function showMenuListPlaceholderText(aElemID) } -function overrideButtonLabel(aID, aLabelKey) +function overrideButtonLabel(aID, aLabel) { - var btn = document.documentElement.getButton(aID); + let btn = document.documentElement.getButton(aID); if (btn) { btn.setAttribute("origLabel", btn.label); - btn.label = TorLauncherUtil.getLocalizedString(aLabelKey); + btn.label = aLabel; } } +function overrideButtonLabelWithKey(aID, aLabelKey) +{ + let label = TorLauncherUtil.getLocalizedString(aLabelKey); + overrideButtonLabel(aID, label); +} + + function restoreButtonLabel(aID) { var btn = document.documentElement.getButton(aID); @@ -872,6 +1001,9 @@ function onWizardReconfig() function onCancel() { + if (gIsWindowScheduledToClose) + return false; // Ignore cancel in this case. + if (gRestoreAfterHelpPanelID) // Is help open? { closeHelp(); @@ -897,6 +1029,22 @@ function onCancel() } +function onWizardFinish() +{ + if (isShowingProgress()) + { + // When the progress panel is showing, the finish button is "Cancel" + stopTorBootstrap(); + getWizard().rewind(); + return false; + } + else + { + return applySettings(false); + } +} + + function onNetworkSettingsFinish() { if (gRestoreAfterHelpPanelID) // Is help open? @@ -942,7 +1090,7 @@ function onOpenHelp(aHelpContentID) if (gRestoreAfterHelpPanelID) // Already open? return; - var deckElem = document.getElementById("deck"); + let deckElem = document.getElementById("deck"); if (deckElem) gRestoreAfterHelpPanelID = deckElem.selectedPanel.id; else @@ -960,15 +1108,15 @@ function onOpenHelp(aHelpContentID) { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); - overrideButtonLabel("next", "done"); + overrideButtonLabelWithKey("next", "done"); showOrHideButton("next", true, false); - var forAssistance = document.getElementById("forAssistance"); + let forAssistance = document.getElementById("forAssistance"); if (forAssistance) forAssistance.setAttribute("hidden", true); } else { - overrideButtonLabel("cancel", "done"); + overrideButtonLabelWithKey("cancel", "done"); } } @@ -1217,25 +1365,20 @@ function useSettings() gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); - // If we are not responsible for starting tor we do not monitor bootstrap - // status, so just close this dialog and return rather than opening the - // progress dialog (which will make no progress). - if (!TorLauncherUtil.shouldStartAndOwnTor) + // If bootstrapping has finished or we are not responsible for starting + // tor, close this window and return (no need to show the progress bar). + if (gTorProcessService.TorIsBootstrapDone || + !TorLauncherUtil.shouldStartAndOwnTor) { close(); return; } - gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone; - if (!gIsBootstrapComplete) - openProgressDialog(); + showProgressPanel(); +/* TODO2017: is this needed? Used to be after modal progress dlog was displayed let wizardElem = getWizard(); - if (gIsBootstrapComplete) - { - close(); - } - else if (wizardElem) + if (!gTorProcessService.TorIsBootstrapDone && wizardElem) { // If the user went down the "Configure" path and another error (e.g., // Tor Exited) has not already been shown, display a generic message @@ -1247,21 +1390,82 @@ function useSettings() showErrorMessage(false, msg, true); } } +*/ +} + + +function stopTorBootstrap() +{ + // Tell tor to disable use of the network; this should stop the bootstrap + // process. + const kErrorPrefix = "Setting DisableNetwork=1 failed: "; + try + { + let settings = {}; + settings["DisableNetwork"] = true; + let errObj = {}; + if (!gProtocolSvc.TorSetConfWithReply(settings, errObj)) + TorLauncherLogger.log(5, kErrorPrefix + errObj.details); + } + catch(e) + { + TorLauncherLogger.log(5, kErrorPrefix + e); + } } -function openProgressDialog() +function showProgressPanel() { - var chromeURL = "chrome://torlauncher/content/progress.xul"; - var features = "chrome,dialog=yes,modal=yes,dependent=yes"; - window.openDialog(chromeURL, "_blank", features, - gIsInitialBootstrap, onProgressDialogClose); + if (gIsInitialBootstrap) + { + let pleaseWait = document.getElementById("progressPleaseWait"); + if (pleaseWait) + pleaseWait.removeAttribute("hidden"); + } + + // Clear the description to avoid displaying any old messages. + let desc = document.getElementById("progressDesc"); + if (desc) + desc.textContent = ""; + + // To avoid showing an incorrect progress value, we hide the progress bar + // until the first TorBootstrapStatus notification is received. + let meter = document.getElementById("progressMeter"); + if (meter) + { + meter.value = 0; + meter.style.visibility = "hidden"; + } + + // Show the correct wizard page or Network Settings panel. + let wizardElem = getWizard(); + if (wizardElem) + { + if (kWizardDiscardSettingsPageID == wizardElem.currentPage.pageid) + showPanel(); // Remove discard settings page from the flow. + + wizardElem.advance(kWizardProgressPageID); + } + else + { + showPanel(kNetworkSettingsProgressPanelID); + } + + // Request the most recent bootstrap status info so that a + // TorBootstrapStatus notification is generated as soon as possible. + gProtocolSvc.TorRetrieveBootstrapStatus(); + + // Also start a fail-safe timer to ensure that the progress bar is displayed + // within 2 seconds in all cases. + window.setTimeout(function() { showProgressMeterIfNoError(); }, 2000); } -function onProgressDialogClose(aBootstrapCompleted) +function showProgressMeterIfNoError() { - gIsBootstrapComplete = aBootstrapCompleted; + let meter = document.getElementById("progressMeter"); + if (meter && !gTorProcessService.TorBootstrapErrorOccurred) + meter.style.visibility = "visible"; } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index e6d3531..1b5ced0 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -29,7 +29,7 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> - <deck id="deck"> + <deck id="deck" onselect="onDeckSelect();"> <vbox id="settings"> <vbox id="bridgeSettings"/> <separator orient="horizontal" class="thin"/> @@ -51,6 +51,9 @@ </hbox> <spring flex="1" /> </vbox> + <vbox id="progressPanel"> + <vbox id="progressContent"/> + </vbox> <vbox id="errorPanel"> <spring flex="1" /> <hbox> diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js deleted file mode 100644 index f7bcaff..0000000 --- a/src/chrome/content/progress.js +++ /dev/null @@ -1,249 +0,0 @@ -// Copyright (c) 2017, The Tor Project, Inc. -// See LICENSE for licensing information. -// -// vim: set sw=2 sts=2 ts=8 et syntax=javascript: - -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cu = Components.utils; - -const kTorProcessExitedTopic = "TorProcessExited"; -const kBootstrapStatusTopic = "TorBootstrapStatus"; -const kTorBootstrapErrorTopic = "TorBootstrapError"; -const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; - -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", - "resource://torlauncher/modules/tl-util.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", - "resource://torlauncher/modules/tl-logger.jsm"); - - -var gObsSvc; -var gOpenerCallbackFunc; // Set when opened from network settings. - - -function initDialog() -{ - // If tor bootstrap has already finished, just close the progress dialog. - // This situation can occur if bootstrapping is very fast and/or if this - // window opens slowly (observed with Adblock Plus installed). - try - { - var processSvc = Cc["@torproject.org/torlauncher-process-service;1"] - .getService(Ci.nsISupports).wrappedJSObject; - if (processSvc.TorIsBootstrapDone || processSvc.TorBootstrapErrorOccurred) - { - closeThisWindow(processSvc.TorIsBootstrapDone); - return; - } - } - catch (e) { dump(e + "\n"); } - - try - { - gObsSvc = Cc["@mozilla.org/observer-service;1"] - .getService(Ci.nsIObserverService); - gObsSvc.addObserver(gObserver, kTorProcessExitedTopic, false); - gObsSvc.addObserver(gObserver, kBootstrapStatusTopic, false); - gObsSvc.addObserver(gObserver, kTorBootstrapErrorTopic, false); - gObsSvc.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); - } - catch (e) {} - - var isBrowserStartup = false; - if (window.arguments) - { - isBrowserStartup = window.arguments[0]; - - if (window.arguments.length > 1) - gOpenerCallbackFunc = window.arguments[1]; - } - - if (gOpenerCallbackFunc) - { - // Dialog was opened from network settings: hide Open Settings button. - var extraBtn = document.documentElement.getButton("extra2"); - extraBtn.setAttribute("hidden", true); - } - else - { - // Dialog was not opened from network settings: change Cancel to Quit. - var cancelBtn = document.documentElement.getButton("cancel"); - var quitKey = (TorLauncherUtil.isWindows) ? "quit_win" : "quit"; - cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey); - } - - // If opened during browser startup, display the "please wait" message. - if (isBrowserStartup) - { - var pleaseWait = document.getElementById("progressPleaseWait"); - if (pleaseWait) - pleaseWait.removeAttribute("hidden"); - } - - // To avoid showing an incorrect progress value, we keep the progress bar - // hidden until a TorBootstrapStatus notification is received. We request - // the most recent bootstrap status info (which should cause such a - // notification to be generated) and also start a fail-safe timer to ensure - // that the progress bar is displayed within 2 seconds in all cases. - let protocolSvc = Cc["@torproject.org/torlauncher-protocol-service;1"] - .getService(Ci.nsISupports).wrappedJSObject; - protocolSvc.TorRetrieveBootstrapStatus(); - window.setTimeout(function() { showProgressMeterIfNoError(); }, 2000); -} - - -function cleanup() -{ - if (gObsSvc) - { - gObsSvc.removeObserver(gObserver, kTorProcessExitedTopic); - gObsSvc.removeObserver(gObserver, kBootstrapStatusTopic); - gObsSvc.removeObserver(gObserver, kTorBootstrapErrorTopic); - gObsSvc.removeObserver(gObserver, kTorLogHasWarnOrErrTopic); - } -} - - -function closeThisWindow(aBootstrapDidComplete) -{ - cleanup(); - - if (gOpenerCallbackFunc) - gOpenerCallbackFunc(aBootstrapDidComplete); - - window.close(); -} - - -function onCancel() -{ - cleanup(); - - if (gOpenerCallbackFunc) - { - stopTorBootstrap(); - gOpenerCallbackFunc(false); - } - else try - { - var obsSvc = Cc["@mozilla.org/observer-service;1"] - .getService(Ci.nsIObserverService); - obsSvc.notifyObservers(null, "TorUserRequestedQuit", null); - } catch (e) {} - - return true; -} - - -function onOpenSettings() -{ - stopTorBootstrap(); - cleanup(); - window.close(); -} - - -function stopTorBootstrap() -{ - // Tell tor to disable use of the network; this should stop the bootstrap - // process. - const kErrorPrefix = "Setting DisableNetwork=1 failed: "; - try - { - var svc = Cc["@torproject.org/torlauncher-protocol-service;1"] - .getService(Ci.nsISupports); - svc = svc.wrappedJSObject; - var settings = {}; - settings["DisableNetwork"] = true; - var errObj = {}; - if (!svc.TorSetConfWithReply(settings, errObj)) - TorLauncherLogger.log(5, kErrorPrefix + errObj.details); - } - catch(e) - { - TorLauncherLogger.log(5, kErrorPrefix + e); - } -} - - -function showProgressMeterIfNoError() -{ - let meter = document.getElementById("progressMeter"); - if (meter && - !document.documentElement.hasAttribute("bootstrapErrorOccurred")) - { - meter.style.visibility = "visible"; - } -} - - -var gObserver = { - // nsIObserver implementation. - observe: function(aSubject, aTopic, aParam) - { - if ((kTorProcessExitedTopic == aTopic) || - (kTorBootstrapErrorTopic == aTopic)) - { - // In these cases, an error alert will be displayed elsewhere so it is - // best to close this window. - // TODO: provide a way to access tor log e.g., leave this dialog open - // and display the open settings button or provide a way to do - // that from our error alerts. - if (kTorBootstrapErrorTopic == aTopic) - stopTorBootstrap(); - cleanup(); - window.close(); - } - else if (kBootstrapStatusTopic == aTopic) - { - var statusObj = aSubject.wrappedJSObject; - var labelText = - TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "TAG"); - var percentComplete = (statusObj.PROGRESS) ? statusObj.PROGRESS : 0; - - var meter = document.getElementById("progressMeter"); - if (meter) - { - meter.value = percentComplete; - showProgressMeterIfNoError(); - } - - var bootstrapDidComplete = (percentComplete >= 100); - if (percentComplete >= 100) - { - // To ensure that 100% progress is displayed, wait a short while - // before closing this window. - window.setTimeout(function() { closeThisWindow(true); }, 250); - } - else if (statusObj._errorOccurred) - { - var s = TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "REASON"); - if (s) - labelText = s; - - document.documentElement.setAttribute("bootstrapErrorOccurred", true); - - if (meter) - meter.setAttribute("hidden", true); - - var pleaseWait = document.getElementById("progressPleaseWait"); - if (pleaseWait) - pleaseWait.setAttribute("hidden", true); - } - - var desc = document.getElementById("progressDesc"); - if (labelText && desc) - desc.textContent = labelText; - } - else if (kTorLogHasWarnOrErrTopic == aTopic) - { - var extra2Btn = document.documentElement.getButton("extra2"); - var clz = extra2Btn.getAttribute("class"); - extra2Btn.setAttribute("class", clz ? clz + " torWarning" : "torWarning"); - - // TODO: show error / warning message in this dialog? - } - }, -}; diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul deleted file mode 100644 index 5b26110..0000000 --- a/src/chrome/content/progress.xul +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0"?> - - -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://torlauncher/skin/progress.css" - type="text/css"?> - -<!DOCTYPE overlay SYSTEM "chrome://torlauncher/locale/progress.dtd"> - -<dialog id="TorProgress" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - title="&torprogress.dialog.title;" - windowtype="TorLauncher:Progress" - persist="screenX screenY" - buttons="cancel,extra2" - buttonlabelextra2="&torprogress.openSettings;" - ondialogcancel="return onCancel();" - ondialogextra2="onOpenSettings();" - onload="initDialog();"> - - <script type="application/x-javascript" - src="chrome://torlauncher/content/progress.js"/> - <vbox> - <hbox> - <vbox> - <spacer flex="1" /> - <image id="tbb-icon" /> - <spacer flex="1" /> - </vbox> - <separator orient="vertical" /> - <vbox flex="1"> - <label id="progressHeading" value="&torprogress.heading;" /> - <description id="progressDesc" /> - </vbox> - </hbox> - <progressmeter id="progressMeter" mode="determined" value="0" - style="visibility:hidden" /> - <description id="progressPleaseWait" - hidden="true">&torprogress.pleaseWait;</description> - </vbox> -</dialog> diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ach/progress.dtd b/src/chrome/locale/ach/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ach/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ady/progress.dtd b/src/chrome/locale/ady/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ady/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/af-ZA/network-settings.dtd b/src/chrome/locale/af-ZA/network-settings.dtd new file mode 100644 index 0000000..3cab152 --- /dev/null +++ b/src/chrome/locale/af-ZA/network-settings.dtd @@ -0,0 +1,3 @@ + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/af-ZA/progress.dtd b/src/chrome/locale/af-ZA/progress.dtd deleted file mode 100644 index ebd9cef..0000000 --- a/src/chrome/locale/af-ZA/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index d226ca3..ff231bb 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/af/progress.dtd b/src/chrome/locale/af/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/af/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ak/progress.dtd b/src/chrome/locale/ak/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ak/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd index 23aae0a..003e255 100644 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ b/src/chrome/locale/am-ET/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am-ET/progress.dtd b/src/chrome/locale/am-ET/progress.dtd deleted file mode 100644 index 8ce4f0e..0000000 --- a/src/chrome/locale/am-ET/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "የቶር ይዞታ"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index 2e81470..b6d2e03 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/am/progress.dtd b/src/chrome/locale/am/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/am/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index a20acd8..cd31eed 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net او https://mail.google.com, او https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "من خلال مكتب المساعدة"> <!ENTITY torsettings.bridgeHelp4 "يمكنك طلب عناوين الجسر، كحل أخير، من خلال إرسال رسالة بريد إلكتروني مهذبة إلى help(a)rt.torproject.org.  يرجى ملاحظة أنه يجب أن يرد شخص ما على كل طلب."> + + +<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd deleted file mode 100644 index 90ac171..0000000 --- a/src/chrome/locale/ar/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "حالة تور"> -<!ENTITY torprogress.openSettings "افتح الإعدادات"> -<!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> -<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/arn/progress.dtd b/src/chrome/locale/arn/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/arn/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index 6f12432..e85cb26 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ast/progress.dtd b/src/chrome/locale/ast/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ast/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 9e96619..7ef8cd1 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, və ya https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Dəstək Masası Vasitəsilə"> <!ENTITY torsettings.bridgeHelp4 "Son çarə olaraq körpü ünvanlarını help(a)rt.torproject.org ünvanına mədəni tələb emaili göndərməklə əldə edə bilərsən.  Lütfən, unutma ki, yazdığın insan hər bir tələbə ayrı ayrı cavab yazacaq."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/az/progress.dtd b/src/chrome/locale/az/progress.dtd deleted file mode 100644 index 31e6b48..0000000 --- a/src/chrome/locale/az/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Statusu"> -<!ENTITY torprogress.openSettings "Parametrləri aç"> -<!ENTITY torprogress.heading "Tor şəbəkəsinə qoşulur"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index 9e0d430..c235b1c 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/be/progress.dtd b/src/chrome/locale/be/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/be/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bg-BG/network-settings.dtd b/src/chrome/locale/bg-BG/network-settings.dtd new file mode 100644 index 0000000..3cab152 --- /dev/null +++ b/src/chrome/locale/bg-BG/network-settings.dtd @@ -0,0 +1,3 @@ + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/bg-BG/progress.dtd b/src/chrome/locale/bg-BG/progress.dtd deleted file mode 100644 index ebd9cef..0000000 --- a/src/chrome/locale/bg-BG/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 7972c72..ce13b61 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "През бюрото за помощ"> <!ENTITY torsettings.bridgeHelp4 "Като последна стъпка, вие може да изисквате адреси чрез пращане на учтив имейл до help(a)rt.torproject.org.  Моля обърнете внимание, че на всяка молба за bridge се отговаря персонално."> + + +<!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd deleted file mode 100644 index 490a9d5..0000000 --- a/src/chrome/locale/bg/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Състояние на Тор"> -<!ENTITY torprogress.openSettings "Отвори настройки"> -<!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-BD/progress.dtd b/src/chrome/locale/bn-BD/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/bn-BD/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn-IN/progress.dtd b/src/chrome/locale/bn-IN/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/bn-IN/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 5ebd2d0..db4e635 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bn/progress.dtd b/src/chrome/locale/bn/progress.dtd deleted file mode 100644 index 9819d83..0000000 --- a/src/chrome/locale/bn/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "টর অবস্থা"> -<!ENTITY torprogress.openSettings "সেটিংস খুলুন"> -<!ENTITY torprogress.heading "টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bo/progress.dtd b/src/chrome/locale/bo/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/bo/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/br/progress.dtd b/src/chrome/locale/br/progress.dtd deleted file mode 100644 index b5790df..0000000 --- a/src/chrome/locale/br/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Statudoù Tor"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index 5a33a60..2a7e408 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/bs/progress.dtd b/src/chrome/locale/bs/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/bs/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index bff8120..9eb7945 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A través de l'Escriptori d'Ajuda"> <!ENTITY torsettings.bridgeHelp4 "Com a última opció, podeu demanar adreces de pont enviant un missatge a help(a)rt.torproject.org.  Una persona respondrà cada petició."> + + +<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd deleted file mode 100644 index cb1bd5d..0000000 --- a/src/chrome/locale/ca/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estat de Tor"> -<!ENTITY torprogress.openSettings "Obrie les preferències."> -<!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> -<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index 0458e75..e666423 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -52,3 +52,6 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + +<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/ca(a)valencia/progress.dtd b/src/chrome/locale/ca(a)valencia/progress.dtd deleted file mode 100644 index e0dcfcc..0000000 --- a/src/chrome/locale/ca(a)valencia/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title ""> -<!ENTITY torprogress.openSettings ""> -<!ENTITY torprogress.heading ""> -<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd index 75ece3b..9c78c3c 100644 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ b/src/chrome/locale/cs-CZ/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cs-CZ/progress.dtd b/src/chrome/locale/cs-CZ/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/cs-CZ/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index a69caff..d5241e1 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, nebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> <!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk."> + + +<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> diff --git a/src/chrome/locale/cs/progress.dtd b/src/chrome/locale/cs/progress.dtd deleted file mode 100644 index 0311994..0000000 --- a/src/chrome/locale/cs/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Stav"> -<!ENTITY torprogress.openSettings "Otevřít nastavení"> -<!ENTITY torprogress.heading "Připojuji se k síti Tor"> -<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/csb/progress.dtd b/src/chrome/locale/csb/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/csb/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index dfe657e..6a95899 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cv/progress.dtd b/src/chrome/locale/cv/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/cv/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index 6f3cc56..2ed3e89 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/cy/progress.dtd b/src/chrome/locale/cy/progress.dtd deleted file mode 100644 index c4f29d7..0000000 --- a/src/chrome/locale/cy/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Statws Tor"> -<!ENTITY torprogress.openSettings "Agor Gosodiadau"> -<!ENTITY torprogress.heading "Yn cysylltu â rhwydwaith Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 2851032..4257722 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> + + +<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/da/progress.dtd b/src/chrome/locale/da/progress.dtd deleted file mode 100644 index 063ad85..0000000 --- a/src/chrome/locale/da/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor status"> -<!ENTITY torprogress.openSettings "Åbn indstillinger"> -<!ENTITY torprogress.heading "Opretter forbindelse til Tor-netværket"> -<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index c635745..d976ea2 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle"> <!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help(a)rt.torproject.org angefordert werden.  Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss."> + + +<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd deleted file mode 100644 index b3b893a..0000000 --- a/src/chrome/locale/de/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor-Status"> -<!ENTITY torprogress.openSettings "Einstellungen öffnen"> -<!ENTITY torprogress.heading "Verbindung mit dem Tor-Netzwerk wird hergestellt"> -<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/dz/progress.dtd b/src/chrome/locale/dz/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/dz/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/el-GR/network-settings.dtd b/src/chrome/locale/el-GR/network-settings.dtd new file mode 100644 index 0000000..3cab152 --- /dev/null +++ b/src/chrome/locale/el-GR/network-settings.dtd @@ -0,0 +1,3 @@ + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/el-GR/progress.dtd b/src/chrome/locale/el-GR/progress.dtd deleted file mode 100644 index ebd9cef..0000000 --- a/src/chrome/locale/el-GR/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index aa2b6f4..85d7b78 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> <!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> + + +<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/el/progress.dtd b/src/chrome/locale/el/progress.dtd deleted file mode 100644 index e63961a..0000000 --- a/src/chrome/locale/el/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Κατάσταση του Tor "> -<!ENTITY torprogress.openSettings "Ανοιγμα ρυθμισεων"> -<!ENTITY torprogress.heading "Δημιουργια σύνδεσης στο δίκτυο Tor"> -<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en-GB/progress.dtd b/src/chrome/locale/en-GB/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/en-GB/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index dc666dd..240154c 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -53,3 +53,6 @@ <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/en/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 0c3fa75..f6d763a 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/eo/progress.dtd b/src/chrome/locale/eo/progress.dtd deleted file mode 100644 index c03f16a..0000000 --- a/src/chrome/locale/eo/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Stato de Tor"> -<!ENTITY torprogress.openSettings "Malfermi agordojn"> -<!ENTITY torprogress.heading "Konektante al Tor-reto"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 49e95dd..5be6fa5 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos."> diff --git a/src/chrome/locale/es-AR/progress.dtd b/src/chrome/locale/es-AR/progress.dtd deleted file mode 100644 index 223d4a5..0000000 --- a/src/chrome/locale/es-AR/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado de Tor"> -<!ENTITY torprogress.openSettings "Abrir Configuraciones"> -<!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos."> diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 6303509..30d3940 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CL/progress.dtd b/src/chrome/locale/es-CL/progress.dtd deleted file mode 100644 index 87e2523..0000000 --- a/src/chrome/locale/es-CL/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado Del Modulo Tor"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index cb4c106..4a458a0 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-CO/progress.dtd b/src/chrome/locale/es-CO/progress.dtd deleted file mode 100644 index f59998a..0000000 --- a/src/chrome/locale/es-CO/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado de Tor"> -<!ENTITY torprogress.openSettings "Configuraciones abiertas"> -<!ENTITY torprogress.heading "Conectando a la red de Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index ad001f4..85b97c0 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es-MX/progress.dtd b/src/chrome/locale/es-MX/progress.dtd deleted file mode 100644 index 3ee4849..0000000 --- a/src/chrome/locale/es-MX/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado de Tor"> -<!ENTITY torprogress.openSettings "Abrir Ajustes"> -<!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es-NI/network-settings.dtd b/src/chrome/locale/es-NI/network-settings.dtd new file mode 100644 index 0000000..3cab152 --- /dev/null +++ b/src/chrome/locale/es-NI/network-settings.dtd @@ -0,0 +1,3 @@ + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/es-NI/progress.dtd b/src/chrome/locale/es-NI/progress.dtd deleted file mode 100644 index ebd9cef..0000000 --- a/src/chrome/locale/es-NI/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index dc01bb3..45ff7f0 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario"> <!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help(a)rt.torproject.org .  Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición."> + + +<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es/progress.dtd b/src/chrome/locale/es/progress.dtd deleted file mode 100644 index a8703de..0000000 --- a/src/chrome/locale/es/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado de Tor"> -<!ENTITY torprogress.openSettings "Abrir Preferencias"> -<!ENTITY torprogress.heading "Conectando con la red de Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, espere a que establezcamos una conexión a la red Tor.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index c4bdb10..35b5fe3 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/et/progress.dtd b/src/chrome/locale/et/progress.dtd deleted file mode 100644 index 6b93dff..0000000 --- a/src/chrome/locale/et/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tori staatus"> -<!ENTITY torprogress.openSettings "Ava seaded"> -<!ENTITY torprogress.heading "Tor võrgustikuga ühendumine"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 0efb96c..9753df9 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> + + +<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake."> diff --git a/src/chrome/locale/eu/progress.dtd b/src/chrome/locale/eu/progress.dtd deleted file mode 100644 index 55bb4c0..0000000 --- a/src/chrome/locale/eu/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor egoera"> -<!ENTITY torprogress.openSettings "Ezarpenak ireki"> -<!ENTITY torprogress.heading "Tor sarera konektatzen"> -<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake."> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 490a77b..76cb386 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, یا https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> <!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> + + +<!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد."> diff --git a/src/chrome/locale/fa/progress.dtd b/src/chrome/locale/fa/progress.dtd deleted file mode 100644 index 8646caa..0000000 --- a/src/chrome/locale/fa/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "وضعیت تور"> -<!ENTITY torprogress.openSettings "تنظیمات‌را باز کنید"> -<!ENTITY torprogress.heading "درحال اتصال به شبکه تُر"> -<!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index f0ddb4c..bbd6db8 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com tai https:://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Neuvontapisteen läpi"> <!ENTITY torsettings.bridgeHelp4 "Viimeisenä keinona voit pyytää siltaosoitteita lähettämällä kohteliaan viestin osoitteeseen: help(a)rt.torproject.org.  Huomioi, että henkilön tulee vastata kuhunkin pyyntöön."> + + +<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  diff --git a/src/chrome/locale/fi/progress.dtd b/src/chrome/locale/fi/progress.dtd deleted file mode 100644 index 69414cf..0000000 --- a/src/chrome/locale/fi/progress.dtd +++ /dev/null @@ -1,5 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor-tila"> -<!ENTITY torprogress.openSettings "Avaa asetukset"> -<!ENTITY torprogress.heading "Yhdistetään Tor-verkkoon"> -<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  -Tässä saattaa kestää muutama minuutti."> diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index bd9412b..b73700b 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd deleted file mode 100644 index c73883b..0000000 --- a/src/chrome/locale/fil/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Buksan ang Settings"> -<!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor."> -<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index 78bc505..bf6c933 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fo/progress.dtd b/src/chrome/locale/fo/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/fo/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index d117b0d..af3ea91 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> <!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> + + +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr-CA/progress.dtd b/src/chrome/locale/fr-CA/progress.dtd deleted file mode 100644 index 39a0643..0000000 --- a/src/chrome/locale/fr-CA/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "État de Tor"> -<!ENTITY torprogress.openSettings "Ouvrir les paramètres"> -<!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index d795967..5cdbd06 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> <!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> + + +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd deleted file mode 100644 index 39a0643..0000000 --- a/src/chrome/locale/fr/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "État de Tor"> -<!ENTITY torprogress.openSettings "Ouvrir les paramètres"> -<!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fur/progress.dtd b/src/chrome/locale/fur/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/fur/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 477705a..1753adb 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/fy/progress.dtd b/src/chrome/locale/fy/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/fy/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ga/progress.dtd b/src/chrome/locale/ga/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ga/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index 7940a38..20c000f 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gl/progress.dtd b/src/chrome/locale/gl/progress.dtd deleted file mode 100644 index 84c3935..0000000 --- a/src/chrome/locale/gl/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado do Tor"> -<!ENTITY torprogress.openSettings "Abrir axustes"> -<!ENTITY torprogress.heading "Conexión á rede Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu-IN/progress.dtd b/src/chrome/locale/gu-IN/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/gu-IN/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index b66952c..d5bf712 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gu/progress.dtd b/src/chrome/locale/gu/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/gu/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/gun/progress.dtd b/src/chrome/locale/gun/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/gun/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ha/progress.dtd b/src/chrome/locale/ha/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ha/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index d6a09c7..cf3887c 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -77,3 +77,6 @@ https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4 "כמוצא אחרון, תוכל לבקש רשימת גשרים באמצעות פנייה מנומסת בדואל לכתובת הבאה: help(a)rt.torproject.org אנא זכור שבן אנוש ייאלץ להשיב באופן אישי לכל בקשה שכזו."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/he/progress.dtd b/src/chrome/locale/he/progress.dtd deleted file mode 100644 index ee4943a..0000000 --- a/src/chrome/locale/he/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "מצב Tor"> -<!ENTITY torprogress.openSettings "פתח הגדרות"> -<!ENTITY torprogress.heading "מתחבר כעת אל רשת Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 3b7b724..61a87d4 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> diff --git a/src/chrome/locale/hi/progress.dtd b/src/chrome/locale/hi/progress.dtd deleted file mode 100644 index 03eacb2..0000000 --- a/src/chrome/locale/hi/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "टोर का अवस्था। "> -<!ENTITY torprogress.openSettings "सेटिंग्स खोलें। "> -<!ENTITY torprogress.heading "टोर संजाल से जुड़ है। "> -<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 0e4d96a..2834a8b 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -75,3 +75,6 @@ s Tor mrežom?"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ili https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Deska"> <!ENTITY torsettings.bridgeHelp4 "Na kraju, možete zatražiti adrese mostova tako što će te poslati pristojan email na help(a)rt.torproject.org.  Imajte na umu da će na svaki zahtjev morati odgovoriti osoba."> + + +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd deleted file mode 100644 index 20fa443..0000000 --- a/src/chrome/locale/hr-HR/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Otvori postavke"> -<!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 874dda9..0ba50d8 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd deleted file mode 100644 index da8dda4..0000000 --- a/src/chrome/locale/hr/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Status Tor-a"> -<!ENTITY torprogress.openSettings "Otvori Postavke"> -<!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ht/progress.dtd b/src/chrome/locale/ht/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ht/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index e8fc42e..b52082e 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, vagy https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A támogatáson keresztül."> <!ENTITY torsettings.bridgeHelp4 "Utolsó lehetőségként küldj egy udvarias bridge igénylő emailt ide: help(a)rt.torproject.org.  Légyszíves vedd figyelembe az adott személynek több emailt kell megválaszolnia."> + + +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hu/progress.dtd b/src/chrome/locale/hu/progress.dtd deleted file mode 100644 index e4565a2..0000000 --- a/src/chrome/locale/hu/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor állapot"> -<!ENTITY torprogress.openSettings "Beállítások megnyitása"> -<!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz"> -<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index f6b89c5..84a2881 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy-AM/progress.dtd b/src/chrome/locale/hy-AM/progress.dtd deleted file mode 100644 index 545668d..0000000 --- a/src/chrome/locale/hy-AM/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor-ի կարգավիճակը"> -<!ENTITY torprogress.openSettings "Բացել Կարգավորումները"> -<!ENTITY torprogress.heading "Միացում Tor ցանցին"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index 213562d..e952b09 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/hy/progress.dtd b/src/chrome/locale/hy/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/hy/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index b9bd75e..58a9c71 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ia/progress.dtd b/src/chrome/locale/ia/progress.dtd deleted file mode 100644 index 3f9c00f..0000000 --- a/src/chrome/locale/ia/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Stato de Tor"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index c5815c6..3fbef36 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Sebagai pilihan terakhir anda dapat meminta alamat bridge dengan mengirimkan pesan email dengan sopan ke help(a)rt.torproject.org.  Silakan catat bahwa petugas akan merespon masing-masing permintaan"> + + +<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.  Ini mungkin memakan waktu beberapa menit."> diff --git a/src/chrome/locale/id/progress.dtd b/src/chrome/locale/id/progress.dtd deleted file mode 100644 index da6956f..0000000 --- a/src/chrome/locale/id/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Status Tor"> -<!ENTITY torprogress.openSettings "Buka Pengaturan"> -<!ENTITY torprogress.heading "Menyambung ke jaringan Tor"> -<!ENTITY torprogress.pleaseWait "Mohon tunggu sementara kami menyambung ke jaringan Tor.  Ini mungkin memakan waktu beberapa menit."> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 1e294fd..28e8ddb 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Í gegnum hjálparborðið"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/progress.dtd b/src/chrome/locale/is/progress.dtd deleted file mode 100644 index 4cc7f46..0000000 --- a/src/chrome/locale/is/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Staða Tor"> -<!ENTITY torprogress.openSettings "Opna stillingar"> -<!ENTITY torprogress.heading "Tengist Tor-netinu"> -<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index b7a4411..943e24c 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help(a)rt.torproject.org.  Tieni conto che una persona dovrà rispondere ad ogni singola richiesta."> + + +<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd deleted file mode 100644 index e60f306..0000000 --- a/src/chrome/locale/it/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Stato di Tor"> -<!ENTITY torprogress.openSettings "Apertura impostazioni"> -<!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Per favore attendere finchè non verrà stabilita una connessione alla rete Tor.  Potrebbero essere necessari alcuni minuti."> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 724a4ee..16fee49 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由"> <!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)rt.torproject.org に丁寧なメールメッセージを送信して、ブリッジアドレスをリクエストすることができます。  人間が各リクエストに対応する必要があることにご注意ください。"> + + +<!ENTITY torprogress.pleaseWait "Torネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。"> diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd deleted file mode 100644 index db3ec29..0000000 --- a/src/chrome/locale/ja/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Torの状態"> -<!ENTITY torprogress.openSettings "設定を開く"> -<!ENTITY torprogress.heading "Torネットワークに接続しています"> -<!ENTITY torprogress.pleaseWait "Torネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。"> diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/jv/progress.dtd b/src/chrome/locale/jv/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/jv/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index d75f96d..236b7ea 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ka/progress.dtd b/src/chrome/locale/ka/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ka/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index 478fe43..3787679 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kk/progress.dtd b/src/chrome/locale/kk/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/kk/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index c58339f..0d10dbc 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "តាមរយៈជំនួយ"> <!ENTITY torsettings.bridgeHelp4 "នៅជម្រើសចុងក្រោយ អ្នកអាចស្នើអាសយដ្ឋានប៊្រីតដោយផ្ញើសារអ៊ីមែលគួរសមទៅ help(a)rt.torproject.org.  សូមចំណាំថា មនុស្សម្នាក់នឹងត្រូវឆ្លើយតបទៅសំណើនីមួយៗ។"> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/km/progress.dtd b/src/chrome/locale/km/progress.dtd deleted file mode 100644 index 76d75ce..0000000 --- a/src/chrome/locale/km/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "ស្ថានភាព Tor"> -<!ENTITY torprogress.openSettings "បើកការកំណត់"> -<!ENTITY torprogress.heading "ភ្ជាប់ទៅបណ្ដាញ Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index e18a7cc..2a9f2c7 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kn/progress.dtd b/src/chrome/locale/kn/progress.dtd deleted file mode 100644 index b6e3b70..0000000 --- a/src/chrome/locale/kn/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "ಟಾರ್‌ನ ಸ್ಥಿತಿ"> -<!ENTITY torprogress.openSettings "ಅಪೂರ್ಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"> -<!ENTITY torprogress.heading "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ."> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index e6e9760..0908a1d 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko-KR/progress.dtd b/src/chrome/locale/ko-KR/progress.dtd deleted file mode 100644 index 7c2da43..0000000 --- a/src/chrome/locale/ko-KR/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Tor 네트워크로 연결하고 있어요"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 8599b02..64e87cb 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 또는 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> <!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의 해주십시오"> + + +<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다."> diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd deleted file mode 100644 index 6963c4f..0000000 --- a/src/chrome/locale/ko/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor 상태"> -<!ENTITY torprogress.openSettings "시작 설정"> -<!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다."> diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ku/progress.dtd b/src/chrome/locale/ku/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ku/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/kw/progress.dtd b/src/chrome/locale/kw/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/kw/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index 74be4e1..a94a6ac 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ky/progress.dtd b/src/chrome/locale/ky/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ky/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index 9e4060c..77fa7af 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lb/progress.dtd b/src/chrome/locale/lb/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/lb/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lg/progress.dtd b/src/chrome/locale/lg/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/lg/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ln/progress.dtd b/src/chrome/locale/ln/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ln/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index f0fdd8f..31cb0e6 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ."> diff --git a/src/chrome/locale/lo/progress.dtd b/src/chrome/locale/lo/progress.dtd deleted file mode 100644 index 14b98fe..0000000 --- a/src/chrome/locale/lo/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "ສະຖານະ Tor"> -<!ENTITY torprogress.openSettings "ໄຂການຕັ້ງຄ່າ"> -<!ENTITY torprogress.heading "ກຳລັງເຊື່ອມຕໍ່ເຂົ້າກັບເຄືອຂ່າຍ Tor"> -<!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ."> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 0da969f..ecf78f0 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ar https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.  Tai gali užtrukti kelias minutes."> diff --git a/src/chrome/locale/lt/progress.dtd b/src/chrome/locale/lt/progress.dtd deleted file mode 100644 index 0989f9f..0000000 --- a/src/chrome/locale/lt/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor būsena"> -<!ENTITY torprogress.openSettings "Atverti nustatymus"> -<!ENTITY torprogress.heading "Jungiamasi prie Tor tinklo"> -<!ENTITY torprogress.pleaseWait "Prašome palaukti, kol mes užmegsime ryšį su Tor tinklu.  Tai gali užtrukti kelias minutes."> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index aeb6381..d10497d 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> + + +<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor.  tam var būt nepieciešamas vairākas minūtes."> diff --git a/src/chrome/locale/lv/progress.dtd b/src/chrome/locale/lv/progress.dtd deleted file mode 100644 index 98f8be5..0000000 --- a/src/chrome/locale/lv/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor'a statuss"> -<!ENTITY torprogress.openSettings "Atvērt iestatījumus"> -<!ENTITY torprogress.heading "Veido savienojumu ar Tor'a tīklu"> -<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor.  tam var būt nepieciešamas vairākas minūtes."> diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mg/progress.dtd b/src/chrome/locale/mg/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/mg/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mi/progress.dtd b/src/chrome/locale/mi/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/mi/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 1f69d4f..00d6235 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mk/progress.dtd b/src/chrome/locale/mk/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/mk/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ml/progress.dtd b/src/chrome/locale/ml/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ml/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mn/progress.dtd b/src/chrome/locale/mn/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/mn/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index ede666b..b0fef6d 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mr/progress.dtd b/src/chrome/locale/mr/progress.dtd deleted file mode 100644 index e37501b..0000000 --- a/src/chrome/locale/mr/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "टॉर स्थिती"> -<!ENTITY torprogress.openSettings "सेटिंग्स उघडा"> -<!ENTITY torprogress.heading "टॉर जाळ्याला जोडणी करणे चालू आहे"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 237f08d..71a3a6e 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ms-MY/progress.dtd b/src/chrome/locale/ms-MY/progress.dtd deleted file mode 100644 index 1735116..0000000 --- a/src/chrome/locale/ms-MY/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Buka tetapan."> -<!ENTITY torprogress.heading "Menyambung ke rangkaian Tor."> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/mt/progress.dtd b/src/chrome/locale/mt/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/mt/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index 8f58545..80448c5 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/my/progress.dtd b/src/chrome/locale/my/progress.dtd deleted file mode 100644 index 97fdfb1..0000000 --- a/src/chrome/locale/my/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor အနေအထား"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Tor ကွန်ရက်ကို ဆက်သွယ်နေသည်"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nah/progress.dtd b/src/chrome/locale/nah/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/nah/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nap/progress.dtd b/src/chrome/locale/nap/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/nap/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 56f41f1..06e1054 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -74,3 +74,6 @@ <!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> <!ENTITY torsettings.bridgeHelp4 "Som en siste utvei, kan du be om bro-adresser ved å sende en høflig e-post til help(a)rt.torproject.org.  Tenk over at en person må svare på hver slik forespørsel."> + + +<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nb/progress.dtd b/src/chrome/locale/nb/progress.dtd deleted file mode 100644 index 82cf290..0000000 --- a/src/chrome/locale/nb/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor-status"> -<!ENTITY torprogress.openSettings "Åpne Innstillinger"> -<!ENTITY torprogress.heading "Kobler til Tor-nettverket"> -<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nds/progress.dtd b/src/chrome/locale/nds/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/nds/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 57eb5f2..9b1f1a7 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ne/progress.dtd b/src/chrome/locale/ne/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ne/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index 1c932a4..d313b6e 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via de Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl-BE/progress.dtd b/src/chrome/locale/nl-BE/progress.dtd deleted file mode 100644 index 9d01a14..0000000 --- a/src/chrome/locale/nl-BE/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Instellingen"> -<!ENTITY torprogress.heading "Connecteren naar het Tor netwerk"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index d7fa414..bb0bbe8 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, of https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk"> <!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel kan je bridge-adressen aanvragen door een vriendelijke e-mail te sturen naar help(a)rt.torproject.org.  Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen."> + + +<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd deleted file mode 100644 index a7ced45..0000000 --- a/src/chrome/locale/nl/progress.dtd +++ /dev/null @@ -1,5 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Instellingen"> -<!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk"> -<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  -Dit kan enkele minuten duren."> diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 3b23940..f631124 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nn/progress.dtd b/src/chrome/locale/nn/progress.dtd deleted file mode 100644 index 0664105..0000000 --- a/src/chrome/locale/nn/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor-status"> -<!ENTITY torprogress.openSettings "Opne innstillingar"> -<!ENTITY torprogress.heading "Koplar til Tor-nettverket"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/nso/progress.dtd b/src/chrome/locale/nso/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/nso/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/oc/progress.dtd b/src/chrome/locale/oc/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/oc/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/or/progress.dtd b/src/chrome/locale/or/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/or/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index b02946f..32da454 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡੈਸਕ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pa/progress.dtd b/src/chrome/locale/pa/progress.dtd deleted file mode 100644 index ec821bc..0000000 --- a/src/chrome/locale/pa/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "ਟੋਰ ਸਥਿਤੀ"> -<!ENTITY torprogress.openSettings "ਸੈਟਿੰਗ ਖੋਲ੍ਹੋ"> -<!ENTITY torprogress.heading "ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pap/progress.dtd b/src/chrome/locale/pap/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/pap/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index 9a2f3f6..de9ccac 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -53,3 +53,6 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + +<!ENTITY torprogress.pleaseWait "Przeglądarka Tor uruchomi się po połączeniu z siecią Tor"> diff --git a/src/chrome/locale/pl-PL/progress.dtd b/src/chrome/locale/pl-PL/progress.dtd deleted file mode 100644 index 6edceb2..0000000 --- a/src/chrome/locale/pl-PL/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Status sieci Tor"> -<!ENTITY torprogress.openSettings "Ustawienia"> -<!ENTITY torprogress.heading "Łączenie z siecią Tor"> -<!ENTITY torprogress.pleaseWait "Przeglądarka Tor uruchomi się po połączeniu z siecią Tor"> diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 18b1a48..cfb082d 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, lub https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk"> <!ENTITY torsettings.bridgeHelp4 "W ostateczności, można zażądać adresów mostów, wysyłając uprzejmą wiadomość e-mail do help(a)rt.torproject.org.  Należy pamiętać, że osoba będzie musiała odpowiedzieć na każde żądanie."> + + +<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd deleted file mode 100644 index 6896d3c..0000000 --- a/src/chrome/locale/pl/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Status sieci Tor"> -<!ENTITY torprogress.openSettings "Ustawienia"> -<!ENTITY torprogress.heading "Łączenie z siecią Tor"> -<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pms/progress.dtd b/src/chrome/locale/pms/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/pms/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ps/progress.dtd b/src/chrome/locale/ps/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ps/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index f7cf95b..7bbaedc 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pelo Serviço de Assistência"> <!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org.  Por favor, entenda que uma pessoa terá que responder a cada solicitação"> + + +<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd deleted file mode 100644 index 1c07b36..0000000 --- a/src/chrome/locale/pt-BR/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Status do Tor"> -<!ENTITY torprogress.openSettings "Abrir Configurações "> -<!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 5c0ae5c..4250124 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help(a)rt.torproject.org.  Por favor, note que uma pessoa irá precisar de responder a cada pedido."> + + +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd deleted file mode 100644 index f3a6922..0000000 --- a/src/chrome/locale/pt/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Estado do Tor"> -<!ENTITY torprogress.openSettings "Abrir Configurações"> -<!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index d5f561a..c99dc80 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> + + +<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd deleted file mode 100644 index 9efa695..0000000 --- a/src/chrome/locale/ro/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Stare Tor"> -<!ENTITY torprogress.openSettings "Setări"> -<!ENTITY torprogress.heading "Conctare la reţeaua Tor"> -<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index ed79f3c..20117a1 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> <!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.  Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком."> + + +<!ENTITY torprogress.pleaseWait "Подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd deleted file mode 100644 index 29b58f8..0000000 --- a/src/chrome/locale/ru/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Статус Tor"> -<!ENTITY torprogress.openSettings "Открыть настройки"> -<!ENTITY torprogress.heading "Подключение к сети Tor"> -<!ENTITY torprogress.pleaseWait "Подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index 5eae3c6..adaa33f 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ru(a)petr1708/progress.dtd b/src/chrome/locale/ru(a)petr1708/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ru(a)petr1708/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sco/progress.dtd b/src/chrome/locale/sco/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/sco/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index 11e3069..eca83b0 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/si-LK/progress.dtd b/src/chrome/locale/si-LK/progress.dtd deleted file mode 100644 index 6377cf4..0000000 --- a/src/chrome/locale/si-LK/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor තත්ත්වය "> -<!ENTITY torprogress.openSettings "සිටුවම් විවෘත කරන්න"> -<!ENTITY torprogress.heading "Tor ජාලය හා සම්බන්ධ වෙමින්"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index 1831549..f6c15c9 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prostredníctvom Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help(a)rt.torproject.org a požiadať o adresy premostenia.  Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať."> + + +<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> diff --git a/src/chrome/locale/sk-SK/progress.dtd b/src/chrome/locale/sk-SK/progress.dtd deleted file mode 100644 index 272fc72..0000000 --- a/src/chrome/locale/sk-SK/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Otvoriť nastavenia"> -<!ENTITY torprogress.heading "Pripájanie do siete Tor "> -<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index f86e26a..17e8026 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, alebo https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Cez Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako poslednú možnosť si môžete vyžiadať adresy mostov zaslaním zdvorilého emailu na adresu help(a)rt.torproject.org.  Prosíme berte na vedomie, že príslušná osoba musí odpovedať na každú jednu podobnú žiadosť."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sk/progress.dtd b/src/chrome/locale/sk/progress.dtd deleted file mode 100644 index fcb403f..0000000 --- a/src/chrome/locale/sk/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor status"> -<!ENTITY torprogress.openSettings "Otvor nastavenia"> -<!ENTITY torprogress.heading "Pripájanie do siete Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 6ddb6e3..5ba1f32 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Preko table Pomoči"> <!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s pošiljanjem olikanega e-sporočila na help(a)rt.torproject.org.  Prosimo, upoštevajte, da dotična oseba odgovarja na vsako zahtevo."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl-SI/progress.dtd b/src/chrome/locale/sl-SI/progress.dtd deleted file mode 100644 index 95372f9..0000000 --- a/src/chrome/locale/sl-SI/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor stanje"> -<!ENTITY torprogress.openSettings "Odpri Nastavitve"> -<!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index b7c53c2..c89784c 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sl/progress.dtd b/src/chrome/locale/sl/progress.dtd deleted file mode 100644 index 5d12bf5..0000000 --- a/src/chrome/locale/sl/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor stanje"> -<!ENTITY torprogress.openSettings "Odpri nastavitve"> -<!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sn/progress.dtd b/src/chrome/locale/sn/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/sn/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/so/progress.dtd b/src/chrome/locale/so/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/so/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/son/progress.dtd b/src/chrome/locale/son/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/son/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd index 75ece3b..9c78c3c 100644 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ b/src/chrome/locale/sq-AL/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq-AL/progress.dtd b/src/chrome/locale/sq-AL/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/sq-AL/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index ffa38c1..c0fd25a 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Përmes Help Desk-ut"> <!ENTITY torsettings.bridgeHelp4 "Si mjet të fundit, ju mund të kërkoni adresat urë, duke dërguar një mesazh e-poste me politesë tek help(a)rt.torproject.org.  Ju lutemi vini re se një person do të duhet t'i përgjigjet çdo kërkese."> + + +<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd deleted file mode 100644 index f680a4c..0000000 --- a/src/chrome/locale/sq/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Gjendja e Tor"> -<!ENTITY torprogress.openSettings "Hapeni Konfigurimin"> -<!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index be5b44b..e27b1ab 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr/progress.dtd b/src/chrome/locale/sr/progress.dtd deleted file mode 100644 index ef5e90c..0000000 --- a/src/chrome/locale/sr/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Тор статус"> -<!ENTITY torprogress.openSettings "Отвори подешавања"> -<!ENTITY torprogress.heading "Повезивање на Тор мрежу"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 67da423..9f1ed4a 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sr(a)latin/progress.dtd b/src/chrome/locale/sr(a)latin/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/sr(a)latin/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/st/progress.dtd b/src/chrome/locale/st/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/st/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/su/progress.dtd b/src/chrome/locale/su/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/su/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index 6ce1473..a62de6e 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -53,3 +53,6 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + +<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/sv-SE/progress.dtd b/src/chrome/locale/sv-SE/progress.dtd deleted file mode 100644 index e0dcfcc..0000000 --- a/src/chrome/locale/sv-SE/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title ""> -<!ENTITY torprogress.openSettings ""> -<!ENTITY torprogress.heading ""> -<!ENTITY torprogress.pleaseWait ""> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 0648ead..4b118b6 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via supporten"> <!ENTITY torsettings.bridgeHelp4 "Som en sista utväg kan du skicka ett artigt e-post meddelande på engelska till help(a)rt.torproject.org, och fråga efter bryggadresser.  Tänk på att en person måste svara på varje sådan förfrågan."> + + +<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd deleted file mode 100644 index 1df097b..0000000 --- a/src/chrome/locale/sv/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor-status"> -<!ENTITY torprogress.openSettings "Öppna inställningar"> -<!ENTITY torprogress.heading "Ansluter till Tor-nätverket"> -<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/sw/progress.dtd b/src/chrome/locale/sw/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/sw/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/szl/progress.dtd b/src/chrome/locale/szl/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/szl/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 02e8fad..70a6dd5 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ta/progress.dtd b/src/chrome/locale/ta/progress.dtd deleted file mode 100644 index 3bbd799..0000000 --- a/src/chrome/locale/ta/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor நிலைமை"> -<!ENTITY torprogress.openSettings "அமைப்புக்களை திற"> -<!ENTITY torprogress.heading "Tor நெட்வொர்க்கிற்கு இணைக்கிறது"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index bb258de..19661a8 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te-IN/progress.dtd b/src/chrome/locale/te-IN/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/te-IN/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/te/progress.dtd b/src/chrome/locale/te/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/te/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tg/progress.dtd b/src/chrome/locale/tg/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/tg/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index 240e71b..ded8092 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/th/progress.dtd b/src/chrome/locale/th/progress.dtd deleted file mode 100644 index 9a6d686..0000000 --- a/src/chrome/locale/th/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "สถานะ Tor"> -<!ENTITY torprogress.openSettings "เปิดการตั้งค่า"> -<!ENTITY torprogress.heading "กำลังเชื่อมต่อสู่เครือข่าย Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ti/progress.dtd b/src/chrome/locale/ti/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ti/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tk/progress.dtd b/src/chrome/locale/tk/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/tk/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 2d99d30..1114d4a 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ya da https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Yardım masası yoluyla"> <!ENTITY torsettings.bridgeHelp4 "Son yol olarak, köprü adreslerini help(a)rt.torproject.org adresine göndereceğiniz nazik bir e-posta ile isteyebilirsiniz.  Her isteği bir kişinin yanıtlayacağını unutmayın."> + + +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd deleted file mode 100644 index 76930b0..0000000 --- a/src/chrome/locale/tr/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Durumu"> -<!ENTITY torprogress.openSettings "Ayarları Aç"> -<!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> -<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 5df3df6..4ed6ade 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com або https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Через допомогу"> <!ENTITY torsettings.bridgeHelp4 "У крайньому випадку, Ви можете отримати адресу мосту, відправивши ввічливе повідомлення на адресу help(a)rt.torproject.org.  Зверніть увагу на те, що кожен запит обробляється людиною."> + + +<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> diff --git a/src/chrome/locale/uk/progress.dtd b/src/chrome/locale/uk/progress.dtd deleted file mode 100644 index 4e5e458..0000000 --- a/src/chrome/locale/uk/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Статус Tor"> -<!ENTITY torprogress.openSettings "Відкрити Налаштування"> -<!ENTITY torprogress.heading "Підключення до мережі Tor"> -<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index 67a1700..9243e1a 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur-PK/progress.dtd b/src/chrome/locale/ur-PK/progress.dtd deleted file mode 100644 index 4cd92e2..0000000 --- a/src/chrome/locale/ur-PK/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "ٹار اسٹیٹس"> -<!ENTITY torprogress.openSettings "ترتیبات کھولیں"> -<!ENTITY torprogress.heading "ٹار نیٹ ورکس سے رابطہ بنائیں"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index de0c4e6..bb905b0 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ur/progress.dtd b/src/chrome/locale/ur/progress.dtd deleted file mode 100644 index 991c7ef..0000000 --- a/src/chrome/locale/ur/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "طور کے حیثیت"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index c3dc757..f18ebee 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/uz/progress.dtd b/src/chrome/locale/uz/progress.dtd deleted file mode 100644 index 7d6c8ec..0000000 --- a/src/chrome/locale/uz/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor holati"> -<!ENTITY torprogress.openSettings "Moslamalarni ochish"> -<!ENTITY torprogress.heading "Tor tarmog'iga ulanish"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/ve/progress.dtd b/src/chrome/locale/ve/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/ve/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index e5d368a..b48aed1 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Thông qua Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Như là phương thức cuối cùng, bạn có thể yêu cầu địa chỉ cầu nối bằng cách gửi một email lịch sự tới help(a)rt.torproject.org.  Vui lòng lưu ý rằng một người cần phải phản hồi tới từng yêu cầu."> + + +<!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút."> diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd deleted file mode 100644 index fdf5f7d..0000000 --- a/src/chrome/locale/vi/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Trạng thái Tor"> -<!ENTITY torprogress.openSettings "Những cài đặt mở"> -<!ENTITY torprogress.heading "Đang kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút."> diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wa/progress.dtd b/src/chrome/locale/wa/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/wa/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/wo/progress.dtd b/src/chrome/locale/wo/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/wo/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd new file mode 100644 index 0000000..13c9d3a --- /dev/null +++ b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd @@ -0,0 +1,3 @@ + + +<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> diff --git a/src/chrome/locale/zh-CN.GB2312/progress.dtd b/src/chrome/locale/zh-CN.GB2312/progress.dtd deleted file mode 100644 index 16491f9..0000000 --- a/src/chrome/locale/zh-CN.GB2312/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index fe39f0f..bad6552 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net，https://mail.google.com 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> <!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh@rt.torproject.org）。请注意：查看并回复这些邮件的并非机器人而是技术支持人员。"> + + +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd deleted file mode 100644 index dc816a5..0000000 --- a/src/chrome/locale/zh-CN/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor 状态"> -<!ENTITY torprogress.openSettings "打开设置"> -<!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 27fe26a..03cf6a1 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> <!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> + + +<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> diff --git a/src/chrome/locale/zh-HK/progress.dtd b/src/chrome/locale/zh-HK/progress.dtd deleted file mode 100644 index fbd63d4..0000000 --- a/src/chrome/locale/zh-HK/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor洋蔥路由狀態"> -<!ENTITY torprogress.openSettings "開啟設定"> -<!ENTITY torprogress.heading "連接到Tor洋蔥路由網絡"> -<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 5e6d31e..dff397b 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com 或者 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> <!ENTITY torsettings.bridgeHelp4 "最後的方法是：您可以發送一封禮貌性的郵件到 help(a)rt.torproject.org.  請注意，對於此類郵件我們必需要一封封地手動回覆。"> + + +<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd deleted file mode 100644 index fda5971..0000000 --- a/src/chrome/locale/zh-TW/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "洋蔥路由狀態"> -<!ENTITY torprogress.openSettings "開啟設定"> -<!ENTITY torprogress.heading "正在連線至洋蔥路由網路"> -<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> diff --git a/src/chrome/locale/zh/network-settings.dtd b/src/chrome/locale/zh/network-settings.dtd new file mode 100644 index 0000000..0db3c9c --- /dev/null +++ b/src/chrome/locale/zh/network-settings.dtd @@ -0,0 +1,6 @@ + + +<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> + + +<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> diff --git a/src/chrome/locale/zh/progress.dtd b/src/chrome/locale/zh/progress.dtd deleted file mode 100644 index 16491f9..0000000 --- a/src/chrome/locale/zh/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index 0d2e9dc..e28f84e 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -73,3 +73,6 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/locale/zu/progress.dtd b/src/chrome/locale/zu/progress.dtd deleted file mode 100644 index 9ac9ad7..0000000 --- a/src/chrome/locale/zu/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 3b6faba..34b1b3e 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -229,3 +229,16 @@ dialog .help { .torWarning .button-icon { display: inline !important; } + +#progressContent > vbox { + margin-top: 70px; +} + +#progressPleaseWait { + margin-bottom: 30px; +} + +#progressDesc { + height: 48px; + margin: 20px 30px; +} diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css deleted file mode 100644 index d718452..0000000 --- a/src/chrome/skin/progress.css +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2014, The Tor Project, Inc. - * See LICENSE for licensing information. - * - * vim: set sw=2 sts=2 ts=8 et syntax=css: - */ - -dialog { - width: 400px; -} - -#progressHeading { - font-size: 110%; - margin: 8px 0px 8px 0px; - font-weight: bold; -} - -#progressPleaseWait { - font-size: 110%; - margin-bottom: 15px; -} - -#tbb-icon { - list-style-image: url("chrome://torlauncher/skin/default48.png"); - width: 48px; - height: 48px; -} - -#progressDesc { - height: 48px; -} - -#progressMeter { - margin-bottom: 16px; -} - -.torWarning { - list-style-image: url("chrome://torlauncher/skin/warning.png"); -} - -/* Ensure that our caution icon is always shown on GTK-based platforms. */ -.torWarning .button-icon { - display: inline !important; -} diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 317dbd7..6f07fdb 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -35,6 +35,8 @@ TorProcessService.prototype = kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", kPrefDefaultBridgeType: "extensions.torlauncher.default_bridge_type", + kWizardProgressPageID: "progress", + kInitialControlConnDelayMS: 25, kMaxControlConnRetryMS: 500, kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. @@ -130,8 +132,8 @@ TorProcessService.prototype = // but that caused hangs upon exit in the Firefox 24.x based browser. // Apparently, Firefox does not like to process socket I/O while // quitting if the browser did not finish starting up (e.g., when - // someone presses the Quit button on our Network Settings or progress - // window during startup). + // someone presses the Quit button on our Network Settings window + // during startup). TorLauncherLogger.log(4, "Disconnecting from tor process (pid " + this.mTorProcess.pid + ")"); this.mProtocolSvc.TorCleanupConnection(); @@ -552,16 +554,11 @@ TorProcessService.prototype = // for tor to be restarted. If networking is enabled, show the // progress panel (since bootstrapping is underway). if (!aIsNetworkForceDisabled && this.mObsSvc) - this.mObsSvc.notifyObservers(null, "TorOpenProgressDialog", null); + this.mObsSvc.notifyObservers(null, "TorShowProgressPanel", null); } else if (!this.TorIsBootstrapDone) { - this._openProgressDialog(); - - // Assume that the "Open Settings" button was pressed if Quit was - // not pressed and bootstrapping did not finish. - if (!this.mQuitSoon && !this.TorIsBootstrapDone) - this._openNetworkSettings(true); + this._openNetworkSettings(false, this.kWizardProgressPageID); } // If the user pressed "Quit" within settings/progress, exit. @@ -640,6 +637,7 @@ TorProcessService.prototype = // Notify others that an error will be displayed. this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); +// TODO2017: "route" error message to wizard or settings dialog if it is open var msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); TorLauncherUtil.showAlert(null, msg + "\n\n" + details); } @@ -722,7 +720,8 @@ TorProcessService.prototype = var winFeatures = "chrome,dialog=yes,modal,all"; var argsArray = this._createOpenWindowArgsArray(aIsInitialBootstrap, aStartAtWizardPanel); - var url = (aIsInitialBootstrap) ? kWizardURL : kSettingsURL; + let isProgress = (this.kWizardProgressPageID == aStartAtWizardPanel); + let url = (aIsInitialBootstrap || isProgress) ? kWizardURL : kSettingsURL; wwSvc.openWindow(null, url, "_blank", winFeatures, argsArray); }, @@ -733,16 +732,6 @@ TorProcessService.prototype = return wm.getMostRecentWindow("TorLauncher:NetworkSettings"); }, - _openProgressDialog: function() - { - var chromeURL = "chrome://torlauncher/content/progress.xul"; - var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] - .getService(Ci.nsIWindowWatcher); - var winFeatures = "chrome,dialog=yes,modal,all"; - var argsArray = this._createOpenWindowArgsArray(true); - wwSvc.openWindow(null, chromeURL, "_blank", winFeatures, argsArray); - }, - _createOpenWindowArgsArray: function(aArg1, aArg2) { var argsArray = Cc["@mozilla.org/array;1"]

1 0

[tor-launcher/master] Bug 23262: implement integrated progress bar (Part 2)
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 803bf1178bc8c66a7166309abd680eef4af7a548 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 31 10:06:32 2017 -0400 Bug 23262: implement integrated progress bar (Part 2) Improve UX by greatly reducing the use of modal alert dialogs. In most cases errors are now displayed using one of three techniques: 1. Via an overlaid error panel. 2. As a message on the progress panel (with a Reconfigure button). 3. On a standalone error page within the setup wizard. Move "Restart Tor" to a separate panel. Fix a problem where showAlert() would fail to display an alert: do not try to use a hidden window as the parent for the alert. Add a showOrHideElemById() utility function and use it. --- src/chrome/content/localePicker.xul | 4 +- src/chrome/content/network-settings-overlay.xul | 30 ++- src/chrome/content/network-settings-wizard.xul | 35 +-- src/chrome/content/network-settings.js | 328 +++++++++++++++++------- src/chrome/content/network-settings.xul | 94 +++---- src/chrome/skin/network-settings.css | 23 +- src/components/tl-process.js | 61 +++-- src/components/tl-protocol.js | 11 +- src/modules/tl-util.jsm | 34 ++- 9 files changed, 434 insertions(+), 186 deletions(-) diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xul index 2017baa..6030468 100644 --- a/src/chrome/content/localePicker.xul +++ b/src/chrome/content/localePicker.xul @@ -29,7 +29,7 @@ <hbox class="tbb-header" pack="center"> <image class="tbb-logo"/> </hbox> - <separator /> + <separator/> <vbox> <label class="question">&torlauncher.localePicker.prompt;</label> <separator/> @@ -38,6 +38,6 @@ </wizardpage> <hbox pack="start"> - <label id="forAssistance" /> + <label id="forAssistance"/> </hbox> </wizard> diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index a709f0e..b49dbab 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -83,7 +83,7 @@ <hbox align="center"> <label value="&torsettings.firewall.allowedPorts;" control="firewallAllowedPorts"/> - <textbox id="firewallAllowedPorts" value="80,443" /> + <textbox id="firewallAllowedPorts" value="80,443"/> </hbox> </groupbox> @@ -136,13 +136,37 @@ <description id="progressPleaseWait" hidden="true">&torprogress.pleaseWait;</description> <progressmeter id="progressMeter" mode="determined" value="0"/> - <description id="progressDesc"/> + <description id="progressDesc" errorElemId="message"/> + <label id="progressReconfigureLabel" hidden="true" + value="&torsettings.reconfigTor;"/> </vbox> </vbox> + <vbox id="restartContent"> + <hbox pack="center"> + <description id="restartPanelMessage" flex="1"/> + </hbox> + <separator/> + <hbox pack="center"> + <button id="restartTorButton" label="&torsettings.restartTor;" + oncommand="onRestartTor()"/> + </hbox> + </vbox> + + <vbox id="errorOverlayContent"> + <hbox pack="center"> + <description errorElemId="message" flex="1"/> + </hbox> + <separator/> + <hbox pack="center"> + <button errorElemId="dismissButton" default="true" + oncommand="onDismissErrorOverlay()"/> + </hbox> + </vbox> + <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" onclick="closeCopyLogFeedbackPanel()"> - <description flex="1" /> + <description flex="1"/> </panel> </overlay> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 97e846c..86c2e01 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -57,6 +57,10 @@ <separator/> <vbox id="proxySettings"/> </vbox> + <vbox id="configErrorOverlay" class="messagePanel" pack="center" + hidden="true"> + <vbox id="errorOverlayContent"/> + </vbox> </stack> </wizardpage> @@ -68,36 +72,37 @@ <vbox id="progressContent"/> </wizardpage> - <wizardpage pageid="startingTor" next="notUsed" torShowNavButtons="false"> + <wizardpage pageid="startingTor" class="messagePanel" next="notUsed" + torShowNavButtons="false"> <hbox class="tbb-header" pack="center"> <image class="tbb-logo"/> </hbox> - <spring flex="1" /> + <spring flex="1"/> <hbox> - <spring flex="1" /> + <spring flex="1"/> <description>&torsettings.startingTor;</description> - <spring flex="1" /> + <spring flex="1"/> </hbox> - <spring flex="1" /> + <spring flex="1"/> </wizardpage> - <wizardpage pageid="restartPanel" next="notUsed" + <wizardpage pageid="restartPanel" class="messagePanel" next="notUsed" pack="center" torShowNavButtons="false" onextra2="onCopyLog();"> <vbox id="restartContent"/> </wizardpage> - <wizardpage pageid="errorPanel" next="notUsed" + <wizardpage pageid="errorPanel" class="messagePanel" next="notUsed" torShowNavButtons="false" onextra2="onCopyLog();"> - <spring flex="1" /> + <spring flex="1"/> <hbox pack="center"> <description errorElemId="message" flex="1"/> </hbox> <separator/> <hbox pack="center"> <button errorElemId="reconfigButton" label="&torsettings.reconfigTor;" - hidden="true" oncommand="onWizardReconfig()" /> + hidden="true" oncommand="onWizardReconfig()"/> </hbox> - <spring flex="1" /> + <spring flex="1"/> </wizardpage> <wizardpage pageid="discardSettings" next="notUsed" torShowNavButtons="false" @@ -105,7 +110,7 @@ <hbox class="tbb-header" pack="center"> <image class="tbb-logo"/> </hbox> - <spring flex="1" /> + <spring flex="1"/> <hbox pack="center"> <description flex="1">&torsettings.discardSettings.prompt;</description> </hbox> @@ -114,9 +119,9 @@ <button id="discardSettingsGoBack" oncommand="showPanel();"/> <separator/> <button label="&torsettings.discardSettings.proceed;" - oncommand="removeSettingsAndConnect()" /> + oncommand="removeSettingsAndConnect()"/> </hbox> - <spring flex="1" /> + <spring flex="1"/> </wizardpage> <wizardpage class="help" pageid="helpPanel" next="notUsed" @@ -126,7 +131,7 @@ </wizardpage> <hbox pack="start"> - <label id="forAssistance" /> + <label id="forAssistance"/> </hbox> - <panel id="copyLogFeedbackPanel" /> + <panel id="copyLogFeedbackPanel"/> </wizard> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2237c85..da48bab 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -217,7 +217,7 @@ function initDialog() (status != gTorProcessService.kStatusRunning)) { if (status == gTorProcessService.kStatusExited) - showErrorMessage(true, null, false); + showRestartPanel(); else showStartingTorPanel(); addObserver(kTorProcessReadyTopic); @@ -395,7 +395,7 @@ function onWizardPageShow() setTimeout(function() { showOrHideButton("back", (val == "true"), false); - // The "next" button is only used by the bridgeHelp wizard panel. + // The "next" button is only used by the help wizard panel. let isShowingHelp = (wizardElem.currentPage.pageid == "helpPanel"); showOrHideButton("next", isShowingHelp, false); }, 0); @@ -500,6 +500,8 @@ function onShowProgressPanel() } +// resetProgressNavButtons() is called when moving away from the progress +// panel entirely, and when an error is displayed within the progress panel. function resetProgressNavButtons() { if (gShowProgressTimer) @@ -521,6 +523,11 @@ var gObserver = { (kTorLogHasWarnOrErrTopic == aTopic)) { showCopyLogButton(true); + if (kTorBootstrapErrorTopic == aTopic) + { + stopTorBootstrap(); + showErrorMessage(aSubject.wrappedJSObject, true); + } return; } @@ -534,12 +541,12 @@ var gObserver = { { removeObserver(kTorProcessReadyTopic); removeObserver(kTorProcessDidNotStartTopic); - showErrorMessage(false, aData, false); + showErrorMessage(aSubject.wrappedJSObject, false); } else if (kTorProcessExitedTopic == aTopic) { removeObserver(kTorProcessExitedTopic); - showErrorMessage(true, null, false); + showRestartPanel(); } else if (kTorShowProgressPanelTopic == aTopic) { @@ -639,17 +646,11 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showErrorMessage(false, null, false); - - setTimeout(function() - { - let details = TorLauncherUtil.getLocalizedString( - "ensure_tor_is_running"); - let s = TorLauncherUtil.getFormattedLocalizedString( - "failed_to_get_settings", [details], 1); - TorLauncherUtil.showAlert(window, s); - close(); - }, 0); + let details = TorLauncherUtil.getLocalizedString("ensure_tor_is_running"); + let s = TorLauncherUtil.getFormattedLocalizedString( + "failed_to_get_settings", [details], 1); + let errorObj = { message: s }; + showErrorMessage(errorObj, false); } TorLauncherLogger.log(2, "readTorSettings done; didSucceed: " + didSucceed); @@ -728,49 +729,148 @@ function showStartingTorPanel() } -function showErrorMessage(aTorExited, aErrorMsg, aShowReconfigButton) +function showErrorMessage(aErrorObj, aShowReconfigButton) { - var elem = document.getElementById("errorPanelMessage"); - var btn = document.getElementById("restartTorButton"); - if (aTorExited) + if (aErrorObj && aErrorObj.handled) + return; + + // Determine our strategy for displaying this error message. + const kShowErrorInErrorPanel = 1; + const kShowErrorUsingErrorOverlay = 2; + const kShowErrorInProgressPanel = 3; + let errorStrategy = kShowErrorInErrorPanel; + + let wizard = getWizard(); + if (isShowingProgress() && aShowReconfigButton) + errorStrategy = kShowErrorInProgressPanel; + else if (!wizard || (wizard.currentPage.pageid == "configureSettings")) + errorStrategy = kShowErrorUsingErrorOverlay; + + let errorContainer; + if (errorStrategy == kShowErrorUsingErrorOverlay) + errorContainer = getErrorOverlay(); + else if (errorStrategy == kShowErrorInProgressPanel) + errorContainer = document.getElementById("progressContent"); + else + errorContainer = wizard.getPageById("errorPanel"); + if (!errorContainer) + return; + + let messageElem = getFirstElementByErrorOverlayID(errorContainer, "message"); + if (messageElem) { - // Show "Tor exited" message and "Restart Tor" button. - aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited") - + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); + let msg = ""; + if (aErrorObj && aErrorObj.message) + { + msg = aErrorObj.message; + if (aErrorObj.details) + msg += "\n\n" + aErrorObj.details; + aErrorObj.handled = true; + } + messageElem.textContent = msg; + } - if (btn) - btn.removeAttribute("hidden"); - if (elem) - elem.style.textAlign = "start"; + if (errorStrategy == kShowErrorUsingErrorOverlay) + { + showOrHideDialogButtons(false); + + let dismissBtn = getFirstElementByErrorOverlayID(errorContainer, + "dismissButton"); + let bundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService) + .createBundle("chrome://global/locale/commonDialogs.properties"); + dismissBtn.label = bundle.GetStringFromName("OK"); + errorContainer.removeAttribute("hidden"); + if (dismissBtn) + dismissBtn.focus(); } - else + else if (errorStrategy == kShowErrorInProgressPanel) { - if (btn) - btn.setAttribute("hidden", true); - if (elem) - elem.style.textAlign = "center"; + // In this case, we always show a "Reconfigure" button. + errorContainer.setAttribute("isShowingReconfigure", "true"); + let btnLabel = document.getElementById("progressReconfigureLabel"); + if (wizard) + { + showOrHideElemById("progressPleaseWait", false); + resetProgressNavButtons(); // Show Quit and clear "show progress" timer. + overrideButtonLabel("finish", btnLabel.value); + } + else if (btnLabel) + { + // Network Settings window (non-wizard) case. + overrideButtonLabel("cancel", btnLabel.value); + } } + else // if (errorStrategy == kShowErrorInErrorPanel) + { + let reconfigBtn = getFirstElementByErrorOverlayID(errorContainer, + "reconfigButton"); + if (reconfigBtn) + { + if (aShowReconfigButton) + reconfigBtn.removeAttribute("hidden"); + else + reconfigBtn.setAttribute("hidden", true); + } + + // Navigate to the wizard error panel. + showPanel("errorPanel"); + } + + let haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || + gProtocolSvc.TorLogHasWarnOrErr) + showCopyLogButton(haveErrorOrWarning); +} + + +function getErrorOverlay() +{ + return document.getElementById(getWizard() ? "configErrorOverlay" + : "errorOverlay"); +} - if (elem) - elem.textContent = (aErrorMsg) ? aErrorMsg : ""; - let reconfigBtn = document.getElementById("reconfigTorButton"); - if (reconfigBtn) +function getFirstElementByErrorOverlayID(aContainer, aID) +{ + let nodeList = aContainer.getElementsByAttribute("errorElemId", aID); + return (nodeList && (nodeList.length > 0)) ? nodeList[0] : undefined; +} + + +function showRestartPanel() +{ + let elem = document.getElementById("restartPanelMessage"); + if (elem) { - if (aShowReconfigButton) - reconfigBtn.removeAttribute("hidden"); - else - reconfigBtn.setAttribute("hidden", true); + elem.textContent = TorLauncherUtil.getLocalizedString("tor_exited") + + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); } - showPanel("errorPanel"); + showPanel("restartPanel"); - var haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || + let haveErrorOrWarning = (gTorProcessService.TorBootstrapErrorOccurred || gProtocolSvc.TorLogHasWarnOrErr) showCopyLogButton(haveErrorOrWarning); } +function onDismissErrorOverlay() +{ + let errorOverlay = getErrorOverlay(); + if (errorOverlay) + errorOverlay.setAttribute("hidden", true); + + showOrHideDialogButtons(true); +} + + +function isShowingErrorOverlay() +{ + let errorOverlay = getErrorOverlay(); + return errorOverlay && !errorOverlay.hasAttribute("hidden"); +} + + function showCopyLogButton(aHaveErrorOrWarning) { let copyLogBtn = document.documentElement.getButton("extra2"); @@ -809,6 +909,29 @@ function restoreCopyLogVisibility() } +// Show or hide all of the buttons that are in the "footer" of the wizard or +// Network Settings window. +function showOrHideDialogButtons(aShow) +{ + let buttonContainer = document.getAnonymousElementByAttribute( + document.documentElement, "anonid", "buttons"); + if (!buttonContainer) + { + // The wizard uses "Buttons" (capital 'B'). + buttonContainer = document.getAnonymousElementByAttribute( + document.documentElement, "anonid", "Buttons"); + } + + if (buttonContainer) + { + if (aShow) + buttonContainer.removeAttribute("hidden"); + else + buttonContainer.hidden = true; + } +} + + function showOrHideButton(aID, aShow, aFocus) { var btn = setButtonAttr(aID, "hidden", !aShow); @@ -843,6 +966,19 @@ function setButtonAttr(aID, aAttr, aValue) } +function showOrHideElemById(aID, aShow) +{ + let elem = document.getElementById(aID); + if (elem) + { + if (aShow) + elem.removeAttribute("hidden"); + else + elem.setAttribute("hidden", true); + } +} + + // Sets or removes aAttr for aID as well as optional aID+"Label" element. function setBoolAttrForElemWithLabel(aID, aAttr, aValue) { @@ -1010,9 +1146,22 @@ function onCancel() return false; } + if (isShowingErrorOverlay()) + { + onDismissErrorOverlay(); + return false; + } + + let wizard = getWizard(); + if (!wizard && isShowingProgress()) + { + onProgressCancelOrReconfigure(undefined); + return false; + } + // If this is a wizard (initial config or locale picker), the cancel // button is "Quit" - if (getWizard()) + if (wizard) { try { @@ -1031,11 +1180,15 @@ function onCancel() function onWizardFinish() { + if (isShowingErrorOverlay()) + { + onDismissErrorOverlay(); + return false; + } + if (isShowingProgress()) { - // When the progress panel is showing, the finish button is "Cancel" - stopTorBootstrap(); - getWizard().rewind(); + onProgressCancelOrReconfigure(getWizard()); return false; } else @@ -1053,10 +1206,39 @@ function onNetworkSettingsFinish() return false; } + if (isShowingErrorOverlay()) + { + onDismissErrorOverlay(); + return false; + } + return applySettings(false); } +// When the progress panel is open, cancel stops bootstrapping... unless +// we are showing an error, in which case the action is "Reconfigure". +function onProgressCancelOrReconfigure(aWizard) +{ + let progressContent = document.getElementById("progressContent"); + if (!progressContent || + !progressContent.hasAttribute("isShowingReconfigure")) + { + stopTorBootstrap(); + } + + if (aWizard) + { + aWizard.rewind(); + } + else + { + restoreButtonLabel("cancel"); + showPanel(undefined); // return to the Network Settings main panel. + } +} + + function onCopyLog() { // Copy tor log messages to the system clipboard. @@ -1107,12 +1289,8 @@ function onOpenHelp(aHelpContentID) if (getWizard()) { showOrHideButton("cancel", false, false); - showOrHideButton("back", false, false); overrideButtonLabelWithKey("next", "done"); - showOrHideButton("next", true, false); - let forAssistance = document.getElementById("forAssistance"); - if (forAssistance) - forAssistance.setAttribute("hidden", true); + showOrHideElemById("forAssistance", false); } else { @@ -1133,12 +1311,8 @@ function closeHelp() if (wizardElem) { showOrHideButton("cancel", true, false); - showOrHideButton("back", true, false); - showOrHideButton("next", false, false); restoreButtonLabel("next"); - var forAssistance = document.getElementById("forAssistance"); - if (forAssistance) - forAssistance.removeAttribute("hidden"); + showOrHideElemById("forAssistance", true); helpPanel = wizardElem.currentPage; } else @@ -1312,12 +1486,7 @@ function initBridgeSettings() setElemValue(kUseBridgesCheckbox, useBridges); - if (!canUseDefaultBridges) - { - var radioGroup = document.getElementById("bridgeTypeRadioGroup"); - if (radioGroup) - radioGroup.setAttribute("hidden", true); - } + showOrHideElemById("bridgeTypeRadioGroup", canUseDefaultBridges); let radioID = (useDefault) ? "bridgeRadioDefault" : "bridgeRadioCustom"; let radio = document.getElementById(radioID); @@ -1375,22 +1544,6 @@ function useSettings() } showProgressPanel(); - -/* TODO2017: is this needed? Used to be after modal progress dlog was displayed - let wizardElem = getWizard(); - if (!gTorProcessService.TorIsBootstrapDone && wizardElem) - { - // If the user went down the "Configure" path and another error (e.g., - // Tor Exited) has not already been shown, display a generic message - // with a "Reconfigure" button. - let pageid = wizardElem.currentPage.pageid; - if ((pageid != kWizardFirstPageID) && (pageid != "errorPanel")) - { - let msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); - showErrorMessage(false, msg, true); - } - } -*/ } @@ -1416,12 +1569,12 @@ function stopTorBootstrap() function showProgressPanel() { + let progressContent = document.getElementById("progressContent"); + if (progressContent) + progressContent.removeAttribute("isShowingReconfigure"); + if (gIsInitialBootstrap) - { - let pleaseWait = document.getElementById("progressPleaseWait"); - if (pleaseWait) - pleaseWait.removeAttribute("hidden"); - } + showOrHideElemById("progressPleaseWait", true); // Clear the description to avoid displaying any old messages. let desc = document.getElementById("progressDesc"); @@ -1555,7 +1708,7 @@ function isProxyConfigured() function reportValidationError(aStrKey) { - showSaveSettingsAlert(TorLauncherUtil.getLocalizedString(aStrKey)); + showSaveSettingsError(TorLauncherUtil.getLocalizedString(aStrKey)); } @@ -1828,18 +1981,17 @@ function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) } catch (e) {} } - showSaveSettingsAlert(errObj.details); + showSaveSettingsError(errObj.details); } return didSucceed; } -function showSaveSettingsAlert(aDetails) +function showSaveSettingsError(aDetails) { - TorLauncherUtil.showSaveSettingsAlert(window, aDetails); - showOrHideButton("extra2", true, false); - gWizIsCopyLogBtnShowing = true; + let msg = TorLauncherUtil.getSaveSettingsErrorMessage(aDetails); + showErrorMessage({ message: msg }, true); } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 1b5ced0..707990a 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -5,7 +5,7 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> @@ -29,53 +29,53 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> - <deck id="deck" onselect="onDeckSelect();"> - <vbox id="settings"> - <vbox id="bridgeSettings"/> - <separator orient="horizontal" class="thin"/> - <vbox id="proxySettings"/> + <stack flex="1"> + <vbox> + <deck id="deck" onselect="onDeckSelect();"> + <vbox id="settings"> + <vbox id="bridgeSettings"/> + <separator orient="horizontal" class="thin"/> + <vbox id="proxySettings"/> + <vbox> + <checkbox id="useFirewallPorts" + groupboxID="firewallSpecificSettings" + label="&torsettings.firewall.checkbox;" + oncommand="toggleElemUI(this)"/> + <groupbox id="firewallSpecificSettings"/> + </vbox> + </vbox> - <vbox> - <checkbox id="useFirewallPorts" groupboxID="firewallSpecificSettings" - label="&torsettings.firewall.checkbox;" - oncommand="toggleElemUI(this)"/> - <groupbox id="firewallSpecificSettings" /> - </vbox> - </vbox> - <vbox id="startingTor"> - <spring flex="1" /> - <hbox> - <spring flex="1" /> - <description>&torsettings.startingTor;</description> - <spring flex="1" /> - </hbox> - <spring flex="1" /> - </vbox> - <vbox id="progressPanel"> - <vbox id="progressContent"/> - </vbox> - <vbox id="errorPanel"> - <spring flex="1" /> - <hbox> - <spring flex="1" /> - <description id="errorPanelMessage" flex="1" /> - <spring flex="1" /> - </hbox> - <separator/> - <hbox> - <spring flex="1" /> - <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true" - oncommand="onRestartTor()" /> - <spring flex="1" /> - </hbox> - <spring flex="1" /> + <vbox id="startingTor" class="messagePanel"> + <spring flex="1"/> + <hbox> + <spring flex="1"/> + <description>&torsettings.startingTor;</description> + <spring flex="1"/> + </hbox> + <spring flex="1"/> + </vbox> + + <vbox id="progressPanel"> + <vbox id="progressContent"/> + </vbox> + + <vbox id="helpPanel" class="help"> + <vbox id="bridgeHelpContent" hidden="true"/> + <vbox id="proxyHelpContent" hidden="true"/> + </vbox> + + <vbox id="restartPanel" class="messagePanel" pack="center"> + <vbox id="restartContent"/> + </vbox> + </deck> + + <spring flex="1"/> + <label id="forAssistance"/> + <panel id="copyLogFeedbackPanel"/> </vbox> - <vbox id="helpPanel" class="help"> - <vbox id="bridgeHelpContent" hidden="true"/> - <vbox id="proxyHelpContent" hidden="true"/> + + <vbox id="errorOverlay" class="messagePanel" pack="center" hidden="true"> + <vbox id="errorOverlayContent"/> </vbox> - </deck> - <spring flex="1" /> - <label id="forAssistance" /> - <panel id="copyLogFeedbackPanel" /> + </stack> </dialog> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 34b1b3e..259e38d 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -157,16 +157,31 @@ wizard.os-mac #bridgeList { } } -wizardpage[pageid="startingTor"] description, -wizardpage[pageid="errorPanel"] description, -#errorPanel description, -#startingTor description { +#progressContent[isShowingReconfigure] description, +.messagePanel description { + margin: 20px; font-size: 120%; font-weight: bold; white-space: pre-wrap; text-align: center; } +wizardpage[pageid="restartPanel"] description, +#restartPanel description { + text-align: start; +} + +#errorOverlayContent { + margin: 50px; + min-height: 12em; + background-color: rgba(251,251,251,1.0); + box-shadow: 0px 0px 50px rgba(0,0,0,0.9); +} + +#errorOverlayContent button[errorElemId="dismissButton"] { + margin-bottom: 20px; +} + #restartButton { margin-top: 20px; } diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 6f07fdb..53c9919 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -50,6 +50,9 @@ TorProcessService.prototype = kDefaultBridgesStatus_InUse: 1, kDefaultBridgesStatus_BadConfig: 2, + kTorProcessDidNotStartTopic: "TorProcessDidNotStart", + kTorBootstrapErrorTopic: "TorBootstrapError", + // nsISupports implementation. QueryInterface: function(aIID) { @@ -227,9 +230,8 @@ TorProcessService.prototype = else if ((Date.now() - this.mTorProcessStartTime) > this.kControlConnTimeoutMS) { - var s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); - this.mObsSvc.notifyObservers(null, "TorProcessDidNotStart", s); - TorLauncherUtil.showAlert(null, s); + let s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); + this._notifyUserOfError(s, null, this.kTorProcessDidNotStartTopic); TorLauncherLogger.log(4, s); } else @@ -373,7 +375,7 @@ TorProcessService.prototype = var key = "unable_to_start_tor"; var err = TorLauncherUtil.getFormattedLocalizedString(key, [details], 1); - TorLauncherUtil.showAlert(null, err); + this._notifyUserOfError(err, null, this.kTorProcessDidNotStartTopic); return; } @@ -461,7 +463,7 @@ TorProcessService.prototype = var key = "error_bridge_bad_default_type"; var err = TorLauncherUtil.getFormattedLocalizedString(key, [defaultBridgeType], 1); - TorLauncherUtil.showAlert(null, err); + this._notifyUserOfError(err, null, null); } if (aForceDisableNetwork || TorLauncherUtil.shouldShowNetworkSettings || @@ -506,7 +508,7 @@ TorProcessService.prototype = { this.mTorProcessStatus = this.kStatusExited; var s = TorLauncherUtil.getLocalizedString("tor_failed_to_start"); - TorLauncherUtil.showAlert(null, s); + this._notifyUserOfError(s, null, this.kTorProcessDidNotStartTopic); TorLauncherLogger.safelog(4, "_startTor error: ", e); } }, // _startTor() @@ -569,7 +571,7 @@ TorProcessService.prototype = { this.mTorProcessStatus = this.kStatusExited; var s = TorLauncherUtil.getLocalizedString("tor_control_failed"); - TorLauncherUtil.showAlert(null, s); + this._notifyUserOfError(s, null, null); TorLauncherLogger.safelog(4, "_controlTor error: ", e); } }, // controlTor() @@ -619,11 +621,11 @@ TorProcessService.prototype = { this.mBootstrapErrorOccurred = true; TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true); - var phase = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, + let phase = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, "TAG"); - var reason = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, + let reason = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, "REASON"); - var details = TorLauncherUtil.getFormattedLocalizedString( + let details = TorLauncherUtil.getFormattedLocalizedString( "tor_bootstrap_failed_details", [phase, reason], 2); TorLauncherLogger.log(5, "Tor bootstrap error: [" + aStatusObj.TAG + "/" + aStatusObj.REASON + "] " + details); @@ -634,12 +636,8 @@ TorProcessService.prototype = this.mLastTorWarningPhase = aStatusObj.TAG; this.mLastTorWarningReason = aStatusObj.REASON; - // Notify others that an error will be displayed. - this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); - -// TODO2017: "route" error message to wizard or settings dialog if it is open - var msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); - TorLauncherUtil.showAlert(null, msg + "\n\n" + details); + let msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); + this._notifyUserOfError(msg, details, this.kTorBootstrapErrorTopic); } } } @@ -684,9 +682,14 @@ TorProcessService.prototype = } if (didSucceed) + { this.mProtocolSvc.TorSendCommand("SAVECONF"); + } else - TorLauncherUtil.showSaveSettingsAlert(null, errObj.details); + { + let msg = TorLauncherUtil.getSaveSettingsErrorMessage(errObj.details); + this._notifyUserOfError(msg, null, null); + } }, _openLocalePicker: function() @@ -752,6 +755,30 @@ TorProcessService.prototype = return argsArray; }, + _notifyUserOfError: function(aMessage, aDetails, aNotifyTopic) + { + let errorObj = { handled: false, message: aMessage }; + if (aDetails) + errorObj.details = aDetails; + + if (aNotifyTopic) + { + // Give other code an opportunity to handle this error, e.g., if the + // network settings window is open, errors are displayed using an + // overlaid XUL element. + errorObj.wrappedJSObject = errorObj; + this.mObsSvc.notifyObservers(errorObj, aNotifyTopic, null); + } + + if (!errorObj.handled) + { + let msg = aMessage; + if (aDetails) + msg += "\n\n" + aDetails; + TorLauncherUtil.showAlert(null, msg); + } + }, + _getpid: function() { // Use nsIXULRuntime.processID if it is available. diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d6323f4..68c6530 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -465,7 +465,7 @@ TorProtocolService.prototype = // 250 OK reply = this._parseReply(cmd, key, reply); if (reply.lineArray) - this._parseBootstrapStatus(reply.lineArray[0]); + this._parseBootstrapStatus(reply.lineArray[0], true); }, // If successful, returns a JS object with these fields: @@ -479,8 +479,10 @@ TorProtocolService.prototype = // status.RECOMMENDATION -- string (optional) // status.HOSTADDR -- string (optional) // A "TorBootstrapStatus" notification is also sent. + // If aSuppressErrors is true, errors are ignored. This is used when we + // are handling the response to a "GETINFO status/bootstrap-phase" command. // Returns null upon failure. - _parseBootstrapStatus: function(aStatusMsg) + _parseBootstrapStatus: function(aStatusMsg, aSuppressErrors) { if (!aStatusMsg || (0 == aStatusMsg.length)) return null; @@ -531,7 +533,8 @@ TorProtocolService.prototype = } // this._dumpObj("BootstrapStatus", statusObj); - statusObj._errorOccurred = (("NOTICE" != statusObj.TYPE) && + statusObj._errorOccurred = (!aSuppressErrors && + ("NOTICE" != statusObj.TYPE) && ("warn" == statusObj.RECOMMENDATION)); // Notify observers. @@ -1519,7 +1522,7 @@ TorProtocolService.prototype = } break; case "STATUS_CLIENT": - this._parseBootstrapStatus(msg); + this._parseBootstrapStatus(msg, false); break; default: this._dumpObj(eventType + "_event", aReply); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 2e45fd1..bb84bdf 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -50,9 +50,18 @@ let TorLauncherUtil = // Public { var wm = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Ci.nsIWindowMediator); - aParentWindow = wm.getMostRecentWindow("TorLauncher:NetworkSettings"); - if (!aParentWindow) - aParentWindow = wm.getMostRecentWindow("navigator:browser"); + let settingsWindow = + wm.getMostRecentWindow("TorLauncher:NetworkSettings"); + if (TLUtilInternal._isWindowVisible(settingsWindow)) + { + aParentWindow = settingsWindow; + } + else + { + let browserWindow = wm.getMostRecentWindow("navigator:browser"); + if (TLUtilInternal._isWindowVisible(browserWindow)) + aParentWindow = browserWindow; + } } var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"] @@ -106,14 +115,13 @@ let TorLauncherUtil = // Public return false; }, - showSaveSettingsAlert: function(aParentWindow, aDetails) + getSaveSettingsErrorMessage: function(aDetails) { if (!aDetails) aDetails = TorLauncherUtil.getLocalizedString("ensure_tor_is_running"); - var s = TorLauncherUtil.getFormattedLocalizedString( + return TorLauncherUtil.getFormattedLocalizedString( "failed_to_save_settings", [aDetails], 1); - this.showAlert(aParentWindow, s); }, // Localized Strings @@ -846,6 +854,20 @@ let TLUtilInternal = // Private return null; } }, + + _isWindowVisible: function(aWindow) + { + if (!aWindow) + return false; + + try { + let winUtils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils); + return winUtils.isParentWindowMainWidgetVisible; + } catch(e) {} + + return false; + }, };

1 0

[tor-launcher/master] Version bump (0.2.13)
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 019a6b84de61541c5a315e4da876e662341075d1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 07:32:27 2017 +0000 Version bump (0.2.13) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a045040..ae44aa6 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.12.3</em:version> + <em:version>0.2.13</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-browser-build/master] Bug 23561: Use a 32bit nsis in the Windows 64 build
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 51e32622701c743727d9903c67e38579c1bc7b8b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 27 21:57:43 2017 +0200 Bug 23561: Use a 32bit nsis in the Windows 64 build --- projects/tor-browser/config | 3 +++ rbm.conf | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index a777a98..54a0e9e 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,6 +67,9 @@ input_files: enable: '[% c("var/osx") %]' - project: nsis name: nsis + target: + - '[% c("var/channel") %]' + - torbrowser-windows-i686 enable: '[% c("var/windows") %]' - name: tbb-windows-installer project: tbb-windows-installer diff --git a/rbm.conf b/rbm.conf index 83c2086..79d7055 100644 --- a/rbm.conf +++ b/rbm.conf @@ -106,12 +106,15 @@ targets: release: var: release: 1 + channel: release alpha: var: - alpha:1 + alpha: 1 + channel: alpha nightly: var: nightly: 1 + channel: nightly torbrowser_version: tbb-nightly torbrowser-testbuild:

1 0

[tor-browser-build/master] Bug 23231: Disable STL Wrappers for Win64 build for now
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit b66d7da8eb4989593792381a8f3ac40c1ad38fde Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 07:58:42 2017 +0000 Bug 23231: Disable STL Wrappers for Win64 build for now Due to bug https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 we disable STL wrappers for now. For some reason only 64bit Windows builds are affected. Thus we restrict the disabling only to them leaving all other targets unaffected. --- projects/firefox/STL_win64.patch | 24 ++++++++++++++++++++++++ projects/firefox/build | 4 ++++ projects/firefox/config | 2 ++ 3 files changed, 30 insertions(+) diff --git a/projects/firefox/STL_win64.patch b/projects/firefox/STL_win64.patch new file mode 100644 index 0000000..e528905 --- /dev/null +++ b/projects/firefox/STL_win64.patch @@ -0,0 +1,24 @@ +From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Sat, 12 Aug 2017 22:00:13 +0200 +Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows + +Workaround for: +https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 +--- + old-configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/old-configure.in b/old-configure.in +index f5a2f05..e247551 100644 +--- a/old-configure.in ++++ b/old-configure.in +@@ -1338,7 +1338,7 @@ MOZ_CXX11 + AC_LANG_C + + case "${OS_TARGET}" in +-Darwin) ++WINNT|Darwin) + ;; + *) + STL_FLAGS="-I${DIST}/stl_wrappers" diff --git a/projects/firefox/build b/projects/firefox/build index f6a7654..13142e0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -86,6 +86,10 @@ fi export CC='gcc -m32' [% END -%] +[% IF c("var/windows-x86_64") %] + patch -p1 < $rootdir/STL_win64.patch +[% END -%] + rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" diff --git a/projects/firefox/config b/projects/firefox/config index f508250..055fe57 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -93,3 +93,5 @@ input_files: - project: yasm name: yasm enable: '[% c("var/windows") %]' + - filename: STL_win64.patch + enable: '[% c("var/windows-x86_64") %]'

1 0

[tor-browser-build/master] Revert "Applying patch for bug 24052"
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 35392120ea19c1e22cc352e6af5962a676ed5469 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 07:48:34 2017 +0000 Revert "Applying patch for bug 24052" This reverts commit e0e6bfd780cdbb529aecc57699a8f410f667c62f. --- projects/firefox/24052.patch | 57 -------------------------------------------- projects/firefox/build | 4 ---- projects/firefox/config | 2 -- 3 files changed, 63 deletions(-) diff --git a/projects/firefox/24052.patch b/projects/firefox/24052.patch deleted file mode 100644 index a418a97..0000000 --- a/projects/firefox/24052.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c5d1bb91512f9dd20e0f54c6f3e6979588cf9f56 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Fri, 27 Oct 2017 20:40:57 +0000 -Subject: [PATCH] Bug 24052: Streamline handling of file:// resources - -We should make sure restrictions regarding loading of file:// resources -are adhered to more strictly, at least on *nix platforms. - -This is a workaround for -https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. - -diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp -index 0da79c18ae41..0cc67da7b18f 100644 ---- a/netwerk/base/nsIOService.cpp -+++ b/netwerk/base/nsIOService.cpp -@@ -789,12 +789,20 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, - // if calling newChannel2() fails we try to fall back to - // creating a new channel by calling NewChannel(). - if (NS_FAILED(rv)) { -+#ifdef XP_UNIX -+ if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) { -+ return rv; -+ } else { -+#endif - rv = handler->NewChannel(aURI, getter_AddRefs(channel)); - NS_ENSURE_SUCCESS(rv, rv); - // The protocol handler does not implement NewChannel2, so - // maybe we need to wrap the channel (see comment in MaybeWrap - // function). - channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo); -+#ifdef XP_UNIX -+ } -+#endif - } - } - -diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp -index e55cb9d47460..c24c928b6f02 100644 ---- a/netwerk/protocol/file/nsFileProtocolHandler.cpp -+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp -@@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri, - nsILoadInfo* aLoadInfo, - nsIChannel** result) - { -+#ifdef XP_UNIX -+ if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) { -+ if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) { -+ return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; -+ } -+ } -+#endif - nsFileChannel *chan = new nsFileChannel(uri); - if (!chan) - return NS_ERROR_OUT_OF_MEMORY; --- -2.14.2 - diff --git a/projects/firefox/build b/projects/firefox/build index 00ab612..f6a7654 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -86,10 +86,6 @@ fi export CC='gcc -m32' [% END -%] -[% IF c("var/linux") || c("var/osx") %] - patch -p1 < $rootdir/24052.patch -[% END -%] - rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" diff --git a/projects/firefox/config b/projects/firefox/config index 74e95db..f508250 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,8 +81,6 @@ input_files: enable: '[% c("var/linux") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - - filename: 24052.patch - enable: '[% c("var/linux") || c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]'

1 0

[tor-browser-build/master] Fold in stable changelog and update 7.5a7 release date
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 4035a8c3b8615df5e7f52b2058791330106d712d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 07:51:19 2017 +0000 Fold in stable changelog and update 7.5a7 release date --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e1c70f2..30b3cf9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,10 @@ -Tor Browser 7.5a7 -- November 6 2017 +Tor Browser 7.5a7 -- November 4 2017 + * OS X + * Bug 24052: Streamline handling of file:// resources + * Linux + * Bug 24052: Streamline handling of file:// resources + +Tor Browser 7.0.9 -- November 3 2017 * OS X * Bug 24052: Streamline handling of file:// resources * Linux

1 0

[tor-browser-build/master] Revert "Apply follow-up patch for bug 24052"
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit b953a43d9349d65a0e5187a8294dc567dd7b6be3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 07:48:23 2017 +0000 Revert "Apply follow-up patch for bug 24052" This reverts commit 409a6951d0c081905fc44f12e5b2359032178f18. --- projects/firefox/24052_2.patch | 29 ----------------------------- projects/firefox/build | 1 - projects/firefox/config | 2 -- 3 files changed, 32 deletions(-) diff --git a/projects/firefox/24052_2.patch b/projects/firefox/24052_2.patch deleted file mode 100644 index 0060428..0000000 --- a/projects/firefox/24052_2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e Mon Sep 17 00:00:00 2001 -From: Arthur Edelstein <arthuredelstein(a)gmail.com> -Date: Wed, 1 Nov 2017 02:33:18 -0700 -Subject: [PATCH] Bug 24052: Handle redirects by blocking them early - -This is the second part of the workaround for -https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. - -diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 0e570e8cb57d..b38be48bf0c9 100644 ---- a/netwerk/protocol/http/nsHttpChannel.cpp -+++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) - return NS_ERROR_CORRUPTED_CONTENT; - } - -+ bool isRedirectToFile = false; -+ rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); -+ if (!NS_FAILED(rv) && isRedirectToFile) { -+ LOG(("Attempted to redirect from a remote page to a file:// URI.")); -+ return NS_ERROR_FAILURE; -+ } -+ - if (mApplicationCache) { - // if we are redirected to a different origin check if there is a fallback - // cache entry to fall back to. we don't care about file strict --- -2.14.2 - diff --git a/projects/firefox/build b/projects/firefox/build index e506b56..00ab612 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -88,7 +88,6 @@ fi [% IF c("var/linux") || c("var/osx") %] patch -p1 < $rootdir/24052.patch - patch -p1 < $rootdir/24052_2.patch [% END -%] rm -f configure diff --git a/projects/firefox/config b/projects/firefox/config index f7a143d..74e95db 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -83,8 +83,6 @@ input_files: enable: '[% c("var/osx") %]' - filename: 24052.patch enable: '[% c("var/linux") || c("var/osx") %]' - - filename: 24052_2.patch - enable: '[% c("var/linux") || c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]'

1 0

[tor-browser-build/master] Bug 24060: add x86_64 version of msvcr100.dll
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 2393932708eb8090ee17374a78ad7d0c6c31c564 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 7 20:37:46 2017 +0100 Bug 24060: add x86_64 version of msvcr100.dll --- projects/firefox/build | 3 +++ projects/firefox/config | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 3806fdf..e506b56 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -120,6 +120,9 @@ make -C obj-* package INNER_MAKE_PACKAGE=true rm -f $distdir/Browser/*.chk [% END %] +[% IF c("var/windows-x86_64") -%] + mv $rootdir/msvcr100-x86_64.dll $rootdir/msvcr100.dll +[% END -%] [% IF c("var/windows") %] cp -a obj-*/dist/firefox/* $distdir/Browser/ cp -a $rootdir/msvcr100.dll $distdir/Browser diff --git a/projects/firefox/config b/projects/firefox/config index 2e30001..f7a143d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -87,7 +87,10 @@ input_files: enable: '[% c("var/linux") || c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 - enable: '[% c("var/windows") %]' + enable: '[% c("var/windows-i686") %]' + - URL: https://people.torproject.org/~boklm/mirrors/sources/msvcr100-x86_64.dll + sha256sum: ae3cb6c6afba9a4aa5c85f66023c35338ca579b30326dd02918f9d55259503d5 + enable: '[% c("var/windows-x86_64") %]' - project: gcc name: gcc enable: '[% c("var/windows") %]'

1 0

[tor-browser-build/master] Bug 10394: Don't autoupdate HTTPS Everywhere anymore
by boklm＠torproject.org 08 Nov '17

08 Nov '17

commit 50982eda6d3687aa5bcc2d088546f82c4fa7e53d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 14:12:26 2017 +0000 Bug 10394: Don't autoupdate HTTPS Everywhere anymore We use the new --remove-update-channel switch to prevent HTTPS Everywhere from pinging update servers and updating automatically like we do with Torbutton and Tor Launcher. The new HTTPS Everywhere build file makes the workaround for bug 10066 obsolete as well. --- projects/https-everywhere/build | 11 ++--------- projects/https-everywhere/config | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 71b2a21..49018af 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -2,15 +2,8 @@ [% c("var/set_default_env") -%] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] -# patch makexpi.sh because we don't have a git repository -sed -i makexpi.sh -e 's/git rev-parse --short HEAD/echo aaaaaa/' -# XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in -# makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 -# The solution there does not work for us as doing something like -# |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources -# during build time (again) and b) broken due to a certificate error. -rm -f .git/refs/heads/master -./makexpi.sh +# Bug 10394: We don't want to autoupdate HTTPS Everywhere anymore. +./make.sh --remove-update-channel # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm pkg/*-amo.xpi mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 99290e7..5225bbc 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.10.4 +version: 2017.10.30 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[tor-browser-bundle/maint-7.0] Update Changelog
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 95f7f4b699e357349b00ed52655b4b0a96fbf50b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 11:45:51 2017 +0000 Update Changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cf394ef..cecf4e9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,6 +6,7 @@ Tor Browser 7.0.10 -- November 14 2017 * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi * Translations update * Update HTTPS-Everywhere to 2017.10.30 + * Bug 24178: Use make.sh for building HTTPS-Everywhere * Update NoScript to 5.1.5 * Bug 23968: NoScript icon jumps to the right after update * Windows

1 0

Jump to page: