- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 25860: Clean up OpenSSL's configure options for Windows
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit ba7b30a920172233392fd9dc176631c3da25d5f0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 25 18:53:40 2018 +0200 Bug 25860: Clean up OpenSSL's configure options for Windows Avoid duplicating Windows CFLAGS and LDFLAGS. Instead, use the flags defined in rbm.conf. This also means we are now using -fstack-protector-strong instead of -fstack-protector-all for building openssl. We update the CFLAGS/LDFLAGS defined in rbm.conf to move var/flag_mwindows at the end, because openssl's Configure script does not like having an argument starting with a space. --- projects/openssl/config | 3 ++- rbm.conf | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 9c191fa..3489d42 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,7 +15,8 @@ targets: configure_opts: -shared linux-generic32 windows: var: - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs"' + flag_mwindows: '' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/rbm.conf b/rbm.conf index 0d6de69..19bee8e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -216,8 +216,8 @@ targets: container: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs' + CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25859_v4'
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit fb97d6c9141d3a824954b2e2952974daeada26d7 Merge: 4d5e3d2 0e483da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 10:50:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_25859_v4' projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25859: Clean up zlib's build script
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit 0e483da11bd8de64b3b881ef3484ae77f69759ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 25 19:48:38 2018 +0200 Bug 25859: Clean up zlib's build script CFLAGS and LDFLAGS were unused. We are now defining them in LOC, using the definition of CFLAGS and LDFLAGS from rbm.conf. We also don't hardcode anymore -j4. --- projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/zlib/build b/projects/zlib/build index ef26882..fe1377f 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,10 +5,8 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -export CFLAGS="[% c("var/CFLAGS") %]" -export LDFLAGS="[% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install cd /var/tmp/dist [% c('tar', { diff --git a/projects/zlib/config b/projects/zlib/config index 3ad562c..4ac96c9 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -7,6 +7,7 @@ gpg_keyring: zlib.gpg tag_gpg_id: 1 var: + flag_mwindows: '' container: use_container: 1

1 0

[tor-browser-build/master] Bug 25894: Get a Rust cross-compiler for Windows
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 4d5e3d2ba5422b931a2e32a9498feabec6ecc23e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 30 21:58:41 2018 +0000 Bug 25894: Get a Rust cross-compiler for Windows --- projects/rust/build | 14 +++++++++++--- projects/rust/config | 9 +++++++++ projects/rust/panic-abort.patch | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 4c81ad8..69bc3a7 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,9 +10,7 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF ! c("var/windows") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% IF c("var/osx") %] # We need to clear `CC` and `LDFLAGS` as they are used for the host platform @@ -61,6 +59,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/binaryen.patch [% END %] +[% IF c("var/windows-i686") %] + # Cross-compiling for Windows 32bit is currently not possible without any + # patches. The reason for that is libstd expecting DWARF unwinding while most + # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. + # See: https://github.com/rust-lang/rust/issues/12859 for discussion about + # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to + # fix this problem. + patch -p1 < $rootdir/panic-abort.patch +[% END %] + mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index ae2290b..9d3030d 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -48,6 +48,13 @@ targets: - pkg-config configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + windows: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu + input_files: - project: container-image - project: cmake @@ -66,3 +73,5 @@ input_files: gpg_keyring: rust.gpg - filename: binaryen.patch enable: '[% c("var/linux") %]' + - filename: panic-abort.patch + enable: '[% c("var/windows-i686") %]' diff --git a/projects/rust/panic-abort.patch b/projects/rust/panic-abort.patch new file mode 100644 index 0000000..1711ff7 --- /dev/null +++ b/projects/rust/panic-abort.patch @@ -0,0 +1,36 @@ +From 2fe471643721f3967f1bdf28907b0a7247fdb705 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 26 Apr 2018 13:18:27 +0000 +Subject: [PATCH] Avoid cross-compilation breakage due to unwinding + incompatibilities + + +diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs +index 55d104b182..85330f973b 100644 +--- a/src/bootstrap/bin/rustc.rs ++++ b/src/bootstrap/bin/rustc.rs +@@ -143,7 +143,8 @@ fn main() { + // workaround undefined references to `rust_eh_unwind_resume` generated + // otherwise, see issue https://github.com/rust-lang/rust/issues/43095. + if crate_name == "panic_abort" || +- crate_name == "compiler_builtins" && stage != "0" { ++ crate_name == "compiler_builtins" && stage != "0" || ++ target == "i686-pc-windows-gnu" { + cmd.arg("-C").arg("panic=abort"); + } + +diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs +index 9ea5f39b71..bb689120af 100644 +--- a/src/libtest/lib.rs ++++ b/src/libtest/lib.rs +@@ -45,7 +45,6 @@ extern crate getopts; + extern crate term; + #[cfg(any(unix, target_os = "cloudabi"))] + extern crate libc; +-extern crate panic_unwind; + + pub use self::TestFn::*; + pub use self::ColorConfig::*; +-- +2.17.0 +

1 0

[tor-browser-build/master] Bug 25832: Enable pthread support for mingw-w64
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 9af1ea49a225b3a8582be29172cc3f25ef5c215b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 18 08:20:33 2018 +0000 Bug 25832: Enable pthread support for mingw-w64 Since bug 1406542 landed on Mozilla central pthread support is required for mingw-w64. This patch adds it and removes a wrong sed command related to our msvcrt->msvcr100 replacement. --- projects/mingw-w64/build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index b0ce69d..502ea94 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,15 +22,14 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# We don't want to link against msvcrt.dll due to bug 9084. +# We don't want to link against msvcrt.dll due to bug 9084 and want to use +# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec -# Linking libgcc against msvcrt is hard-coded... -sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 +sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" -gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ +gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc @@ -41,6 +40,13 @@ cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 make -j[% c("buildconf/num_procs") %] make install +mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 +make -j[% c("buildconf/num_procs") %] +make install + mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_9711_v2'
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit 966c55d754aaf7d181e85d73474d4014eb72a6ac Merge: ef90f3c 94b31b1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 1 12:51:24 2018 +0200 Merge remote-tracking branch 'gk/bug_9711_v2' projects/cctools/build | 24 ++++++++++++++++++++++++ projects/cctools/config | 16 ++++++++++++++++ 2 files changed, 40 insertions(+)

1 0

[tor-browser-build/master] Bug 9711: Build own cctools for macOS cross-compilation
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit 94b31b1822961b25fec66078bcf48a279d6e9aa6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 21 14:13:40 2018 +0000 Bug 9711: Build own cctools for macOS cross-compilation --- projects/cctools/build | 24 ++++++++++++++++++++++++ projects/cctools/config | 16 ++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/projects/cctools/build b/projects/cctools/build new file mode 100644 index 0000000..cad9e3a --- /dev/null +++ b/projects/cctools/build @@ -0,0 +1,24 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] +export PATH="/var/tmp/dist/llvm/bin:$PATH" +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %]/cctools + +export CC=clang +export CXX=clang++ +./autogen.sh +./configure --prefix=$distdir --target=x86_64-apple-darwin11 --with-llvm-config=llvm-config +export LDFLAGS=-lpthread + +make -j[% c("buildconf/num_procs") %] install + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] + diff --git a/projects/cctools/config b/projects/cctools/config new file mode 100644 index 0000000..cb84ec4 --- /dev/null +++ b/projects/cctools/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% c("abbrev") %]' +# This can be found in +# browser/config/tooltool-manifest/macosx64/clang.manifest +git_hash: 8e9c3f2506b51cf56725eaa60b6e90e240e249ca +git_url: https://github.com/tpoechtrager/cctools-port + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: llvm + project: llvm

1 0

[tor-browser-build/master] Bug 26249: Update libevent to fix macOS cross-compilation
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit ef90f3c7881467df0500674dae84d44e247d459c Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 31 15:34:56 2018 +0000 Bug 26249: Update libevent to fix macOS cross-compilation --- keyring/libevent.gpg | Bin 61408 -> 1782 bytes projects/libevent/autotools-openssl-mac.patch | 26 ++++++++++++++++++++++++++ projects/libevent/build | 3 +++ projects/libevent/config | 4 +++- projects/tor/build | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/keyring/libevent.gpg b/keyring/libevent.gpg index ca92300..b287e04 100644 Binary files a/keyring/libevent.gpg and b/keyring/libevent.gpg differ diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch new file mode 100644 index 0000000..1ee2964 --- /dev/null +++ b/projects/libevent/autotools-openssl-mac.patch @@ -0,0 +1,26 @@ +From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas(a)gmail.com> +Date: Tue, 29 Aug 2017 00:44:57 -0700 +Subject: [PATCH] autotools: confirm openssl is working before using + +latest versions of macOS provide pkg-config and libraries for an ancient +version of openssl as part of the system, but no headers + +diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 +index c2040595..7b458134 100644 +--- a/m4/libevent_openssl.m4 ++++ b/m4/libevent_openssl.m4 +@@ -39,6 +39,10 @@ case "$enable_openssl" in + done + ;; + esac ++ CPPFLAGS_SAVE=$CPPFLAGS ++ CPPFLAGS+=$OPENSSL_INCS ++ AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no]) ++ CPPFLAGS=$CPPFLAGS_SAVE + AC_SUBST(OPENSSL_INCS) + AC_SUBST(OPENSSL_LIBS) + case "$have_openssl" in +-- +2.17.0 + diff --git a/projects/libevent/build b/projects/libevent/build index a38422a..00ee78c 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -5,6 +5,9 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +[% IF c("var/osx") -%] + patch -p1 < $rootdir/autotools-openssl-mac.patch +[% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir [% IF c("var/osx") -%] diff --git a/projects/libevent/config b/projects/libevent/config index 46cbb7e..386f746 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.22 +version: 2.1.8 git_url: https://github.com/libevent/libevent.git git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 @@ -20,3 +20,5 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - filename: autotools-openssl-mac.patch + enable: '[% c("var/osx") %]' diff --git a/projects/tor/build b/projects/tor/build index bf7db83..c6d9895 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -39,7 +39,7 @@ openssldir=/var/tmp/dist/openssl mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" - cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old

1 0

[torbutton/master] Update translations
by gk＠torproject.org 30 May '18

30 May '18

commit 1b8977f5e497512feeebd810bbbca0f41f7874d1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 30 11:26:28 2018 +0000 Update translations --- src/chrome/locale/ar/aboutDialog.dtd | 8 ++-- src/chrome/locale/ar/aboutTBUpdate.dtd | 6 +-- src/chrome/locale/ar/aboutTor.dtd | 6 +-- src/chrome/locale/ar/aboutTor.properties | 16 ++++---- src/chrome/locale/ar/torbutton.dtd | 49 ++++++++++++----------- src/chrome/locale/ar/torbutton.properties | 59 +++++++++++++++------------- src/chrome/locale/da/torbutton.dtd | 3 +- src/chrome/locale/da/torbutton.properties | 5 ++- src/chrome/locale/de/torbutton.dtd | 3 +- src/chrome/locale/de/torbutton.properties | 5 ++- src/chrome/locale/es/torbutton.dtd | 5 ++- src/chrome/locale/es/torbutton.properties | 5 ++- src/chrome/locale/eu/torbutton.dtd | 3 +- src/chrome/locale/eu/torbutton.properties | 5 ++- src/chrome/locale/fa/torbutton.dtd | 3 +- src/chrome/locale/fa/torbutton.properties | 3 ++ src/chrome/locale/fr/torbutton.dtd | 3 +- src/chrome/locale/fr/torbutton.properties | 5 ++- src/chrome/locale/it/torbutton.dtd | 3 +- src/chrome/locale/it/torbutton.properties | 5 ++- src/chrome/locale/ja/torbutton.dtd | 3 +- src/chrome/locale/ja/torbutton.properties | 3 ++ src/chrome/locale/ko/torbutton.dtd | 3 +- src/chrome/locale/ko/torbutton.properties | 5 ++- src/chrome/locale/nl/torbutton.dtd | 3 +- src/chrome/locale/nl/torbutton.properties | 5 ++- src/chrome/locale/pl/torbutton.dtd | 3 +- src/chrome/locale/pl/torbutton.properties | 5 ++- src/chrome/locale/pt-BR/torbutton.dtd | 3 +- src/chrome/locale/pt-BR/torbutton.properties | 5 ++- src/chrome/locale/ru/torbutton.dtd | 3 +- src/chrome/locale/ru/torbutton.properties | 5 ++- src/chrome/locale/sv/torbutton.dtd | 3 +- src/chrome/locale/sv/torbutton.properties | 5 ++- src/chrome/locale/tr/torbutton.dtd | 3 +- src/chrome/locale/tr/torbutton.properties | 5 ++- src/chrome/locale/vi/torbutton.dtd | 3 +- src/chrome/locale/vi/torbutton.properties | 5 ++- src/chrome/locale/zh-CN/torbutton.dtd | 3 +- src/chrome/locale/zh-CN/torbutton.properties | 3 ++ 40 files changed, 174 insertions(+), 102 deletions(-) diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd index 5046d11..fbd16ae 100644 --- a/src/chrome/locale/ar/aboutDialog.dtd +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -1,7 +1,7 @@ -<!ENTITY project.start "ÙØ·ÙÙØ± ÙÙ Ø·Ø±Ù &brandShortName;"> +<!ENTITY project.start "Ø·ÙÙØ± &brandShortName;">  -<!ENTITY project.tpoLink "Ø§Ù&vendorShortNameØ"> -<!ENTITY project.end "ÙØ§ØªÙØ¯Ù ÙÙØ±ØšØ ØªØ¹ÙÙ Ø¹ÙÙ ØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ ÙØØ±ÙØªÙ Ø¹ÙÙ Ø§ÙØ£ÙØªØ±ÙØª"> +<!ENTITY project.tpoLink "&vendorShortNameØ"> +<!ENTITY project.end "Ø ÙØ€Ø³Ø³Ø© ØºÙØ± ÙØ§Ø¯ÙØ© ÙÙØ±ØšØ ØªØ¹ÙÙ Ø¹ÙÙ ØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ ÙØØ±ÙØªÙ Ø¹ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª."> <!ENTITY help.start "ÙÙ ØªØ±ØºØš ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©Ø">  @@ -13,7 +13,7 @@  <!ENTITY bottomLinks.questions "Ø£ÙØ© Ø£Ø³ØŠÙØ©Ø">  -<!ENTITY bottomLinks.grow "Ø³Ø§Ø¹Ø¯ ØŽØšÙØ© ØªÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ !"> +<!ENTITY bottomLinks.grow "Ø³Ø§Ø¹Ø¯ ØŽØšÙØ© ØªÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ.">  <!ENTITY bottomLinks.license "ÙØ¹ÙÙÙØ§Øª Ø§ÙØªØ±Ø®ÙØµ"> <!ENTITY tor.TrademarkStatement ""ØªÙØ±" Ù "ØŽØ¹Ø§Ø± Ø§ÙØšØµÙØ©" Ø¹ÙØ§ÙØ§Øª ØªØ¬Ø§Ø±ÙØ© ÙØ³Ø¬ÙØ© ØšØ§Ø³Ù ØŽØ±ÙØ© ÙØŽØ±ÙØ¹ ØªÙØ± Ø§ÙÙØØ¯ÙØ¯Ø©"> diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index 41fd873..ee153f6 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "ØªØØ¯ÙØ« ÙØªØµÙØ ØªÙØ±"> -<!ENTITY aboutTBUpdate.updated "ÙÙØ¯ ØªÙ ØªØØ¯ÙØ« ÙØªØµÙØ ØªÙØ±."> -<!ENTITY aboutTBUpdate.linkPrefix "ÙÙØØµÙÙ Ø¹ÙÙ Ø£ØØ¯Ø« Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ÙØ°Ø§ Ø§ÙØ¥ØµØ¯Ø§Ø±."> +<!ENTITY aboutTBUpdate.updated "ØªÙ ØªØØ¯ÙØ« ÙØªØµÙØ ØªÙØ±."> +<!ENTITY aboutTBUpdate.linkPrefix "ÙÙØØµÙÙ Ø¹ÙÙ Ø£ØØ¯Ø« Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ÙØ°Ø§ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø"> <!ENTITY aboutTBUpdate.linkLabel "Ø²ÙØ± ÙÙÙØ¹ÙØ§"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "ØªØºÙØ± Ø³Ø¬Ù:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Ø³Ø¬Ù Ø§ÙØªØºÙÙØ±Ø§Øª:"> diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index c64915a..86fe2cd 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -13,7 +13,7 @@ <!ENTITY aboutTor.check.label "Ø§Ø®ØªØšØ± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØŽØšÙØ© ØªÙØ±."> <!ENTITY aboutTor.success.label "Ø£ÙÙØ§Ù ØšÙ ÙÙ ÙØªØµÙØ ØªÙØ±"> -<!ENTITY aboutTor.success2.label "ØªÙ Ø§ÙØ¥ØªØµØ§Ù ØšØŽØšÙØ© ØªÙØ±"> +<!ENTITY aboutTor.success2.label "ÙØªØµÙ ØšØŽØšÙØ© ØªÙØ±"> <!ENTITY aboutTor.success3.label "ÙÙÙÙÙ Ø§ÙØ¢Ù ØªØµÙØ Ø§ÙØ§ÙØªØ±ÙØª ØšØŽÙÙ ÙØÙÙ ÙÙÙØªÙ."> <!ENTITY aboutTor.failure.label "ØØ¯Ø« Ø®Ø·Ø£ ÙØ§!"> <!ENTITY aboutTor.failure2.label "ØªÙØ± ÙØ§ ÙØ¹ÙÙ ÙÙ ÙØ°Ø§ Ø§ÙÙØªØµÙØ."> @@ -29,8 +29,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "ÙØ§ ÙÙØ«Ù ØªÙØ± ÙÙ ÙØ§ ØªØØªØ§Ø¬Ù ÙÙØªØµÙØ ØšØŽÙÙ ÙØÙÙ ÙÙÙØªÙ! ÙØ¯ ØªØØªØ§Ø¬ ÙØªØºÙÙØ± ØšØ¹Ø¯ Ø¹Ø§Ø¯Ø§ØªÙ Ø£Ø«ÙØ§Ø¡ Ø§ÙØªØµÙÙØ ÙØ¶ÙØ§Ù Ø³Ø±ÙØ© ÙÙÙØªÙ."> <!ENTITY aboutTor.whatnext.label "ÙØµØ§ØŠØ ÙÙØÙØ§Øž Ø¹ÙÙ Ø³Ø±ÙÙØ© ÙÙÙØªÙ Â»"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Ø¯ÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙÙØ Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "Ø³"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Ø¯ÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙÙØ ØªÙØ±"> <!ENTITY aboutTor.helpInfo1.label "ØšØ¥ÙÙØ§ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©!"> <!ENTITY aboutTor.helpInfo2.label "ÙÙÙÙÙ ÙØ³Ø§Ø¹Ø¯Ø© ØŽØšÙØ© ØªÙØ± Ù Ø¬Ø¹ÙÙØ§ Ø£ÙØ«Ø± Ø³Ø±Ø¹Ø© Ù ÙÙÙØ© ØšØ¥ØØ¯Ù Ø§ÙØ·Ø±Ù Ø§ÙØ¢ØªÙØ©:"> <!ENTITY aboutTor.helpInfo3.label "ØŽØºÙÙ ÙÙØ·Ø© ØªÙØ± Â»"> diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index 369c257..07d82ff 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchDDG.privacy=Ø§ØšØØ« <a href="%1$S">Ø¢ÙÙØ§</a> ÙØ¹ <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Ø§ØšØØ« <a href="%1$S">ØšØ£ÙØ§Ù</a> ÙØ¹ <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=ØªØšØ±Ø¹ Ø§ÙØ¢Ù ! +aboutTor.donationBanner.donate=ØªØšØ±Ø¹ Ø§ÙØ¢Ù -aboutTor.donationBanner.slogan=ØªÙØ± : Ø¯Ø¹Ù Ø§ÙØµÙÙØ¯ Ø§ÙØ±ÙÙÙ -aboutTor.donationBanner.mozilla=Ø§Ø¹Ø·Ù Ø§ÙÙÙÙ ÙÙÙØ¯Ø²ÙÙØ§ Ø³ØªØ±ÙØ¯ ÙÙ Ø§ÙÙØ¯ÙØ© +aboutTor.donationBanner.slogan=ØªÙØ±: Ø¯Ø¹Ù Ø§ÙØµÙÙØ¯ Ø§ÙØ±ÙÙÙ +aboutTor.donationBanner.mozilla=Ø£Ø¹Ø·Ù Ø§ÙÙÙÙ ÙÙÙØ²ÙÙØ§ Ø³ØªØ¹Ø·Ù ÙØ«ÙÙ -aboutTor.donationBanner.tagline1=ØÙØ§ÙØ© Ø§ÙØµØØ§ÙÙÙÙ Ø Ø§ÙÙÙØ®ØšØ±ÙÙ ÙØ§ÙÙÙØŽØ·Ø§Ø¡ ÙÙØ° Ø¹Ø§Ù 2006 +aboutTor.donationBanner.tagline1=ÙØÙÙ Ø§ÙØµØÙÙÙÙØ ÙÙØ§ØŽÙÙ Ø§ÙÙØ³Ø§Ø¯Ø ÙØ§ÙÙÙØŽØ·Ø§Ø¡ ÙÙØ° Ù¢Ù Ù ÙŠ aboutTor.donationBanner.tagline2=ØØ±ÙØ© Ø§ÙØªÙØ§ØµÙ Ø§ÙØŽØšÙÙ Ø§ÙØ¹Ø§ÙÙÙØ© -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=ØªØ¹Ø²ÙØ² ØØ±ÙØ© Ø§ÙØªØ¹ØšÙØ± Ø¹Ø§ÙÙÙØ§Ù -aboutTor.donationBanner.tagline5=ØªØÙÙ Ø®ØµÙØµÙØ© Ø§ÙÙÙØ§ÙÙÙ ÙÙ Ø§ÙØ£ØŽØ®Ø§Øµ ÙÙ ÙÙÙ +aboutTor.donationBanner.tagline3=Ø§ÙØØ±ÙØ© Ø¹ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª +aboutTor.donationBanner.tagline4=ÙØ¹Ø²ÙØ² ØØ±ÙØ© Ø§ÙØªØ¹ØšÙØ± Ø¹Ø§ÙÙÙÙØ§ +aboutTor.donationBanner.tagline5=ÙØÙÙ Ø®ØµÙØµÙØ© Ø§ÙÙÙØ§ÙÙÙ ÙÙ Ø§ÙØ£ØŽØ®Ø§Øµ ÙÙ ÙÙÙ diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 1605070..9bf013f 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ø¯Ø§ØŠØ±Ø© ØªÙØ± Ø¬Ø¯ÙØ¯Ø© ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙÙÙØ© ..."> +<!ENTITY torbutton.context_menu.preferences "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØŽØšÙØ© ØªÙØ±..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£ÙØ§Ù ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø·..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Ø§ÙÙØ± ÙØšØ¯Ø¡ Ø²Ø± ØªÙØ±"> -<!ENTITY torbutton.prefs.security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù ÙÙØªØµÙØ Ø·ÙØ±"> -<!ENTITY torbutton.prefs.restore_defaults "Ø¥Ø¹Ø§Ø¯Ø© Ø§ÙØªØ¹ÙÙÙ"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£ÙØ§Ù ÙØªØµÙØ Ø·ÙØ±"> +<!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø¯ Ø§ÙØ¥Ø¹Ø§Ø¯Ø§Øª Ø§ÙÙØšØ¯ØŠÙØ©"> +<!ENTITY torbutton.prefs.custom_warning "ØªÙØ¶ÙÙØ§ØªÙ Ø§ÙØ®Ø§ØµØ© ÙÙÙØªØµÙØ ØªØ³ØšØšØª ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£ÙØ§Ù ØºÙØ± ÙØ¹ØªØ§Ø¯Ø©. ÙØ£ÙØ§Ù ÙØ®ØµÙØµÙØ© Ø£ÙØ¶Ù ÙÙØµØ ØšØ§Ø³ØªØ®Ø¯Ø§Ù Ø£ØØ¯ ÙØ³ØªÙÙØ§Øª Ø§ÙØ£ÙØ§Ù Ø§ÙÙØšØ¯ØŠÙØ©."> <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§ÙØÙØ§ÙØ© ÙÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø·"> <!ENTITY torbutton.cookiedialog.lockCol "ÙØÙÙØ©"> <!ENTITY torbutton.cookiedialog.domainCol "Ø§Ø³ØªØ¶Ø§ÙØ©"> @@ -22,29 +22,30 @@ <!ENTITY torbutton.cookiedialog.protectCookie "Ø§ØÙ ÙÙÙ ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· (ÙÙÙÙ)"> <!ENTITY torbutton.cookiedialog.removeCookie "Ø¥Ø²Ø§ÙØ© ÙÙÙ ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· (ÙÙÙÙ)"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Ø¥ÙØºØ§Ø¡ ØÙØ§ÙØ© ÙÙÙ ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· (ÙÙÙÙ)"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§ÙØ© Ø§ÙÙÙ ÙÙÙ Ø§Ø³ØªÙØ± ÙÙ Ø§ÙØÙØ§ÙØ©"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Ø£Ø²ÙÙ Ø§ÙÙÙ ÙÙÙ Ø§Ø³ØªÙØ± ÙÙ Ø§ÙØÙØ§ÙØ©"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· Ø§ÙØ¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÙØ§ ØªØÙ ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· Ø§ÙØ¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.prefs.restrict_thirdparty "ØªÙÙÙØ¯ Ø§ÙÙCookies Ø§ÙØ®Ø§ØµØ© ØšØ§ÙØ·Ø±Ù Ø§ÙØ«Ø§ÙØ« Ù ØšÙØ§ÙØ§Øª Ø§ÙØªØªØšØ¹ Ø§ÙØ£Ø®Ø±Ù."> -<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> -<!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙÙØ± Ø§ÙØªÙØ§ØµÙÙ Ø§ÙØªÙ ØªÙÙØ²Ù Ø¹Ù Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙØ¢Ø®Ø±ÙÙ ÙÙØªØµÙØ ØªÙØ±"> -<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "Ù"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Ø§ØªØ±Ù ÙØ°Ø§ Ø§ÙÙØ±ØšØ¹ ÙØ€ØŽØ±Ø§ ÙÙÙØ¹ Ø¥Ø³Ø§Ø¡Ø© Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø®ØµØ§ØŠØµ Ø§ÙÙØªØµÙØ ÙÙ ØªØ¹ÙØšÙ Ø£Ø«ÙØ§Ø¡ ØªØµÙØÙ ÙÙÙØš. Ø§ÙØ®ØµØ§ØŠØµ Ø§ÙÙØ¹Ø¯ÙÙØ© ØªØŽÙÙ ÙØ³Ø§Ø±Ø§Øª Ø§ÙÙØ§ØŠÙØ§ØªØ ÙÙÙÙØ§Øª Ø§ÙØšØ«Ø ÙØ®ØšÙØŠØ© Ø§ÙÙØªØµÙØØ ÙØ§ÙÙØ¹ÙØ§ØªØ ÙØ£ÙÙÙÙØ§Øª Ø§ÙÙÙØ§ÙØ¹Ø ÙØªØ±ÙÙØ³Ø§Øª Ø§Ø³ØªÙØ«Ø§Ù HTTPØ ÙØ§ÙØ§ØªØµØ§Ù Ø§ÙÙØ³ØšÙ ØšØ§ÙØ±ÙØ§ØšØ·Ø Ø§ÙØªØ®Ø²ÙÙ Ø§ÙÙØÙÙØ ÙÙØ³Ø§Ø±Ø§Øª Ø§ÙÙØ³Ø§ØŠØ·Ø ÙØ·ÙØšØ§Øª OCSPØ ÙSharedWorkersØ ÙØšØ·Ø§ÙØ§Øª Ø¬ÙØ³Ø§Øª TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "ØºÙÙØ± Ø§ÙØªÙØ§ØµÙÙ Ø§ÙØªÙ ØªÙÙØ²Ù Ø¹Ù ÙØ³ØªØ®Ø¯ÙÙ ÙØªØµÙØ ØªÙØ± Ø§ÙØ¢Ø®Ø±ÙÙ"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "Øº"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ø§ØªØ±Ù ÙØ°Ø§ Ø§ÙÙØ±ØšØ¹ ÙØ€ØŽØ±Ø§ ÙØªØ®ÙÙ Ø¹Ù ÙÙØ§ÙØ¹ Ø§ÙÙØš Ø§ÙØ£ØŽÙØ§Ø¡ Ø§ÙØªÙ ØªÙÙØ²Ù Ø¹Ù ØºÙØ±ÙØ ÙØ«Ù Ø£Ø¯Ø§Ø¡ ØØ§Ø³ÙØšÙØ ÙØªØ®Ø·ÙØ· ÙÙØØ© Ø§ÙÙÙØ§ØªÙØØ ÙØ§ÙÙØºØ©Ø ÙÙÙØ§Ù ØªÙØµÙØš Ø§ÙÙÙØÙØ§ØªØ ÙÙØ§ØŠÙØ© Ø§ÙÙÙØÙØ§Øª Ø§ÙÙÙØµØšØ©Ø ÙØØ§ÙØ© Ø§ÙØŽØšÙØ©Ø ÙØ§ØªØ¬Ø§Ù Ø§ÙØŽØ§ØŽØ© ÙØØ¬ÙÙØ§Ø ÙÙØ³ØªÙÙØ§Øª Ø§ÙØªÙØ±ÙØš ÙÙÙ ÙÙÙØ¹Ø ÙØ£ÙÙØ§Ø¹ Ø§ÙÙÙÙØ§Øª Ø§ÙÙØ¯Ø¹ÙÙØ©Ø ÙØ£ÙÙØ§Ù Ø§ÙÙØžØ§ÙØ ÙØ¥ÙÙØ§ÙØ§Øª WebGL."> <!ENTITY torbutton.prefs.sec_caption "ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "ÙØªÙØ ÙÙ ØŽØ±ÙØ· ØªÙØ±ÙØ± ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù ØªØ¹Ø·ÙÙ ØšØ¹Ø¶ ÙÙ ÙÙÙØ²Ø§Øª ÙØªØµÙØÙ ØªØ¬Ø¹ÙÙ Ø£ÙØ«Ø± Ø¹Ø±Ø¶Ø© ÙÙØ§Ø®ØªØ±Ø§Ù."> <!ENTITY torbutton.prefs.sec_standard_label "Ø¹Ø§Ø¯Ù"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Ø¢ÙÙÙ Ø¬Ø¯Ø§"> -<!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 "Ø¬ÙØ¯Ù Ø¢ÙÙÙ"> -<!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_standard_description "ÙÙ Ø®ØµØ§ØŠØµ ÙØªØµÙØ ØªÙØ± ÙÙÙØ§ÙØ¹ Ø§ÙÙØš ÙÙØ¹ÙØ©"> +<!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 is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "Ø¬Ø§ÙØ§ Ø³ÙØ±ÙØšØª ÙØ¹Ø·Ù ØšØŽÙÙ Ø§ÙØªØ±Ø§Ø¶Ù Ø¹ÙÙ Ø¬ÙÙØ¹ Ø§ÙÙÙØ§ÙØ¹."> -<!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 "Ø¯Ø§ØŠØ±Ø© ØªÙØ± ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "ØªØ¹Ø·Ù Ø¬Ø§ÙØ§ Ø³ÙØ±ØšØª Ø¹ÙÙ Ø§ÙÙÙØ§ÙØ¹ Ø§ÙØªÙ ÙØ§ ØªØ³ØªØ®Ø¯Ù HTTPS"> +<!ENTITY torbutton.prefs.sec_js_disabled "ØªØ¹Ø·Ù Ø¬Ø§ÙØ§ Ø³ÙØ±ØšØª ÙØšØ¯ØŠÙØ§ Ø¹ÙÙ Ø¬ÙÙØ¹ Ø§ÙÙÙØ§ÙØ¹."> +<!ENTITY torbutton.prefs.sec_limit_typography "ØªØ¹Ø·ÙÙ ØšØ¹Ø¶ Ø§ÙØ®Ø·ÙØ· ÙØ§ÙØ±ÙÙØ² Ø§ÙØ±ÙØ§Ø¶ÙØ©."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ØªØ¹Ø·ÙÙ ØšØ¹Ø¶ Ø§ÙØ®Ø·ÙØ· ÙØ§ÙØ£ÙÙÙÙØ§Øª ÙØ§ÙØ±ÙÙØ² Ø§ÙØ±ÙØ§Ø¶ÙØ© ÙØ§ÙØµÙØ±."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Ø§ÙØµÙØª ÙØ§ÙÙÙØ¯ÙÙ ÙØØªØ§Ø¬ ÙÙÙÙØ± ÙØªØŽØºÙÙÙ."> +<!ENTITY torbutton.circuit_display.title "Ø¯Ø§ØŠØ±Ø© ØªÙØ±"> +<!ENTITY torbutton.circuit_display.new_circuit "Ø¯Ø§ØŠØ±Ø© ØªÙØ± Ø¬Ø¯ÙØ¯Ø© ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index fb18bee..afa0b93 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -1,51 +1,54 @@ torbutton.circuit_display.internet = Ø§ÙØªØ±ÙØª torbutton.circuit_display.ip_unknown = IP ØºÙØ± ÙØ¹Ø±ÙÙ -torbutton.circuit_display.onion_site = ÙÙÙØ¹ Ø§ÙÙÙÙÙ +torbutton.circuit_display.onion_site = ÙÙÙØ¹ Ø£ÙÙÙÙÙ torbutton.circuit_display.this_browser = ÙØ°Ø§ Ø§ÙÙØªØµÙØ -torbutton.circuit_display.relay = ÙÙØ±ØÙ +torbutton.circuit_display.relay = ØªØÙÙÙØ© torbutton.circuit_display.tor_bridge = Ø¬Ø³Ø± torbutton.circuit_display.unknown_country = ØšÙØ¯ ØºÙØ± ÙØ¹Ø±ÙÙ -torbutton.content_sizer.margin_tooltip = ÙØ¶ÙÙ ÙØªØµÙØ ØªÙØ± ÙØ°Ø§ Ø§ÙÙØ§ÙØŽ ÙØ§ØšÙØ§Ø¡ ÙØ§ÙØ°ØªÙ ØºÙØ± ÙÙÙØ²ÙØ ÙØªÙÙÙÙ Ø§ÙÙØ§ÙÙÙ ØªÙÙÙÙ Ø¹ØšØ± Ø§ÙØ§ÙØªØ±ÙØª. +torbutton.circuit_display.guard = ØØ§Ø±Ø³ +torbutton.circuit_display.guard_note = ÙØ§ ÙÙÙÙ ØªØºÙÙØ± Ø§ÙØ¹ÙØ¯Ø© Ø§ÙØ®Ø§Ø±Ø³Ø© +torbutton.circuit_display.learn_more = ØªØ¹Ø±ÙÙ Ø¹ÙÙ Ø§ÙÙØ²ÙØ¯ +torbutton.content_sizer.margin_tooltip = ÙØ¶ÙÙ ÙØªØµÙØ ØªÙØ± ÙØ°Ø§ Ø§ÙÙØ§ÙØŽ ÙØ¬Ø¹Ù Ø¹Ø±Ø¶ ÙØ§Ø±ØªÙØ§Ø¹ ÙØ§ÙØ°ØªÙ ØºÙØ± ÙÙÙØ²ÙÙØ ÙØªÙÙÙÙ Ø¥ÙÙØ§ÙÙØ© Ø§ÙØªÙØ§Ø¡ Ø£Ø«Ø±Ù Ø¹ØšØ± Ø§ÙØ¥ÙØªØ±ÙØª. torbutton.panel.tooltip.disabled = Ø§ÙÙØ± ÙØªÙØ¹ÙÙ ØªÙØ± torbutton.panel.tooltip.enabled = Ø§ÙÙØ± ÙØªØ¹Ø·ÙÙ ØªÙØ± torbutton.panel.label.disabled = ØªÙØ± ÙØ¹Ø·ÙÙ torbutton.panel.label.enabled = ØªÙØ± ÙÙØ¹ÙÙ extensions.torbutton(a)torproject.org.description = Ø²Ø± ØªÙØ± ÙÙÙØ± Ø²Ø± ÙØªØ¹Ø¯ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ± ÙØ§ÙØ¶Ø§Ù ÙÙØ³Ø ØšÙØ§ÙØ§Øª Ø§ÙØªØµÙØ Ø§ÙØ®Ø§ØµØ© ØšÙ ØšØ³Ø±Ø¹Ø© ÙØšØ³ÙÙÙØ©. -torbutton.popup.external.title = ÙÙ ØªØ±ÙØ¯ ØªÙØ²ÙÙ ÙÙÙØ§Ù ÙÙ ÙÙØ¹ Ø§ÙÙØµÙØ© Ø§ÙØ®Ø§Ø±Ø¬ÙØ©Ø -torbutton.popup.external.app = ÙØ§ ÙÙÙÙ ÙÙØªØµÙÙØ ØªÙØ± Ø¹Ø±Ø¶ ÙØ°Ù Ø§ÙÙÙÙ, ÙØ¬Øš Ø¹ÙÙÙ Ø£Ù ØªÙØªØÙ ØšØ§Ø³ØªØ¹ÙØ§Ù ØªØ·ØšÙÙ Ø£Ø®Ø±.\n\n -torbutton.popup.external.note = ØšØ¹Ø¶ Ø§ÙØ£ÙÙØ§Ø¹ ÙÙ Ø§ÙÙÙÙØ§Øª ÙØ¯ ØªØ¹ÙÙ Ø¹ÙÙ Ø¥Ø¹Ø·Ø§Ø¡ ØšØ¹Ø¶ Ø§ÙØªØ·ØšÙÙØ§Øª Ø§ÙØ¥ÙÙØ§ÙÙÙØ© ÙÙØ§ØªØµØ§Ù ØšØ§ÙØ¥ÙØªØ±ÙØª Ø¯ÙÙ Ø§Ø³ØªØ¹ÙØ§Ù ØªÙØ±.\n\n -torbutton.popup.external.suggest = ÙØ³ÙØ§ÙØªÙ, ÙØ¬Øš Ø¹ÙÙÙ ÙØªØ Ø§ÙÙÙÙØ§Øª Ø§ÙÙÙØ²ÙÙØ© ÙØ³ØšÙØ§Ù Ø¹ÙØ¯ ÙÙÙÙ ØºÙØ± ÙØªØµÙØ§Ù ØšØ§ÙØ¥ÙØªØ±ÙØª, Ø£Ù Ø§Ø³ØªØ¹ÙÙ ÙØ±Øµ ÙØ¶ØºÙØ· ÙÙ Tor Life , ÙØ«Ù Tails.\n +torbutton.popup.external.title = ÙÙ ØªØ±ÙØ¯ ØªÙØ²ÙÙ ÙÙÙ Ø®Ø§Ø±Ø¬ÙØ +torbutton.popup.external.app = ÙØ§ ÙÙÙÙ ÙÙØªØµÙÙØ ØªÙØ± Ø¹Ø±Ø¶ ÙØ°Ù Ø§ÙÙÙÙØ ÙØ¬Øš Ø¹ÙÙÙ Ø£Ù ØªÙØªØÙ ØšØ§Ø³ØªØ¹ÙØ§Ù ØªØ·ØšÙÙ Ø¢Ø®Ø±.\n\n +torbutton.popup.external.note = ØšØ¹Ø¶ Ø£ÙÙØ§Ø¹ ÙÙ Ø§ÙÙÙÙØ§Øª ÙØ¯ ØªØªØ³ØšØš ÙÙ Ø§ØªØµØ§Ù Ø§ÙØªØ·ØšÙÙØ§Øª ØšØ§ÙØ¥ÙØªØ±ÙØª Ø¯ÙÙ Ø§Ø³ØªØ¹ÙØ§Ù ØªÙØ±.\n\n +torbutton.popup.external.suggest = ÙØ³ÙØ§ÙØªÙ, ÙØ¬Øš Ø¹ÙÙÙ ÙØªØ Ø§ÙÙÙÙØ§Øª Ø§ÙÙÙØ²ÙÙØ© ÙØ£ÙØª ØºÙØ± ÙØªØµÙ ØšØ§ÙØ¥ÙØªØ±ÙØªØ Ø£Ù Ø§Ø³ØªØ¹ÙÙ ÙØ±Øµ ØªÙØ± ØÙ ÙØ«Ù Tails.\n torbutton.popup.launch = ØªØÙÙÙ Ø§ÙÙÙÙ torbutton.popup.cancel = Ø¥ÙØºØ§Ø¡ -torbutton.popup.dontask = Ø£ÙØ²Ù Ø§ÙÙÙÙØ§Øª ØšØŽÙÙÙ Ø£ÙØªÙÙØ§ØªÙÙÙÙ ÙÙ Ø§ÙØ£Ù ÙØµØ§Ø¹Ø¯Ø§Ù -torbutton.popup.prompted_language = ØØªÙ ÙÙÙØÙ Ø²Ø± ØªÙØ± ÙØ²ÙØ¯Ø§Ù ÙÙ Ø§ÙØ®ØµÙØµÙØ©Ø ÙØ³ØªØ·ÙØ¹ Ø²Ø± ØªÙØ± Ø·ÙØš Ø§ÙÙØ³Ø® Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙ ØµÙØØ§Øª Ø§ÙØ§ÙØªØ±ÙØª. ÙÙØ¯ ÙÙØªØ¬ Ø¹Ù Ø°ÙÙ Ø¹Ø±Ø¶ Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙØ§ ØšÙØºØªÙ Ø§ÙØ£Ù ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª Ø§ÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø§ÙØ¶ÙØ -torbutton.popup.no_newnym = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ØšØŽÙÙ Ø¢ÙÙØ ÙÙØ°Ø§ ÙØ§Ù Ø²Ø± ØªÙØ± ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙÙÙØ° Ø§ÙØªØÙÙ Ø§ÙØ®Ø§Øµ ØšØªÙØ±.\n\nÙÙ ØªØ³ØªØ®Ø¯Ù ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ -torbutton.title.prompt_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù ØªÙØ± -torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª Ø·Ø±ÙÙØ© Ø¹ÙÙ Ø²Ø± ØªÙØ± Ø§ÙØ§Ù: ÙØ§ ÙÙÙÙÙ Ø¥ÙÙØ§ÙÙ Ø§ÙØ§Ù \n\nÙÙÙØ§ ØšÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ§ÙÙ Ø§ØµØšØ ÙÙ ØºÙØ± Ø§ÙØ¢ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø²Ø± ØªÙØ± ÙÙ Ø§ÙÙØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙØ§Ù ÙÙØ§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ¹ÙÙ Ù Ø§ÙØªÙ ÙÙ ÙÙÙÙ ÙÙ Ø§ÙÙÙÙÙ ÙØ¹Ø§ÙØ¬ØªÙØ§ ØšØ§Ù Ø·Ø±ÙÙØ© Ø§Ø®Ø±Ù.\n\nØ¥Ø°Ø§ Ø§Ø±Ø¯Øª Ø§ÙØ§Ø³ØªÙØ±Ø§Ø± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ§ÙØ±ÙÙÙØ³ ØªÙÙÙØ¯ÙØ§ÙØ ÙØªÙØ¬Øš Ø¹ÙÙÙ Ø¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ± Ù ØªØÙÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±. ÙÙØ§ Ø§Ù Ø®ØµØ§ØŠØµ Ø§ÙØ®ØµÙØµÙØ© ÙÙØªØµÙØ ØªÙØ± ØªØªÙÙÙ Ø¹ÙÙ ØªÙÙ Ø§ÙØªÙ ÙÙ ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ Ø§ÙØªÙÙÙØ¯ÙØ ØØªÙ ÙÙ ØªÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ ÙØ¹ Ø²Ø± ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->ÙØÙÙØ§Øª Ø Ø«Ù Ø¥Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø ²Ø± ØªÙØ±. -torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± \n\nØªÙ ØªÙÙÙÙ Ø²Ø± ØªÙØ± ÙÙØ¹ÙÙ ØšØ§Ø³ØªÙØ±Ø§Ø± Ø§ÙØ§Ù\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª +torbutton.popup.dontask = ÙØ²ÙÙ Ø§ÙÙÙÙØ§Øª ØªÙÙØ§ØŠÙØ§ ÙÙ Ø§ÙØ¢Ù ÙØµØ§Ø¹Ø¯ÙØ§ +torbutton.popup.prompted_language = ÙÙÙÙØÙ Ø²Ø± ØªÙØ± ÙØ²ÙØ¯ÙØ§ ÙÙ Ø§ÙØ®ØµÙØµÙØ©Ø ÙÙÙÙÙ Ø£Ù ÙØ·ÙØš Ø§ÙÙØ³Ø® Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙ ØµÙØØ§Øª Ø§ÙØ¥ÙØªØ±ÙØª. ÙØ¯ ÙÙØªØ¬ Ø¹Ù Ø°ÙÙ Ø¹Ø±Ø¶ Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙØ§ ØšÙØºØªÙ Ø§ÙØ£Ù ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª Ø§ÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø£ÙØ¶ÙØ +torbutton.popup.no_newnym = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ØšØŽÙÙ Ø¢ÙÙØ ÙØ£ÙÙ ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙÙÙØ° ØªØÙÙ ØªÙØ±.\n\nÙÙ ØªØ³ØªØ®Ø¯Ù ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ +torbutton.title.prompt_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± +torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª Ø·Ø±ÙÙØ© Ø¹ÙÙ Ø²Ø± ØªÙØ±: ÙÙ ÙØ¹Ø¯ ØšØ¥ÙÙØ§ÙÙ Ø¥ÙÙØ§ÙÙ.\n\nØ£Ø¬Ø±ÙÙØ§ ÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ£ÙÙ ÙÙ ØºÙØ± Ø§ÙØ¢ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø²Ø± ØªÙØ± ÙÙ Ø§ÙÙØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙÙØ§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ¹ÙÙ Ø§ÙØªÙ ÙØ§ ÙÙÙÙ ÙØ¹Ø§ÙØ¬ØªÙØ§ ØšØ£Ù Ø·Ø±ÙÙØ© Ø£Ø®Ø±Ù.\n\nØ¥Ø°Ø§ Ø£Ø±Ø¯Øª Ø§ÙØ§Ø³ØªÙØ±Ø§Ø± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙÙÙÙØ±ÙÙÙØ³ Ø¹Ø§Ø¯ÙØ§Ø ÙØ¹ÙÙÙ Ø¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ± ÙØªÙØ²ÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±. ÙÙØ§ Ø£Ù Ø®ØµØ§ØŠØµ Ø§ÙØ®ØµÙØµÙØ© ÙÙØªØµÙØ ØªÙØ± ØªØªÙÙÙ Ø¹ÙÙ ØªÙÙ Ø§ÙØªÙ ÙÙ ÙØªØµÙØ ÙÙÙÙØ±ÙÙÙØ³ Ø§ÙØ¹Ø§Ø¯ÙØ ØØªÙ Ø¹ÙØ¯ Ø§Ø³ØªØ®Ø¯Ø§ÙÙ ÙØ¹ Ø²Ø± ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->ÙØÙÙØ§Øª Ø Ø«Ù Ø§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø²Ø± ØªÙØ±. +torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ±.\n\nØ²Ø± ØªÙØ± ÙÙØ¹ÙÙ Ø¯Ø§ØŠÙØ§ Ø§ÙØ¢Ù.\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª. -torbutton.popup.confirm_plugins = Ø§ÙØšØ±Ø§ÙØ¬ Ø§ÙØ¥Ø¶Ø§ÙÙØ© ÙØ«Ù ÙÙØ§ØŽ ØªØ³ØªØ·ÙØ¹ Ø§Ù ØªØ¶Ø± ØšØ®ØµÙØµÙØªÙ Ù ØªÙØŽÙ ÙÙÙØªÙ.\n\nÙ ØªØ³ØªØ·ÙØ¹ Ø§ÙØ¶Ø§ Ø§Ù ØªØªØ¬ÙØš ØªÙØ± Ù ØªÙØŽÙ Ø¹Ù ÙÙØ§ÙÙ Ø§ÙØØ§ÙÙ Ù Ø¹ÙÙØ§Ù Ø§ÙØ£Ù ØšÙ Ø§ÙØ®Ø§Øµ ØšÙ.\n\nÙÙ Ø£ÙØª ÙØªØ£ÙØ¯ Ø£ÙÙ ØªØ±ÙØ¯ ØªÙØ¹ÙÙ Ø§ÙØšØ±Ø§ÙØ¬ Ø§ÙØ¥Ø¶Ø§ÙÙØ©Ø\n\n -torbutton.popup.never_ask_again = ÙØ§ ØªØ³Ø£ÙÙÙ ÙØ±Ø© Ø§Ø®Ø±Ù -torbutton.popup.confirm_newnym = ÙØªØµÙØ ØªÙØ± +torbutton.popup.confirm_plugins = Ø§ÙÙÙØÙØ§Øª ÙØ«Ù ÙÙØ§ØŽ ÙÙÙÙ Ø£Ù ØªØ¶Ø± ØšØ®ØµÙØµÙØªÙ ÙØªÙØŽÙ ÙÙÙØªÙ.\n\nÙÙØ§ ÙÙÙÙÙØ§ Ø£Ù ØªØªØ¬ÙØš ØªÙØ± Ù ØªÙØŽÙ Ø¹Ù ÙÙØ§ÙÙ Ø§ÙØØ§ÙÙ Ù Ø¹ÙÙØ§Ù Ø§ÙØ¥ÙØªØ±ÙØª (IP).\n\nÙÙ Ø£ÙØª ÙØªØ£ÙØ¯ Ø£ÙÙ ØªØ±ÙØ¯ ØªÙØ¹ÙÙ Ø§ÙÙÙØÙØ§ØªØ\n\n +torbutton.popup.never_ask_again = ÙØ§ ØªØ³Ø£ÙÙÙ ÙØ±Ø© Ø£Ø®Ø±Ù +torbutton.popup.confirm_newnym = Ø³ÙØºÙÙ ÙØªØµÙØ ØªÙØ± ÙÙ Ø§ÙÙÙØ§ÙØ° ÙØ§ÙØ£ÙØ³ÙØ©Ø ÙÙØ§ Ø³ØªÙØ³Ø ÙÙ Ø¬ÙØ³Ø§Øª Ø§ÙÙÙØ§ÙØ¹.\n\nØ£ØªØ±ÙØ¯ Ø¥Ø¹Ø§Ø¯Ø© ØªØŽØºÙÙ ÙØªØµÙØ ØªÙØ± Ø§ÙØ¢Ù Ø£Ù ØªØºÙÙØ± ÙÙÙØªÙØ\n\n -torbutton.slider_notification = ÙØ§ØŠÙØ© Ø§ÙØšØµÙØ© Ø§ÙØ®Ø¶Ø±Ø§Ø¡ ÙØ¯ÙÙØ§ Ø§ÙØ¢Ù ÙÙØ²ÙÙ Ø£ÙÙÙ Ø§ÙØ°Ù ÙÙÙÙÙ ÙÙ Ø¶ØšØ· ÙØ³ØªÙÙ Ø£ÙØ§ÙÙ. ØªØÙÙ ÙÙ Ø°ÙÙ! -torbutton.slider_notification_button = ÙØªØ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù +torbutton.slider_notification = ÙØ§ØŠÙØ© Ø§ÙØšØµÙØ© Ø§ÙØ®Ø¶Ø±Ø§Ø¡ ØšÙØ§ Ø§ÙØ¢Ù ØŽØ±ÙØ· ØªÙØ±ÙØ± Ø£ÙÙÙ ÙØªÙØ ÙÙ Ø¶ØšØ· ÙØ³ØªÙÙ Ø£ÙØ§ÙÙ. ØªØÙÙ ÙÙ Ø°ÙÙ! +torbutton.slider_notification_button = Ø§ÙØªØ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù torbutton.maximize_warning = ØªÙØšÙØ± ÙØªØµÙØ ØªÙØ± ÙØ¯ ÙØ³ÙØ ÙØšØ¹Ø¶ Ø§ÙÙÙØ§ÙØ¹ ØšØ§ÙØªØ¹Ø±Ù Ø¹ÙÙ ØØ¬Ù ØŽØ§ØŽØªÙØ ÙØ§Ø³ØªØ®Ø¯Ø§Ù ÙØ°Ù Ø§ÙÙØ¹ÙÙÙØ§Øª ÙØªÙÙÙÙ. ÙÙØµÙ ØšØ§ØšÙØ§Ø¡ ÙØ§ÙØ°Ù ÙØªØµÙ ØªÙØ± Ø¹ÙÙ ØØ¬ÙÙØ§ Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=ÙØ°Ø§ Ø§ÙÙÙÙØ¹ (Ùª S) ØØ§ÙÙ Ø§Ø³ØªØ®Ø±Ø§Ø¬ ØšÙØ§ÙØ§Øª Ø§ÙØµÙØ±Ø© HTML5Ø ÙØ§ÙØªÙ ÙÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§ ÙØªØØ¯ÙØ¯ ÙÙØ§ÙÙ ÙØªØØ¯ÙØ¯ Ø§ÙÙÙÙØšÙÙØªØ±.\n\nÙÙ ØªØ±ÙØ¯ Ø£Ù ÙØ³ÙØ ÙØªØµÙØ Tor ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹ ÙØ§Ø³ØªØ®Ø±Ø§Ø¬ ØšÙØ§ÙØ§Øª Ø§ÙØµÙØ±Ø© Ø canvas.notNow=ÙÙ ÙÙØª Ø¢Ø®Ø± -canvas.notNowAccessKey=Ø§ÙÙÙÙ -canvas.allow=Ø§ÙØ³ÙØ§Ø ÙÙ Ø§ÙÙØ³ØªÙØšÙ -canvas.allowAccessKey=Ø§ -canvas.never=ÙÙØ³ ÙÙÙÙÙØ¹ ÙØ°Ø§ Ø§ØšØ¯Ø§Ù (ÙØ³ØªØØš) -canvas.neverAccessKey=Ø· +canvas.notNowAccessKey=Ù +canvas.allow=Ø§Ø³ÙØ ÙÙ Ø§ÙÙØ³ØªÙØšÙ +canvas.allowAccessKey=Ø³ +canvas.never=ÙØ§ ØªØ³ÙØ ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹ Ø£ØšØ¯ÙØ§ (ÙØ³ØªØØ³Ù) +canvas.neverAccessKey=Ø¯ # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%SÙØŽÙÙÙ ÙÙ ÙÙÙ ØŽØ®ØµÙ -profileReadOnly=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ ÙÙÙØ¹ Ø¢Ø®Ø± ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§. -profileReadOnlyMac=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ Ø³Ø·Ø Ø§ÙÙÙØªØš Ø£Ù ÙØ¬ÙØ¯ Ø§ÙØªØ·ØšÙÙØ§Øª ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileProblemTitle=ÙØŽÙÙØ© ÙÙ ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª %S +profileReadOnly=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ ÙÙÙØ¹ Ø¢Ø®Ø± ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙ. +profileReadOnlyMac=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ Ø³Ø·Ø Ø§ÙÙÙØªØš Ø£Ù ÙØ¬ÙØ¯ Ø§ÙØªØ·ØšÙÙØ§Øª ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙ. +profileAccessDenied=ÙØ§ ÙÙØªÙÙ %S Ø§ÙØµÙØ§ØÙØ§Øª Ø§ÙÙØ·ÙÙØšØ© ÙÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ. ÙØ±Ø¬Ù Ø¶ØšØ· ØµÙØ§ØÙØ§Øª ÙØžØ§Ù Ø§ÙÙÙÙØ§Øª Ø«Ù Ø¥Ø¹Ø§Ø¯Ø© Ø§ÙÙØØ§ÙÙØ©. +profileMigrationFailed=ÙØŽÙ ÙÙÙ ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª %S Ø§ÙÙÙØ¬ÙØ¯ Ø¥ÙÙ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø© Ø§ÙØ¬Ø¯ÙØ¯Ø©.\nØ³ÙØ³ØªØ®Ø¯Ù ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¬Ø¯ÙØ¯. diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 5a82f18..7936505 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -47,4 +47,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Tor-kredslÃžb"> +<!ENTITY torbutton.circuit_display.new_circuit "Nyt kredslÃžb til dette sted"> diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index 54df12c..d3be2cc 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -2,9 +2,12 @@ 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.relay = RelÃŠ torbutton.circuit_display.tor_bridge = Bro torbutton.circuit_display.unknown_country = Ukendt land +torbutton.circuit_display.guard = Vagt +torbutton.circuit_display.guard_note = Dit [Vagt]-knudepunkt mÃ¥ ikke ÃŠndres. +torbutton.circuit_display.learn_more = LÃŠr mere 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 diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index b4fb858..7fbb0f1 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -48,4 +48,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 1e38c45..e3c33c7 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP ist unbekannt torbutton.circuit_display.onion_site = Onion-Seite torbutton.circuit_display.this_browser = Dieser Browser -torbutton.circuit_display.relay = Relais +torbutton.circuit_display.relay = Verteiler torbutton.circuit_display.tor_bridge = BrÃŒcke torbutton.circuit_display.unknown_country = Unbekanntes Land +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Erfahren Sie mehr torbutton.content_sizer.margin_tooltip = Tor Browser fÃŒgt diese Begrenzung hinzu, um die Breite und HÃ¶he Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 5408736..465fea8 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantenga esta casilla marcada para ocultar cosas a los sitios web que podrÃan ser Ãºnicas acerca de usted, incluyendo el rendimiento de su equipo, plano de teclado, localizaciÃ³n, lista y ubicacion de complementos instalados, estado de su red, orientaciÃ³n de pantalla, tamaÃ±o de pantalla, niveles de zoom especÃfico del sitio, tipos de fichero soportados, colores del sistema, y capacidades WebGL. "> <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad le permite deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a tentativas de hackeo."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad te permite deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a tentativas de hackeo."> <!ENTITY torbutton.prefs.sec_standard_label "EstÃ¡ndar"> <!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"> @@ -47,4 +47,5 @@ <!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) son de tipo pulsar-para-reproducir."> -<!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio"> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuevo Circuito para este Sitio"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 35a796a..5463ea1 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP desconocida torbutton.circuit_display.onion_site = Sitio onion torbutton.circuit_display.this_browser = Este navegador -torbutton.circuit_display.relay = repetidor +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Repetidor puente (bridge) torbutton.circuit_display.unknown_country = PaÃs desconocido +torbutton.circuit_display.guard = ProtecciÃ³n +torbutton.circuit_display.guard_note = Tu nodo [de protecciÃ³n] no puede cambiar. +torbutton.circuit_display.learn_more = Conocer mÃ¡s torbutton.content_sizer.margin_tooltip = El Navegador Tor aÃ±ade este margen para hacer el ancho y el alto de tu ventana menos especial, y reducir de esta forma la posibilidad de rastrearte en lÃnea. torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 94062c1..fc95c71 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -47,4 +47,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index 0799da2..e77d04a 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP ezezaguna torbutton.circuit_display.onion_site = Onion webgunea torbutton.circuit_display.this_browser = Nagibatzaile hau -torbutton.circuit_display.relay = errele +torbutton.circuit_display.relay = Errele torbutton.circuit_display.tor_bridge = Zubia torbutton.circuit_display.unknown_country = Herrialde ezezaguna +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Learn more torbutton.content_sizer.margin_tooltip = Tor nabigatzaileak marjin hau gehitzen du zure lehioaren zabalera eta altuera ez hain bereizgarria egiteko, horrela norbaitek zure jarraipena egiteko gaitasuna murriztuz. torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 9972010..61323e6 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -47,4 +47,5 @@ <!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 "ÙØ¯Ø§Ø± ØªÙØ± ØšØ±Ø§Û Ø§ÛÙ Ø³Ø§ÛØª"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index e21d475..7b282da 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = Ø§ÛÙ ÙØ±ÙØ±Ú¯Ø± torbutton.circuit_display.relay = ØšØ§Ø²ÙŸØ®ØŽ torbutton.circuit_display.tor_bridge = ÙŸÙ torbutton.circuit_display.unknown_country = Ú©ØŽÙØ± ÙØ§ØŽÙØ§Ø®ØªÙ +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÛØŽØªØ± torbutton.content_sizer.margin_tooltip = ÙØ±ÙØ±Ú¯Ø± Tor Ø§Ø¶Ø§ÙÙ ÙÛ Ú©ÙØ¯ Ø§ÛÙ ØØ§ØŽÛÙ Ø±Ø§ ØšÙ Ø¹Ø±Ø¶ Ù Ø§Ø±ØªÙØ§Ø¹ ÙŸÙØ¬Ø±Ù ØŽÙØ§ Ú©Ù Ú©ÙØªØ± ÙØŽØ®Øµ ØŽÙØ¯Ø Ù Ø¯Ø± ÙØªÛØ¬Ù ØšØ§Ø¹Ø« Ú©Ø§ÙØŽ ØªÙØ§ÙØ§ÛÛ ØšÙ Ø±Ø¯ÛØ§ØšÛ Ø¢ÙÙØ§ÛÙ ØŽÙØ§ ØŽÙØ¯. torbutton.panel.tooltip.disabled = ØšØ±Ø§Û ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù ØªÙØ± Ú©ÙÙÚ© Ú©ÙÙØ¯ torbutton.panel.tooltip.enabled = ØšØ±Ø§Û ØºÙØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù ØªÙØ± Ú©ÙÙÚ© Ú©ÙÙØ¯ diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 895d922..052b0ad 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -47,4 +47,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Circuit Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nouveau circuit pour ce site"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index f293385..5b7b344 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet 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.relay = Relais torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu +torbutton.circuit_display.guard = Garde +torbutton.circuit_display.guard_note = Votre nÅud de [Guard] ne peut pas changer. +torbutton.circuit_display.learn_more = En apprendre davantage 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 diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 746ead5..b1cc844 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -47,4 +47,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuovo circuito per questo sito"> diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index d83c43a..37034ed 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP sconosciuto torbutton.circuit_display.onion_site = sito Onion torbutton.circuit_display.this_browser = Questo browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Ripetitore torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Paese sconosciuto +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Per saperne di piÃ¹ torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, cosÃ¬ si riduce la possibilitÃ di che tu sia tracciato in linea. torbutton.panel.tooltip.disabled = Fai clic per attivare Tor torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 04549c0..359dcf4 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -47,4 +47,5 @@ <!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 ãµãŒããã"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index b8735d0..dec68bf 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = ãã®ãã©ãŠã¶ãŒ torbutton.circuit_display.relay = ãªã¬ãŒ torbutton.circuit_display.tor_bridge = ããªããž torbutton.circuit_display.unknown_country = äžæãªåœ +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = ããã«ç¥ã torbutton.content_sizer.margin_tooltip = Tor Browser ã¯ãŠã£ã³ããŠã®ãµã€ãºãå¹³å¡ã«ããããã«ãã®ããŒãžã³ãè¿œå ããŸããããã«ãããããªãã®ããšããªã³ã©ã€ã³ã§è¿œè·¡ãã«ããããŸãã torbutton.panel.tooltip.disabled = ã¯ãªãã¯ããŠTorãæå¹ã«ãã torbutton.panel.tooltip.enabled = ã¯ãªãã¯ããŠTorãç¡å¹ã«ãã diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index f3f2093..835a7cc 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -47,4 +47,5 @@ <!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 íë¡"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index 1f1054a..7ec0238 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = ìží°ë· torbutton.circuit_display.ip_unknown = ë¯žíìž IP torbutton.circuit_display.onion_site = Onion ì¬ìŽíž torbutton.circuit_display.this_browser = ìŽ ëžëŒì°ì -torbutton.circuit_display.relay = ì€ê³ +torbutton.circuit_display.relay = ì€ê³ìë² torbutton.circuit_display.tor_bridge = ëžëŠ¿ì§ torbutton.circuit_display.unknown_country = ë¯žíìž êµê° +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = ë ììë³Žêž° torbutton.content_sizer.margin_tooltip = Tor ëžëŒì°ì ë ìŽ ì¬ë°±ì ì¶ê°íì¬ ì°œì ëë¹ì ëìŽë¥Œ ìŒë°í ììŒ ìšëŒìžìì ì¬ì©ìë¥Œ ì¶ì íë êž°ë¥ì ìœí ìíµëë€. torbutton.panel.tooltip.disabled = Torë¥Œ íì±ííë €ë©Ž íŽëŠ torbutton.panel.tooltip.enabled = Torë¥Œ ë¹íì±ííë €ë©Ž íŽëŠ diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index ce0e13a..7b7e6db 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -47,4 +47,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 87595e2..ccdac33 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP-adres onbekend torbutton.circuit_display.onion_site = Onion-site torbutton.circuit_display.this_browser = Deze browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Lees meer torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 47e21ca..2ceab63 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "NiektÃ³re fonty i symbole sÄ wyÅÄczone."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "NiektÃ³re fonty, ikony, symbole i obrazki sÄ wyÅÄczone."> <!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"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 7164f69..aea4730 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP nieznany torbutton.circuit_display.onion_site = strona Onion torbutton.circuit_display.this_browser = Ta przeglÄdarka -torbutton.circuit_display.relay = przekaÅºnik +torbutton.circuit_display.relay = PrzekaÅºnik torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Nieznane paÅstwo +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Dowiedz siÄ wiÄcej torbutton.content_sizer.margin_tooltip = PrzeglÄdarka Tor dodaje ten margines po to, aby szerokoÅÄ i wysokoÅÄ okna Twojej przeglÄdarki byÅa mniej charakterystyczna, dziÄki temu zmniejszysz szanse Åledzenia Ciebie online. torbutton.panel.tooltip.disabled = Kliknij tutaj, aby wÅÄczyÄ Tora torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyÅÄczyÄ Tora diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 2798ee0..64e87c2 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -47,4 +47,5 @@ <!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 "Clicar para tocar ou ver Ã¡udio ou vÃdeo (mÃdia HTML5)."> -<!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties index 6c61a97..df5f7fe 100644 --- a/src/chrome/locale/pt-BR/torbutton.properties +++ b/src/chrome/locale/pt-BR/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP desconhecido torbutton.circuit_display.onion_site = Site Onion torbutton.circuit_display.this_browser = Este navegador -torbutton.circuit_display.relay = retransmitir +torbutton.circuit_display.relay = RelÃª torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = PaÃs desconhecido +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Aprenda mais torbutton.content_sizer.margin_tooltip = O Navegador Tor inclui esta margem para que a altura e a largura da janela sejam menos distinguÃveis, o que reduz a possibilidade de que alguÃ©m rastreie a sua navegaÃ§Ã£o . torbutton.panel.tooltip.disabled = Clique para habilitar o Tor torbutton.panel.tooltip.enabled = Clique para desabilitar o Tor diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 50063ce..7ca05b7 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -47,4 +47,5 @@ <!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 ÐŽÐ»Ñ ÑÑÐŸÐ³ÐŸ ÑÐ°Ð¹ÑÐ°"> +<!ENTITY torbutton.circuit_display.title "Ð¡ÑÐµÐŒÐ° Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "ÐÐŸÐ²Ð°Ñ ÑÑÐµÐŒÐ° ÐŽÐ»Ñ ÑÑÐŸÐ³ÐŸ Ð¡Ð°Ð¹ÑÐ°"> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 5f6f439..2194c84 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = ÐÐœÑÐµÑÐœÐµÑ torbutton.circuit_display.ip_unknown = IP ÐœÐµÐžÐ·Ð²ÐµÑÑÐµÐœ torbutton.circuit_display.onion_site = "ÐÑÐºÐŸÐ²ÑÐ¹" ÑÐ°Ð¹Ñ torbutton.circuit_display.this_browser = ÐÑÐŸÑ Ð±ÑÐ°ÑÐ·ÐµÑ -torbutton.circuit_display.relay = ÑÐ·ÐµÐ» +torbutton.circuit_display.relay = Ð ÐµÑÑÐ°ÐœÑÐ»ÑÑÐŸÑ torbutton.circuit_display.tor_bridge = Ð ÐµÑÑÐ°ÐœÑÐ»ÑÑÐŸÑ torbutton.circuit_display.unknown_country = ÐÐµÐžÐ·Ð²ÐµÑÑÐœÐ°Ñ ÑÑÑÐ°ÐœÐ° +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = ÐÐ°Ñ [Guard] ÑÐ·ÐµÐ» ÐœÐµ ÐŒÐŸÐ¶ÐµÑ Ð±ÑÑÑ ÐžÐ·ÐŒÐµÐœÐµÐœ. +torbutton.circuit_display.learn_more = ÐÐŸÐŽÑÐŸÐ±ÐœÐµÐµ torbutton.content_sizer.margin_tooltip = Tor Browser ÐŽÐŸÐ±Ð°Ð²Ð»ÑÐµÑ ÑÑÐŸÑ ÐŸÑÑÑÑÐ¿, ÑÑÐŸÐ±Ñ ÑÐžÑÐžÐœÐ° Ðž Ð²ÑÑÐŸÑÐ° ÐŸÐºÐœÐ° Ð±ÑÐ»Ðž ÐŒÐµÐœÐµÐµ ÑÐ·ÐœÐ°Ð²Ð°ÐµÐŒÑÐŒÐž, ÑÑÐŸ ÑÑÐ»ÐŸÐ¶ÐœÑÐµÑ Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸÑÑÑ ÐŸÑÑÐ»ÐµÐŽÐžÑÑ ÐÐ°Ñ Ð² ÑÐµÑÐž. torbutton.panel.tooltip.disabled = ÐÐ°Ð¶ÐŒÐžÑÐµ, ÑÑÐŸÐ±Ñ Ð²ÐºÐ»ÑÑÐžÑÑ Tor torbutton.panel.tooltip.enabled = ÐÐ°Ð¶ÐŒÐžÑÐµ, ÑÑÐŸÐ±Ñ ÐŸÑÐºÐ»ÑÑÐžÑÑ Tor diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index aac0ea8..e61d393 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Vissa typsnitt och matte symboler Ã€r inaktiverade."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Vissa typsnitt, ikoner, matte symboler och bilder Ã€r inaktiverade."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Ljud och video (HTML5-media) Ã€r klicka-fÃ¶r-att-spel."> -<!ENTITY torbutton.circuit_display.title "Tor-krets fÃ¶r den hÃ€r webbplatsen"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 7f0765d..c78ff5c 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = OkÃ€nd IP-adress. torbutton.circuit_display.onion_site = Onion webbplats torbutton.circuit_display.this_browser = Denna webblÃ€sare -torbutton.circuit_display.relay = relÃ€ +torbutton.circuit_display.relay = Router torbutton.circuit_display.tor_bridge = Brygga torbutton.circuit_display.unknown_country = OkÃ€nt land +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = LÃ€s mer torbutton.content_sizer.margin_tooltip = Tor Browser lÃ€gger till denna marginal fÃ¶r att gÃ¶ra bredden och hÃ¶jden pÃ¥ ditt fÃ¶nster mindre tydlig. DÃ€rmed minskas mÃ¶jligheten att spÃ¥ra dig. torbutton.panel.tooltip.disabled = Klicka fÃ¶r att aktivera Tor torbutton.panel.tooltip.enabled = Klicka fÃ¶r att inaktivera Tor diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index a696ebe..be0a563 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -47,4 +47,5 @@ <!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"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index ed7ee39..7b4b681 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Ä°nternet torbutton.circuit_display.ip_unknown = Bilinmeyen IP torbutton.circuit_display.onion_site = SoÄan sitesi torbutton.circuit_display.this_browser = Bu tarayÄ±cÄ± -torbutton.circuit_display.relay = aktarÄ±cÄ± +torbutton.circuit_display.relay = Anahtarlama torbutton.circuit_display.tor_bridge = KÃ¶prÃŒ torbutton.circuit_display.unknown_country = Bilinmeyen Ãlke +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = AyrÄ±ntÄ±lÄ± bilgi torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin geniÅlik ve yÃŒksekliÄini daha az ayÄ±rt edilebilir duruma getirmek iÃ§in kenar boÅluklarÄ± ekleyerek kiÅilerin sizi Ã§evrim iÃ§i olarak izleme yeteneÄini azaltÄ±r. torbutton.panel.tooltip.disabled = Tor yazÄ±lÄ±mÄ±nÄ± etkinleÅtirmek iÃ§in tÄ±klayÄ±n torbutton.panel.tooltip.enabled = Tor yazÄ±lÄ±mÄ±nÄ± devre dÄ±ÅÄ± bÄ±rakmak iÃ§in tÄ±klayÄ±n diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index d86b90c..6bbd492 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -47,4 +47,5 @@ <!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."> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 34a800c..b7b8a51 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = Äá»a chá» IP khÃŽng biáº¿t Äáº¿n torbutton.circuit_display.onion_site = Trang cá»§ hÃ nh torbutton.circuit_display.this_browser = TrÃ¬nh duyá»t nÃ y -torbutton.circuit_display.relay = tiáº¿p sá»©c +torbutton.circuit_display.relay = Tiáº¿p sá»©c torbutton.circuit_display.tor_bridge = Cáº§u ná»i torbutton.circuit_display.unknown_country = Äáº¥t nÆ°á»c khÃŽng ÄÆ°á»£c biáº¿t Äáº¿n +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Biáº¿t thÃªm torbutton.content_sizer.margin_tooltip = TrÃ¬nh duyá»t Tor thÃªm lá» nÃ y Äá» lÃ m cho chiá»u rá»ng vÃ chiá»u cao cá»§a mÃ n hÃ¬nh cá»§a báº¡n Ãt dá» bá» phÃ¢n biá»t hÆ¡n, vÃ vÃ¬ tháº¿ giáº£m kháº£ nÄng cá»§a nhá»¯ng ngÆ°á»i theo dÃµi báº¡n trá»±c tuyáº¿n. torbutton.panel.tooltip.disabled = Nháº¥n Äá» báºt Tor torbutton.panel.tooltip.enabled = Nháº¥n Äá» táº¯t Tor diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index a43d991..d8ecba2 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -47,4 +47,5 @@ <!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 çº¿è·¯"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 398b639..b00744b 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = æ¬æµè§åš torbutton.circuit_display.relay = äžç»§ torbutton.circuit_display.tor_bridge = çœæ¡¥ torbutton.circuit_display.unknown_country = æªç¥åœå®¶ +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = è¯Šç»äºè§£ torbutton.content_sizer.margin_tooltip = Tor æµè§åšæ·»å äºäžäºèŸ¹æ¡ïŒä»¥éäœçªå£å€§å°çç¬ç¹æ§ïŒä»€åšçº¿è·èžªçæ§ååŸæŽå å°éŸã torbutton.panel.tooltip.disabled = ç¹å»å¯çš Tor torbutton.panel.tooltip.enabled = ç¹å»çŠçš Tor

1 0

[torbutton/master] Bug 26235: Hide new unusable items from help menu (ESR60)
by gk＠torproject.org 30 May '18

30 May '18

commit 66048f2ad3c2708aec11d7414ec189e868c0d487 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 29 16:34:13 2018 -0400 Bug 26235: Hide new unusable items from help menu (ESR60) --- src/chrome/content/menu-overlay.xul | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index f6c6fbd..1e812cc 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -14,6 +14,8 @@ <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" removeelement="true"/> <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" removeelement="true"/>  + <box id="feedbackPage"/> + <box id="helpSafeMode"/> <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_16472_v16'
by gk＠torproject.org 29 May '18

29 May '18

commit 6b4cb8b83c0a52e596db45b64551162ff2fce947 Merge: 473342e b24500f Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 19:51:30 2018 +0000 Merge remote-tracking branch 'boklm/bug_16472_v16' keyring/binutils.gpg | Bin 25772 -> 1169 bytes projects/binutils/64bit-fixups.patch | 31 +- projects/binutils/binutils-224-gold.patch | 98 -- projects/binutils/build | 10 +- projects/binutils/config | 11 +- projects/binutils/enable-reloc-section-ld.patch | 83 +- projects/binutils/fix-warning-bfd.patch | 186 ---- .../binutils/fix-windows-reproducibility.patch | 1034 ++++++++++++++++++++ projects/binutils/peXXigen.patch | 43 +- projects/mingw-w64/build | 2 +- projects/nsis/build | 9 +- projects/nsis/config | 1 + projects/nsis/no-insert-timestamp.patch | 27 + projects/openssl/config | 2 +- projects/selfrando/config | 2 +- projects/zlib/build | 4 +- rbm.conf | 2 +- 17 files changed, 1174 insertions(+), 371 deletions(-)

1 0

[tor-browser-build/master] Bug 16472: update binutils to 2.26.1
by gk＠torproject.org 29 May '18

29 May '18

commit b24500f6880e2c461050e248c0f7e587b5201d51 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 14 13:31:29 2018 +0100 Bug 16472: update binutils to 2.26.1 --- keyring/binutils.gpg | Bin 25772 -> 1169 bytes projects/binutils/64bit-fixups.patch | 31 +- projects/binutils/binutils-224-gold.patch | 98 -- projects/binutils/build | 10 +- projects/binutils/config | 11 +- projects/binutils/enable-reloc-section-ld.patch | 83 +- projects/binutils/fix-warning-bfd.patch | 186 ---- .../binutils/fix-windows-reproducibility.patch | 1034 ++++++++++++++++++++ projects/binutils/peXXigen.patch | 43 +- projects/mingw-w64/build | 2 +- projects/nsis/build | 9 +- projects/nsis/config | 1 + projects/nsis/no-insert-timestamp.patch | 27 + projects/openssl/config | 2 +- projects/selfrando/config | 2 +- projects/zlib/build | 4 +- rbm.conf | 2 +- 17 files changed, 1174 insertions(+), 371 deletions(-) diff --git a/keyring/binutils.gpg b/keyring/binutils.gpg index f24bb01..2de205d 100644 Binary files a/keyring/binutils.gpg and b/keyring/binutils.gpg differ diff --git a/projects/binutils/64bit-fixups.patch b/projects/binutils/64bit-fixups.patch index 33c0297..7dc1294 100644 --- a/projects/binutils/64bit-fixups.patch +++ b/projects/binutils/64bit-fixups.patch @@ -1,14 +1,19 @@ -From f3ba95e14437f10de8b8f296930ff2a8495d18c6 Mon Sep 17 00:00:00 2001 +From 05164a1162d5f6f696d7f7c4b1bc61ef06d1c288 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Tue, 12 Sep 2017 07:21:16 +0000 Subject: [PATCH] 64bit fixups +--- + ld/emultempl/pep.em | 4 ++-- + ld/pep-dll.c | 1 + + ld/pep-dll.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b566903b14..27006bdf79 100644 +index fccbd63..f7c0a57 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -730,7 +730,7 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -742,7 +742,7 @@ gld${EMULATION_NAME}_handle_option (int optc) pep_dll_exclude_all_symbols = 1; break; case OPTION_ENABLE_RELOC_SECTION: @@ -17,17 +22,17 @@ index b566903b14..27006bdf79 100644 break; case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); -@@ -1623,7 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) - +@@ -1862,7 +1862,7 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT - if (link_info.shared -- || (!link_info.relocatable && pe_dll_enable_reloc_section) -+ || (!link_info.relocatable && pep_dll_enable_reloc_section) - || (!link_info.relocatable && pep_def_file->num_exports != 0)) + if (bfd_link_pic (&link_info) + || (!bfd_link_relocatable (&link_info) +- && pe_dll_enable_reloc_section) ++ && pep_dll_enable_reloc_section) + || (!bfd_link_relocatable (&link_info) + && pep_def_file->num_exports != 0)) { - pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pep-dll.c b/ld/pep-dll.c -index 0e5e8b1523..b5f99b90e0 100644 +index b8c017f..5ad5733 100644 --- a/ld/pep-dll.c +++ b/ld/pep-dll.c @@ -31,6 +31,7 @@ @@ -39,7 +44,7 @@ index 0e5e8b1523..b5f99b90e0 100644 #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports diff --git a/ld/pep-dll.h b/ld/pep-dll.h -index 1e7e3d65d4..c31e69cc8e 100644 +index 0a27c1f..95d9c15 100644 --- a/ld/pep-dll.h +++ b/ld/pep-dll.h @@ -31,6 +31,7 @@ extern def_file * pep_def_file; @@ -51,5 +56,5 @@ index 1e7e3d65d4..c31e69cc8e 100644 extern int pep_dll_stdcall_aliases; extern int pep_dll_warn_dup_exports; -- -2.14.1 +2.1.4 diff --git a/projects/binutils/binutils-224-gold.patch b/projects/binutils/binutils-224-gold.patch deleted file mode 100644 index a45e49c..0000000 --- a/projects/binutils/binutils-224-gold.patch +++ /dev/null @@ -1,98 +0,0 @@ -From f984741df04cd68bb116073fdfa9405808810ab4 Mon Sep 17 00:00:00 2001 -From: Cary Coutant <ccoutant(a)google.com> -Date: Wed, 5 Feb 2014 22:59:02 -0800 -Subject: [PATCH] Fix issues with gold undefined symbol diagnostics. - -PR binutils/15435 complains that gold issues a visibility error for an -weak undefined symbol with hidden visibility. The message should be -suppressed if the symbol is a weak undef. - -An earlier patch to add an extra note about key functions when a class's -vtable symbol is undefined missed a case where the reference to the -vtable came from a shared library. This patch moves the check to a -lower-level routine that catches both cases. - -gold/ - -2014-02-05 Cary Coutant <ccoutant(a)google.com> - - * errors.cc (Errors::undefined_symbol): Move undef vtable symbol - check to here. - * target-reloc.h (is_strong_undefined): New function. - (relocate_section): Move undef vtable symbol check from here. - Check for is_strong_undefined. - -diff --git a/gold/ChangeLog b/gold/ChangeLog -index dcf7ed41f8..dd7ef72980 100644 ---- a/gold/ChangeLog -+++ b/gold/ChangeLog -@@ -1,3 +1,14 @@ -+2014-02-05 Cary Coutant <ccoutant(a)google.com> -+ -+ Fix issues with gold undefined symbol diagnostics. -+ -+ PR binutils/15435 -+ * errors.cc (Errors::undefined_symbol): Move undef vtable symbol -+ check to here. -+ * target-reloc.h (is_strong_undefined): New function. -+ (relocate_section): Move undef vtable symbol check from here. -+ Check for is_strong_undefined. -+ - 2013-11-22 Cary Coutant <ccoutant(a)google.com> - - * testsuite/Makefile.am (exception_x86_64_bnd_test): Use in-tree -diff --git a/gold/errors.cc b/gold/errors.cc -index b79764bd1d..98db0fdd86 100644 ---- a/gold/errors.cc -+++ b/gold/errors.cc -@@ -193,6 +193,11 @@ Errors::undefined_symbol(const Symbol* sym, const std::string& location) - fprintf(stderr, - _("%s: %s: undefined reference to '%s', version '%s'\n"), - location.c_str(), zmsg, sym->demangled_name().c_str(), version); -+ -+ if (sym->is_cxx_vtable()) -+ gold_info(_("%s: the vtable symbol may be undefined because " -+ "the class is missing its key function"), -+ program_name); - } - - // Issue a debugging message. -diff --git a/gold/target-reloc.h b/gold/target-reloc.h -index b544c78f37..d609bcbaa8 100644 ---- a/gold/target-reloc.h -+++ b/gold/target-reloc.h -@@ -144,6 +144,12 @@ class Default_comdat_behavior - } - }; - -+inline bool -+is_strong_undefined(const Symbol* sym) -+{ -+ return sym->is_undefined() && sym->binding() != elfcpp::STB_WEAK; -+} -+ - // Give an error for a symbol with non-default visibility which is not - // defined locally. - -@@ -411,16 +417,10 @@ relocate_section( - } - - if (issue_undefined_symbol_error(sym)) -- { -- gold_undefined_symbol_at_location(sym, relinfo, i, offset); -- if (sym->is_cxx_vtable()) -- gold_info(_("%s: the vtable symbol may be undefined because " -- "the class is missing its key function"), -- program_name); -- } -+ gold_undefined_symbol_at_location(sym, relinfo, i, offset); - else if (sym != NULL - && sym->visibility() != elfcpp::STV_DEFAULT -- && (sym->is_undefined() || sym->is_from_dynobj())) -+ && (is_strong_undefined(sym) || sym->is_from_dynobj())) - visibility_error(sym); - - if (sym != NULL && sym->has_warning()) --- -2.11.0 - diff --git a/projects/binutils/build b/projects/binutils/build index ee6db1a..0d1c062 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -25,17 +25,13 @@ 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 + # fix build reproducibility of Windows builds by reverting commit 13e570f80c. + # See bug 16472. + patch -p1 < ../fix-windows-reproducibility.patch [% END -%] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch [% END -%] -[% 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 -[% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j[% c("buildconf/num_procs") %] make install diff --git a/projects/binutils/config b/projects/binutils/config index 5c35588..1f992a2 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.24 +version: 2.26.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' @@ -10,6 +10,9 @@ targets: windows: var: configure_opt: '--target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-deterministic-archives' + arch_deps: + # texinfo required for fix-windows-reproducibility.patch + - texinfo input_files: - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.bz2 @@ -19,11 +22,9 @@ 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 enable: '[% c("var/windows") %]' - - filename: binutils-224-gold.patch - enable: '[% c("var/linux") %]' + - filename: fix-windows-reproducibility.patch + enable: '[% c("var/windows") %]' diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index f393f51..a6600c3 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,30 +1,29 @@ -From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 +From fba503a78c50d6134943245d55e820f53e8f19cd Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. - --- - ld/emultempl/pe.em | 6 +++++ - ld/emultempl/pep.em | 8 ++++++- + ld/emultempl/pe.em | 7 ++++++ + ld/emultempl/pep.em | 11 ++++++++-- ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- ld/pe-dll.h | 1 + - 4 files changed, 50 insertions(+), 28 deletions(-) + 4 files changed, 53 insertions(+), 29 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 5d6da9e..14c07f7 100644 +index 339b7c5..3958b81 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -268,6 +268,7 @@ fragment <<EOF - #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) - /* Determinism. */ +@@ -272,6 +272,7 @@ fragment <<EOF #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) static void gld${EMULATION_NAME}_add_options -@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options +@@ -315,6 +316,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -32,7 +31,7 @@ index 5d6da9e..14c07f7 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -782,6 +784,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -42,29 +41,30 @@ index 5d6da9e..14c07f7 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) - if (link_info.shared +@@ -2076,6 +2081,8 @@ gld_${EMULATION_NAME}_finish (void) #if !defined(TARGET_IS_shpe) - || (!link_info.relocatable && pe_def_file->num_exports != 0) -+ || (!link_info.relocatable && pe_dll_enable_reloc_section) + || (!bfd_link_relocatable (&link_info) + && pe_def_file->num_exports != 0) ++ || (!bfd_link_relocatable (&link_info) ++ && pe_dll_enable_reloc_section) #endif ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b738800..b566903 100644 +index c253d2f..fccbd63 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -242,7 +242,8 @@ enum options - OPTION_NO_BIND, - OPTION_WDM_DRIVER, +@@ -246,7 +246,8 @@ enum options OPTION_INSERT_TIMESTAMP, -- OPTION_TERMINAL_SERVER_AWARE -+ OPTION_TERMINAL_SERVER_AWARE, + OPTION_NO_INSERT_TIMESTAMP, + OPTION_TERMINAL_SERVER_AWARE, +- OPTION_BUILD_ID ++ OPTION_BUILD_ID, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options +@@ -288,6 +289,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -72,7 +72,7 @@ index b738800..b566903 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -739,6 +741,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -82,19 +82,22 @@ index b738800..b566903 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) - +@@ -1857,7 +1862,9 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT - if (link_info.shared -+ || (!link_info.relocatable && pe_dll_enable_reloc_section) - || (!link_info.relocatable && pep_def_file->num_exports != 0)) + if (bfd_link_pic (&link_info) + || (!bfd_link_relocatable (&link_info) +- && pep_def_file->num_exports != 0)) ++ && pe_dll_enable_reloc_section) ++ || (!bfd_link_relocatable (&link_info) ++ && pep_def_file->num_exports != 0)) { pep_dll_fill_sections (link_info.output_bfd, &link_info); + if (command_line.out_implib_filename) diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index e9e133b..4230dc3 100644 +index c398f23..3797f1a 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; +@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -102,10 +105,10 @@ index e9e133b..4230dc3 100644 int pe_dll_kill_ats = 0; int pe_dll_stdcall_aliases = 0; int pe_dll_warn_dup_exports = 0; -@@ -3370,8 +3371,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) +@@ -3430,8 +3431,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) process_def_file_and_drectve (abfd, info); - if (pe_def_file->num_exports == 0 && !info->shared) + if (pe_def_file->num_exports == 0 && !bfd_link_pic (info)) - return; - + { @@ -120,7 +123,7 @@ index e9e133b..4230dc3 100644 generate_edata (abfd, info); build_filler_bfd (1); pe_output_file_set_long_section_names (filler_bfd); -@@ -3386,13 +3394,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) +@@ -3446,13 +3454,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) pe_output_file_set_long_section_names (filler_bfd); } @@ -136,13 +139,13 @@ index e9e133b..4230dc3 100644 generate_reloc (abfd, info); if (reloc_sz > 0) { -@@ -3409,38 +3413,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) +@@ -3469,38 +3473,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) lang_do_assignments (lang_final_phase_enum); } - fill_edata (abfd, info); - -- if (info->shared && !info->pie) +- if (bfd_link_dll (info)) - pe_data (abfd)->dll = 1; - - edata_s->contents = edata_d; @@ -174,7 +177,7 @@ index e9e133b..4230dc3 100644 - /* Resize the sections. */ - lang_reset_memory_regions (); - lang_size_sections (NULL, TRUE); -+ if (info->shared && !info->pie) ++ if (bfd_link_pic (info) && !bfd_link_pie (info)) + pe_data (abfd)->dll = 1; - /* Redo special stuff. */ @@ -200,10 +203,10 @@ index e9e133b..4230dc3 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 4697390..2bf71d9 100644 +index 48d169b..05ff72b 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -31,6 +31,7 @@ extern def_file *pe_def_file; +@@ -30,6 +30,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -212,5 +215,5 @@ index 4697390..2bf71d9 100644 extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; -- -2.0.1 +2.1.4 diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch deleted file mode 100644 index fa04405..0000000 --- a/projects/binutils/fix-warning-bfd.patch +++ /dev/null @@ -1,186 +0,0 @@ -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/binutils/fix-windows-reproducibility.patch b/projects/binutils/fix-windows-reproducibility.patch new file mode 100644 index 0000000..1fc5987 --- /dev/null +++ b/projects/binutils/fix-windows-reproducibility.patch @@ -0,0 +1,1034 @@ +From c6df45304e92aa2d7e9f2d8311ae5a0b1543daa8 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Wed, 16 May 2018 11:07:52 +0200 +Subject: [PATCH] Revert "Fix LTO vs. COFF archives" + +This reverts commit 13e570f80cbfb299a8858ce6830e91a6cb40ab7b. +--- + bfd/aoutx.h | 2 - + bfd/cofflink.c | 116 +++++++++++++++--- + bfd/ecoff.c | 164 +++++++++++++++++++++++-- + bfd/elflink.c | 53 ++++++-- + bfd/libbfd-in.h | 4 +- + bfd/libbfd.h | 4 +- + bfd/linker.c | 366 ++++++++++++++++++++++++++++++++++++++++---------------- + bfd/pdp11.c | 4 +- + bfd/xcofflink.c | 4 +- + 9 files changed, 560 insertions(+), 157 deletions(-) + +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index 9385a98..6ca9c58 100644 +--- a/bfd/aoutx.h ++++ b/bfd/aoutx.h +@@ -3405,8 +3405,6 @@ aout_link_check_ar_symbols (bfd *abfd, + static bfd_boolean + aout_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded) + { + bfd *oldbfd; +diff --git a/bfd/cofflink.c b/bfd/cofflink.c +index 2782795..3a82640 100644 +--- a/bfd/cofflink.c ++++ b/bfd/cofflink.c +@@ -29,11 +29,9 @@ + #include "libcoff.h" + #include "safe-ctype.h" + +-static bfd_boolean coff_link_add_object_symbols (bfd *, struct bfd_link_info *); +-static bfd_boolean coff_link_check_archive_element +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *); +-static bfd_boolean coff_link_add_symbols (bfd *, struct bfd_link_info *); ++static bfd_boolean coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info); ++static bfd_boolean coff_link_check_archive_element (bfd *abfd, struct bfd_link_info *info, bfd_boolean *pneeded); ++static bfd_boolean coff_link_add_symbols (bfd *abfd, struct bfd_link_info *info); + + /* Return TRUE if SYM is a weak, external symbol. */ + #define IS_WEAK_EXTERNAL(abfd, sym) \ +@@ -192,6 +190,74 @@ coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) + return TRUE; + } + ++/* Look through the symbols to see if this object file should be ++ included in the link. */ ++ ++static bfd_boolean ++coff_link_check_ar_symbols (bfd *abfd, ++ struct bfd_link_info *info, ++ bfd_boolean *pneeded, ++ bfd **subsbfd) ++{ ++ bfd_size_type symesz; ++ bfd_byte *esym; ++ bfd_byte *esym_end; ++ ++ *pneeded = FALSE; ++ ++ symesz = bfd_coff_symesz (abfd); ++ esym = (bfd_byte *) obj_coff_external_syms (abfd); ++ esym_end = esym + obj_raw_syment_count (abfd) * symesz; ++ while (esym < esym_end) ++ { ++ struct internal_syment sym; ++ enum coff_symbol_classification classification; ++ ++ bfd_coff_swap_sym_in (abfd, esym, &sym); ++ ++ classification = bfd_coff_classify_symbol (abfd, &sym); ++ if (classification == COFF_SYMBOL_GLOBAL ++ || classification == COFF_SYMBOL_COMMON) ++ { ++ const char *name; ++ char buf[SYMNMLEN + 1]; ++ struct bfd_link_hash_entry *h; ++ ++ /* This symbol is externally visible, and is defined by this ++ object file. */ ++ name = _bfd_coff_internal_syment_name (abfd, &sym, buf); ++ if (name == NULL) ++ return FALSE; ++ h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); ++ ++ /* Auto import. */ ++ if (!h ++ && info->pei386_auto_import ++ && CONST_STRNEQ (name, "__imp_")) ++ h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE); ++ ++ /* We are only interested in symbols that are currently ++ undefined. If a symbol is currently known to be common, ++ COFF linkers do not bring in an object file which defines ++ it. */ ++ if (h != (struct bfd_link_hash_entry *) NULL ++ && h->type == bfd_link_hash_undefined) ++ { ++ if (!(*info->callbacks ++ ->add_archive_element) (info, abfd, name, subsbfd)) ++ return FALSE; ++ *pneeded = TRUE; ++ return TRUE; ++ } ++ } ++ ++ esym += (sym.n_numaux + 1) * symesz; ++ } ++ ++ /* We do not need this object file. */ ++ return TRUE; ++} ++ + /* Check a single archive element to see if we need to include it in + the link. *PNEEDED is set according to whether this element is + needed in the link or not. This is called via +@@ -200,23 +266,41 @@ coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) + static bfd_boolean + coff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { +- *pneeded = FALSE; ++ bfd *oldbfd; ++ bfd_boolean needed; + +- /* We are only interested in symbols that are currently undefined. +- If a symbol is currently known to be common, COFF linkers do not +- bring in an object file which defines it. */ +- if (h->type != bfd_link_hash_undefined) +- return TRUE; ++ if (!_bfd_coff_get_external_symbols (abfd)) ++ return FALSE; + +- if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd)) ++ oldbfd = abfd; ++ if (!coff_link_check_ar_symbols (abfd, info, pneeded, &abfd)) + return FALSE; +- *pneeded = TRUE; + +- return coff_link_add_object_symbols (abfd, info); ++ needed = *pneeded; ++ if (needed) ++ { ++ /* Potentially, the add_archive_element hook may have set a ++ substitute BFD for us. */ ++ if (abfd != oldbfd) ++ { ++ if (!info->keep_memory ++ && !_bfd_coff_free_symbols (oldbfd)) ++ return FALSE; ++ if (!_bfd_coff_get_external_symbols (abfd)) ++ return FALSE; ++ } ++ if (!coff_link_add_symbols (abfd, info)) ++ return FALSE; ++ } ++ ++ if (!info->keep_memory || !needed) ++ { ++ if (!_bfd_coff_free_symbols (abfd)) ++ return FALSE; ++ } ++ return TRUE; + } + + /* Add all the symbols from an object file to the hash table. */ +diff --git a/bfd/ecoff.c b/bfd/ecoff.c +index 01f51e6..2c915f0 100644 +--- a/bfd/ecoff.c ++++ b/bfd/ecoff.c +@@ -3500,29 +3500,171 @@ ecoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) + return FALSE; + } + ++/* Factored out from ecoff_link_check_archive_element. */ ++ ++static bfd_boolean ++read_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size, ++ bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd, ++ const struct ecoff_backend_data * const backend) ++{ ++ if (! ecoff_slurp_symbolic_header (abfd)) ++ return FALSE; ++ ++ /* If there are no symbols, we don't want it. */ ++ if (bfd_get_symcount (abfd) == 0) ++ return TRUE; ++ ++ *symhdr = &ecoff_data (abfd)->debug_info.symbolic_header; ++ ++ *external_ext_size = backend->debug_swap.external_ext_size; ++ *esize = (*symhdr)->iextMax * *external_ext_size; ++ *external_ext = bfd_malloc (*esize); ++ if (*external_ext == NULL && *esize != 0) ++ return FALSE; ++ ++ if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbExtOffset, SEEK_SET) != 0 ++ || bfd_bread (*external_ext, *esize, abfd) != *esize) ++ return FALSE; ++ ++ *ssext = (char *) bfd_malloc ((bfd_size_type) (*symhdr)->issExtMax); ++ if (*ssext == NULL && (*symhdr)->issExtMax != 0) ++ return FALSE; ++ ++ if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbSsExtOffset, SEEK_SET) != 0 ++ || (bfd_bread (*ssext, (bfd_size_type) (*symhdr)->issExtMax, abfd) ++ != (bfd_size_type) (*symhdr)->issExtMax)) ++ return FALSE; ++ return TRUE; ++} ++ ++static bfd_boolean ++reread_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size, ++ bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd, ++ const struct ecoff_backend_data * const backend) ++{ ++ if (*external_ext != NULL) ++ free (*external_ext); ++ *external_ext = NULL; ++ if (*ssext != NULL) ++ free (*ssext); ++ *ssext = NULL; ++ return read_ext_syms_and_strs (symhdr, external_ext_size, esize, ++ external_ext, ssext, abfd, backend); ++} ++ + /* This is called if we used _bfd_generic_link_add_archive_symbols + because we were not dealing with an ECOFF archive. */ + + static bfd_boolean + ecoff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { ++ const struct ecoff_backend_data * const backend = ecoff_backend (abfd); ++ void (* const swap_ext_in) (bfd *, void *, EXTR *) ++ = backend->debug_swap.swap_ext_in; ++ HDRR *symhdr; ++ bfd_size_type external_ext_size = 0; ++ void * external_ext = NULL; ++ bfd_size_type esize = 0; ++ char *ssext = NULL; ++ char *ext_ptr; ++ char *ext_end; ++ + *pneeded = FALSE; + +- /* Unlike the generic linker, we do not pull in elements because +- of common symbols. */ +- if (h->type != bfd_link_hash_undefined) +- return TRUE; ++ /* Read in the external symbols and external strings. */ ++ if (!read_ext_syms_and_strs (&symhdr, &external_ext_size, &esize, ++ &external_ext, &ssext, abfd, backend)) ++ goto error_return; + +- /* Include this element. */ +- if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd)) +- return FALSE; +- *pneeded = TRUE; ++ /* If there are no symbols, we don't want it. */ ++ if (bfd_get_symcount (abfd) == 0) ++ goto successful_return; + +- return ecoff_link_add_object_symbols (abfd, info); ++ /* Look through the external symbols to see if they define some ++ symbol that is currently undefined. */ ++ ext_ptr = (char *) external_ext; ++ ext_end = ext_ptr + esize; ++ for (; ext_ptr < ext_end; ext_ptr += external_ext_size) ++ { ++ EXTR esym; ++ bfd_boolean def; ++ const char *name; ++ bfd *oldbfd; ++ struct bfd_link_hash_entry *h; ++ ++ (*swap_ext_in) (abfd, (void *) ext_ptr, &esym); ++ ++ /* See if this symbol defines something. */ ++ if (esym.asym.st != stGlobal ++ && esym.asym.st != stLabel ++ && esym.asym.st != stProc) ++ continue; ++ ++ switch (esym.asym.sc) ++ { ++ case scText: ++ case scData: ++ case scBss: ++ case scAbs: ++ case scSData: ++ case scSBss: ++ case scRData: ++ case scCommon: ++ case scSCommon: ++ case scInit: ++ case scFini: ++ case scRConst: ++ def = TRUE; ++ break; ++ default: ++ def = FALSE; ++ break; ++ } ++ ++ if (! def) ++ continue; ++ ++ name = ssext + esym.asym.iss; ++ h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); ++ ++ /* Unlike the generic linker, we do not pull in elements because ++ of common symbols. */ ++ if (h == NULL ++ || h->type != bfd_link_hash_undefined) ++ continue; ++ ++ /* Include this element. */ ++ oldbfd = abfd; ++ if (!(*info->callbacks ++ ->add_archive_element) (info, abfd, name, &abfd)) ++ goto error_return; ++ /* Potentially, the add_archive_element hook may have set a ++ substitute BFD for us. */ ++ if (abfd != oldbfd ++ && !reread_ext_syms_and_strs (&symhdr, &external_ext_size, &esize, ++ &external_ext, &ssext, abfd, backend)) ++ goto error_return; ++ if (! ecoff_link_add_externals (abfd, info, external_ext, ssext)) ++ goto error_return; ++ ++ *pneeded = TRUE; ++ goto successful_return; ++ } ++ ++ successful_return: ++ if (external_ext != NULL) ++ free (external_ext); ++ if (ssext != NULL) ++ free (ssext); ++ return TRUE; ++ error_return: ++ if (external_ext != NULL) ++ free (external_ext); ++ if (ssext != NULL) ++ free (ssext); ++ return FALSE; + } + + /* Add the symbols from an archive file to the global hash table. +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 94ab762..164df6b 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -2933,6 +2933,13 @@ elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef) + if (! bfd_check_format (abfd, bfd_object)) + return FALSE; + ++ /* If we have already included the element containing this symbol in the ++ link then we do not need to include it again. Just claim that any symbol ++ it contains is not a definition, so that our caller will not decide to ++ (re)include this element. */ ++ if (abfd->archive_pass) ++ return FALSE; ++ + /* Select the appropriate symbol table. */ + if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0) + hdr = &elf_tdata (abfd)->symtab_hdr; +@@ -4929,8 +4936,20 @@ _bfd_elf_archive_symbol_lookup (bfd *abfd, + } + + /* Add symbols from an ELF archive file to the linker hash table. We +- don't use _bfd_generic_link_add_archive_symbols because we need to +- handle versioned symbols. ++ don't use _bfd_generic_link_add_archive_symbols because of a ++ problem which arises on UnixWare. The UnixWare libc.so is an ++ archive which includes an entry libc.so.1 which defines a bunch of ++ symbols. The libc.so archive also includes a number of other ++ object files, which also define symbols, some of which are the same ++ as those defined in libc.so.1. Correct linking requires that we ++ consider each object file in turn, and include it if it defines any ++ symbols we need. _bfd_generic_link_add_archive_symbols does not do ++ this; it looks through the list of undefined symbols, and includes ++ any object file which defines them. When this algorithm is used on ++ UnixWare, it winds up pulling in libc.so.1 early and defining a ++ bunch of symbols. This means that some of the other objects in the ++ archive are not included in the link, which is incorrect since they ++ precede libc.so.1 in the archive. + + Fortunately, ELF archive handling is simpler than that done by + _bfd_generic_link_add_archive_symbols, which has to allow for a.out +@@ -4945,7 +4964,8 @@ static bfd_boolean + elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + { + symindex c; +- unsigned char *included = NULL; ++ bfd_boolean *defined = NULL; ++ bfd_boolean *included = NULL; + carsym *symdefs; + bfd_boolean loop; + bfd_size_type amt; +@@ -4969,10 +4989,11 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + if (c == 0) + return TRUE; + amt = c; +- amt *= sizeof (*included); +- included = (unsigned char *) bfd_zmalloc (amt); +- if (included == NULL) +- return FALSE; ++ amt *= sizeof (bfd_boolean); ++ defined = (bfd_boolean *) bfd_zmalloc (amt); ++ included = (bfd_boolean *) bfd_zmalloc (amt); ++ if (defined == NULL || included == NULL) ++ goto error_return; + + symdefs = bfd_ardata (abfd)->symdefs; + bed = get_elf_backend_data (abfd); +@@ -4997,7 +5018,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + struct bfd_link_hash_entry *undefs_tail; + symindex mark; + +- if (included[i]) ++ if (defined[i] || included[i]) + continue; + if (symdef->file_offset == last) + { +@@ -5032,8 +5053,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + else if (h->root.type != bfd_link_hash_undefined) + { + if (h->root.type != bfd_link_hash_undefweak) +- /* Symbol must be defined. Don't check it again. */ +- included[i] = TRUE; ++ defined[i] = TRUE; + continue; + } + +@@ -5045,6 +5065,16 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + if (! bfd_check_format (element, bfd_object)) + goto error_return; + ++ /* Doublecheck that we have not included this object ++ already--it should be impossible, but there may be ++ something wrong with the archive. */ ++ if (element->archive_pass != 0) ++ { ++ bfd_set_error (bfd_error_bad_value); ++ goto error_return; ++ } ++ element->archive_pass = 1; ++ + undefs_tail = info->hash->undefs_tail; + + if (!(*info->callbacks +@@ -5082,11 +5112,14 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + } + while (loop); + ++ free (defined); + free (included); + + return TRUE; + + error_return: ++ if (defined != NULL) ++ free (defined); + if (included != NULL) + free (included); + return FALSE; +diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h +index 50a46ac..90c6018 100644 +--- a/bfd/libbfd-in.h ++++ b/bfd/libbfd-in.h +@@ -596,9 +596,7 @@ extern bfd_boolean _bfd_generic_link_add_symbols_collect + /* Generic archive add symbol routine. */ + extern bfd_boolean _bfd_generic_link_add_archive_symbols + (bfd *, struct bfd_link_info *, +- bfd_boolean (*) (bfd *, struct bfd_link_info *, +- struct bfd_link_hash_entry *, const char *, +- bfd_boolean *)); ++ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *)); + + /* Forward declaration to avoid prototype errors. */ + typedef struct bfd_link_hash_entry _bfd_link_hash_entry; +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index 6c48f82..ffb6ea4 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -601,9 +601,7 @@ extern bfd_boolean _bfd_generic_link_add_symbols_collect + /* Generic archive add symbol routine. */ + extern bfd_boolean _bfd_generic_link_add_archive_symbols + (bfd *, struct bfd_link_info *, +- bfd_boolean (*) (bfd *, struct bfd_link_info *, +- struct bfd_link_hash_entry *, const char *, +- bfd_boolean *)); ++ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *)); + + /* Forward declaration to avoid prototype errors. */ + typedef struct bfd_link_hash_entry _bfd_link_hash_entry; +diff --git a/bfd/linker.c b/bfd/linker.c +index abdf5b0..4cff1e7 100644 +--- a/bfd/linker.c ++++ b/bfd/linker.c +@@ -229,16 +229,28 @@ SUBSUBSECTION + @findex _bfd_generic_link_add_archive_symbols + In most cases the work of looking through the symbols in the + archive should be done by the +- <<_bfd_generic_link_add_archive_symbols>> function. ++ <<_bfd_generic_link_add_archive_symbols>> function. This ++ function builds a hash table from the archive symbol table and ++ looks through the list of undefined symbols to see which ++ elements should be included. + <<_bfd_generic_link_add_archive_symbols>> is passed a function + to call to make the final decision about adding an archive + element to the link and to do the actual work of adding the +- symbols to the linker hash table. If the element is to ++ symbols to the linker hash table. ++ ++ The function passed to ++ <<_bfd_generic_link_add_archive_symbols>> must read the ++ symbols of the archive element and decide whether the archive ++ element should be included in the link. If the element is to + be included, the <<add_archive_element>> linker callback + routine must be called with the element as an argument, and + the element's symbols must be added to the linker hash table + just as though the element had itself been passed to the +- <<_bfd_link_add_symbols>> function. ++ <<_bfd_link_add_symbols>> function. The <<add_archive_element>> ++ callback has the option to indicate that it would like to ++ replace the element archive with a substitute BFD, in which ++ case it is the symbols of that substitute BFD that must be ++ added to the linker hash table instead. + + When the a.out <<_bfd_link_add_symbols>> function receives an + archive, it calls <<_bfd_generic_link_add_archive_symbols>> +@@ -407,14 +419,11 @@ static bfd_boolean generic_link_add_object_symbols + static bfd_boolean generic_link_add_symbols + (bfd *, struct bfd_link_info *, bfd_boolean); + static bfd_boolean generic_link_check_archive_element_no_collect +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *); ++ (bfd *, struct bfd_link_info *, bfd_boolean *); + static bfd_boolean generic_link_check_archive_element_collect +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *); ++ (bfd *, struct bfd_link_info *, bfd_boolean *); + static bfd_boolean generic_link_check_archive_element +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *, bfd_boolean); ++ (bfd *, struct bfd_link_info *, bfd_boolean *, bfd_boolean); + static bfd_boolean generic_link_add_symbol_list + (bfd *, struct bfd_link_info *, bfd_size_type count, asymbol **, + bfd_boolean); +@@ -908,32 +917,138 @@ generic_link_add_object_symbols (bfd *abfd, + return generic_link_add_symbol_list (abfd, info, symcount, outsyms, collect); + } + ++/* We build a hash table of all symbols defined in an archive. */ ++ ++/* An archive symbol may be defined by multiple archive elements. ++ This linked list is used to hold the elements. */ ++ ++struct archive_list ++{ ++ struct archive_list *next; ++ unsigned int indx; ++}; ++ ++/* An entry in an archive hash table. */ ++ ++struct archive_hash_entry ++{ ++ struct bfd_hash_entry root; ++ /* Where the symbol is defined. */ ++ struct archive_list *defs; ++}; ++ ++/* An archive hash table itself. */ ++ ++struct archive_hash_table ++{ ++ struct bfd_hash_table table; ++}; ++ ++/* Create a new entry for an archive hash table. */ ++ ++static struct bfd_hash_entry * ++archive_hash_newfunc (struct bfd_hash_entry *entry, ++ struct bfd_hash_table *table, ++ const char *string) ++{ ++ struct archive_hash_entry *ret = (struct archive_hash_entry *) entry; ++ ++ /* Allocate the structure if it has not already been allocated by a ++ subclass. */ ++ if (ret == NULL) ++ ret = (struct archive_hash_entry *) ++ bfd_hash_allocate (table, sizeof (struct archive_hash_entry)); ++ if (ret == NULL) ++ return NULL; ++ ++ /* Call the allocation method of the superclass. */ ++ ret = ((struct archive_hash_entry *) ++ bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); ++ ++ if (ret) ++ { ++ /* Initialize the local fields. */ ++ ret->defs = NULL; ++ } ++ ++ return &ret->root; ++} ++ ++/* Initialize an archive hash table. */ ++ ++static bfd_boolean ++archive_hash_table_init ++ (struct archive_hash_table *table, ++ struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *, ++ struct bfd_hash_table *, ++ const char *), ++ unsigned int entsize) ++{ ++ return bfd_hash_table_init (&table->table, newfunc, entsize); ++} ++ ++/* Look up an entry in an archive hash table. */ ++ ++#define archive_hash_lookup(t, string, create, copy) \ ++ ((struct archive_hash_entry *) \ ++ bfd_hash_lookup (&(t)->table, (string), (create), (copy))) ++ ++/* Allocate space in an archive hash table. */ ++ ++#define archive_hash_allocate(t, size) bfd_hash_allocate (&(t)->table, (size)) ++ ++/* Free an archive hash table. */ ++ ++#define archive_hash_table_free(t) bfd_hash_table_free (&(t)->table) ++ + /* Generic function to add symbols from an archive file to the global + hash file. This function presumes that the archive symbol table + has already been read in (this is normally done by the +- bfd_check_format entry point). It looks through the archive symbol +- table for symbols that are undefined or common in the linker global +- symbol hash table. When one is found, the CHECKFN argument is used +- to see if an object file should be included. This allows targets +- to customize common symbol behaviour. CHECKFN should set *PNEEDED +- to TRUE if the object file should be included, and must also call +- the bfd_link_info add_archive_element callback function and handle +- adding the symbols to the global hash table. CHECKFN must notice +- if the callback indicates a substitute BFD, and arrange to add +- those symbols instead if it does so. CHECKFN should only return +- FALSE if some sort of error occurs. */ ++ bfd_check_format entry point). It looks through the undefined and ++ common symbols and searches the archive symbol table for them. If ++ it finds an entry, it includes the associated object file in the ++ link. ++ ++ The old linker looked through the archive symbol table for ++ undefined symbols. We do it the other way around, looking through ++ undefined symbols for symbols defined in the archive. The ++ advantage of the newer scheme is that we only have to look through ++ the list of undefined symbols once, whereas the old method had to ++ re-search the symbol table each time a new object file was added. ++ ++ The CHECKFN argument is used to see if an object file should be ++ included. CHECKFN should set *PNEEDED to TRUE if the object file ++ should be included, and must also call the bfd_link_info ++ add_archive_element callback function and handle adding the symbols ++ to the global hash table. CHECKFN must notice if the callback ++ indicates a substitute BFD, and arrange to add those symbols instead ++ if it does so. CHECKFN should only return FALSE if some sort of ++ error occurs. ++ ++ For some formats, such as a.out, it is possible to look through an ++ object file but not actually include it in the link. The ++ archive_pass field in a BFD is used to avoid checking the symbols ++ of an object files too many times. When an object is included in ++ the link, archive_pass is set to -1. If an object is scanned but ++ not included, archive_pass is set to the pass number. The pass ++ number is incremented each time a new object file is included. The ++ pass number is used because when a new object file is included it ++ may create new undefined symbols which cause a previously examined ++ object file to be included. */ + + bfd_boolean + _bfd_generic_link_add_archive_symbols + (bfd *abfd, + struct bfd_link_info *info, +- bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *, +- struct bfd_link_hash_entry *, const char *, +- bfd_boolean *)) ++ bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *, bfd_boolean *)) + { +- bfd_boolean loop; +- bfd_size_type amt; +- unsigned char *included; ++ carsym *arsyms; ++ carsym *arsym_end; ++ register carsym *arsym; ++ int pass; ++ struct archive_hash_table arsym_hash; ++ unsigned int indx; ++ struct bfd_link_hash_entry **pundef; + + if (! bfd_has_map (abfd)) + { +@@ -944,103 +1059,148 @@ _bfd_generic_link_add_archive_symbols + return FALSE; + } + +- amt = bfd_ardata (abfd)->symdef_count; +- if (amt == 0) +- return TRUE; +- amt *= sizeof (*included); +- included = (unsigned char *) bfd_zmalloc (amt); +- if (included == NULL) ++ arsyms = bfd_ardata (abfd)->symdefs; ++ arsym_end = arsyms + bfd_ardata (abfd)->symdef_count; ++ ++ /* In order to quickly determine whether an symbol is defined in ++ this archive, we build a hash table of the symbols. */ ++ if (! archive_hash_table_init (&arsym_hash, archive_hash_newfunc, ++ sizeof (struct archive_hash_entry))) + return FALSE; ++ for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++) ++ { ++ struct archive_hash_entry *arh; ++ struct archive_list *l, **pp; + +- do ++ arh = archive_hash_lookup (&arsym_hash, arsym->name, TRUE, FALSE); ++ if (arh == NULL) ++ goto error_return; ++ l = ((struct archive_list *) ++ archive_hash_allocate (&arsym_hash, sizeof (struct archive_list))); ++ if (l == NULL) ++ goto error_return; ++ l->indx = indx; ++ for (pp = &arh->defs; *pp != NULL; pp = &(*pp)->next) ++ ; ++ *pp = l; ++ l->next = NULL; ++ } ++ ++ /* The archive_pass field in the archive itself is used to ++ initialize PASS, sine we may search the same archive multiple ++ times. */ ++ pass = abfd->archive_pass + 1; ++ ++ /* New undefined symbols are added to the end of the list, so we ++ only need to look through it once. */ ++ pundef = &info->hash->undefs; ++ while (*pundef != NULL) + { +- carsym *arsyms; +- carsym *arsym_end; +- carsym *arsym; +- unsigned int indx; +- file_ptr last_ar_offset = -1; +- bfd_boolean needed = FALSE; +- bfd *element = NULL; +- +- loop = FALSE; +- arsyms = bfd_ardata (abfd)->symdefs; +- arsym_end = arsyms + bfd_ardata (abfd)->symdef_count; +- for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++) ++ struct bfd_link_hash_entry *h; ++ struct archive_hash_entry *arh; ++ struct archive_list *l; ++ ++ h = *pundef; ++ ++ /* When a symbol is defined, it is not necessarily removed from ++ the list. */ ++ if (h->type != bfd_link_hash_undefined ++ && h->type != bfd_link_hash_common) + { +- struct bfd_link_hash_entry *h; +- struct bfd_link_hash_entry *undefs_tail; ++ /* Remove this entry from the list, for general cleanliness ++ and because we are going to look through the list again ++ if we search any more libraries. We can't remove the ++ entry if it is the tail, because that would lose any ++ entries we add to the list later on (it would also cause ++ us to lose track of whether the symbol has been ++ referenced). */ ++ if (*pundef != info->hash->undefs_tail) ++ *pundef = (*pundef)->u.undef.next; ++ else ++ pundef = &(*pundef)->u.undef.next; ++ continue; ++ } + +- if (included[indx]) +- continue; +- if (needed && arsym->file_offset == last_ar_offset) ++ /* Look for this symbol in the archive symbol map. */ ++ arh = archive_hash_lookup (&arsym_hash, h->root.string, FALSE, FALSE); ++ if (arh == NULL) ++ { ++ /* If we haven't found the exact symbol we're looking for, ++ let's look for its import thunk */ ++ if (info->pei386_auto_import) ++ { ++ bfd_size_type amt = strlen (h->root.string) + 10; ++ char *buf = (char *) bfd_malloc (amt); ++ if (buf == NULL) ++ return FALSE; ++ ++ sprintf (buf, "__imp_%s", h->root.string); ++ arh = archive_hash_lookup (&arsym_hash, buf, FALSE, FALSE); ++ free(buf); ++ } ++ if (arh == NULL) + { +- included[indx] = 1; ++ pundef = &(*pundef)->u.undef.next; + continue; + } ++ } ++ /* Look at all the objects which define this symbol. */ ++ for (l = arh->defs; l != NULL; l = l->next) ++ { ++ bfd *element; ++ bfd_boolean needed; ++ ++ /* If the symbol has gotten defined along the way, quit. */ ++ if (h->type != bfd_link_hash_undefined ++ && h->type != bfd_link_hash_common) ++ break; + +- h = bfd_link_hash_lookup (info->hash, arsym->name, +- FALSE, FALSE, TRUE); ++ element = bfd_get_elt_at_index (abfd, l->indx); ++ if (element == NULL) ++ goto error_return; + +- if (h == NULL +- && info->pei386_auto_import +- && CONST_STRNEQ (arsym->name, "__imp_")) +- h = bfd_link_hash_lookup (info->hash, arsym->name + 6, +- FALSE, FALSE, TRUE); +- if (h == NULL) ++ /* If we've already included this element, or if we've ++ already checked it on this pass, continue. */ ++ if (element->archive_pass == -1 ++ || element->archive_pass == pass) + continue; + +- if (h->type != bfd_link_hash_undefined +- && h->type != bfd_link_hash_common) ++ /* If we can't figure this element out, just ignore it. */ ++ if (! bfd_check_format (element, bfd_object)) + { +- if (h->type != bfd_link_hash_undefweak) +- /* Symbol must be defined. Don't check it again. */ +- included[indx] = 1; ++ element->archive_pass = -1; + continue; + } + +- if (last_ar_offset != arsym->file_offset) +- { +- last_ar_offset = arsym->file_offset; +- element = _bfd_get_elt_at_filepos (abfd, last_ar_offset); +- if (element == NULL +- || !bfd_check_format (element, bfd_object)) +- goto error_return; +- } +- +- undefs_tail = info->hash->undefs_tail; +- + /* CHECKFN will see if this element should be included, and + go ahead and include it if appropriate. */ +- if (! (*checkfn) (element, info, h, arsym->name, &needed)) ++ if (! (*checkfn) (element, info, &needed)) + goto error_return; + +- if (needed) ++ if (! needed) ++ element->archive_pass = pass; ++ else + { +- unsigned int mark; ++ element->archive_pass = -1; + +- /* Look backward to mark all symbols from this object file +- which we have already seen in this pass. */ +- mark = indx; +- do +- { +- included[mark] = 1; +- if (mark == 0) +- break; +- --mark; +- } +- while (arsyms[mark].file_offset == last_ar_offset); +- +- if (undefs_tail != info->hash->undefs_tail) +- loop = TRUE; ++ /* Increment the pass count to show that we may need to ++ recheck object files which were already checked. */ ++ ++pass; + } + } +- } while (loop); + +- free (included); ++ pundef = &(*pundef)->u.undef.next; ++ } ++ ++ archive_hash_table_free (&arsym_hash); ++ ++ /* Save PASS in case we are called again. */ ++ abfd->archive_pass = pass; ++ + return TRUE; + + error_return: +- free (included); ++ archive_hash_table_free (&arsym_hash); + return FALSE; + } + +@@ -1050,14 +1210,12 @@ _bfd_generic_link_add_archive_symbols + for finding them. */ + + static bfd_boolean +-generic_link_check_archive_element_no_collect (bfd *abfd, ++generic_link_check_archive_element_no_collect ( ++ bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { +- return generic_link_check_archive_element (abfd, info, h, name, pneeded, +- FALSE); ++ return generic_link_check_archive_element (abfd, info, pneeded, FALSE); + } + + /* See if we should include an archive element. This version is used +@@ -1067,12 +1225,9 @@ generic_link_check_archive_element_no_collect (bfd *abfd, + static bfd_boolean + generic_link_check_archive_element_collect (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { +- return generic_link_check_archive_element (abfd, info, h, name, pneeded, +- TRUE); ++ return generic_link_check_archive_element (abfd, info, pneeded, TRUE); + } + + /* See if we should include an archive element. Optionally collect +@@ -1081,8 +1236,6 @@ generic_link_check_archive_element_collect (bfd *abfd, + static bfd_boolean + generic_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded, + bfd_boolean collect) + { +@@ -1098,6 +1251,7 @@ generic_link_check_archive_element (bfd *abfd, + for (; pp < ppend; pp++) + { + asymbol *p; ++ struct bfd_link_hash_entry *h; + + p = *pp; + +diff --git a/bfd/pdp11.c b/bfd/pdp11.c +index 593c5ca..5111a51 100644 +--- a/bfd/pdp11.c ++++ b/bfd/pdp11.c +@@ -251,7 +251,7 @@ HOWTO( 1, 0, 1, 16, TRUE, 0, complain_overflow_signed,0,"DISP16", TRU + #define TABLE_SIZE(TABLE) (sizeof(TABLE)/sizeof(TABLE[0])) + + +-static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, bfd_boolean *); ++static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, bfd_boolean *); + static bfd_boolean aout_link_add_object_symbols (bfd *, struct bfd_link_info *); + static bfd_boolean aout_link_add_symbols (bfd *, struct bfd_link_info *); + static bfd_boolean aout_link_write_symbols (struct aout_final_link_info *, bfd *); +@@ -2682,8 +2682,6 @@ aout_link_check_ar_symbols (bfd *abfd, + static bfd_boolean + aout_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded) + { + bfd *oldbfd; +diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c +index 9522974..dcfd58f 100644 +--- a/bfd/xcofflink.c ++++ b/bfd/xcofflink.c +@@ -2384,8 +2384,6 @@ xcoff_link_check_ar_symbols (bfd *abfd, + static bfd_boolean + xcoff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded) + { + bfd_boolean keep_syms_p; +@@ -2465,7 +2463,7 @@ _bfd_xcoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info) + bfd_boolean needed; + + if (! xcoff_link_check_archive_element (member, info, +- NULL, NULL, &needed)) ++ &needed)) + return FALSE; + if (needed) + member->archive_pass = -1; diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch index 785aa02..c2a689a 100644 --- a/projects/binutils/peXXigen.patch +++ b/projects/binutils/peXXigen.patch @@ -1,14 +1,29 @@ -diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c -*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 ---- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 -*************** -*** 795,800 **** ---- 795,802 ---- - /* Only use a real timestamp if the option was chosen. */ - if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); -+ else -+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); +From f8e8f1daf12e30d3197b25d6bd10c03d1f932e20 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc(a)redhat.com> +Date: Tue, 27 Sep 2016 12:08:19 +0100 +Subject: [PATCH] Ensure that the timestamp in PE/COFF headers is always + initialised. + + PR ld/20634 + * peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Put 0 in the + timestamp field if real time values are not being stored. +--- + bfd/peXXigen.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index c92c1ea..d713d96 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -879,6 +879,8 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); +-- +2.1.4 + diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index a142c38..b0ce69d 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -29,7 +29,7 @@ sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" +export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc diff --git a/projects/nsis/build b/projects/nsis/build index 81ed4d4..5a7b59f 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,7 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -mkdir -p /var/tmp/dist mkdir -p /var/tmp/build tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 cd /var/tmp/build/nsis-[% c('version') %]-src @@ -13,7 +12,13 @@ for patch in $(grep '\.patch$' debian/patches/series) do [ -f debian/patches/$patch ] && patch -p1 < debian/patches/$patch done -[% SET scons_args = 'APPEND_CCFLAGS="-fgnu89-inline" VERSION=' _ c("version") +# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it +# is used for both the host and cross-compiled parts, but this option is +# only valid for the Windows linker. Therefore we add it using a patch +# to the cross-compilation part only. +patch -p1 < $rootdir/no-insert-timestamp.patch +[% SET scons_args = 'VERSION=' _ c("version") + _ ' APPEND_CCFLAGS="-fgnu89-inline"' _ " SKIPUTILS='NSIS Menu' XGCC_W32_PREFIX=i686-w64-mingw32-" _ ' PREFIX=/var/tmp/dist/nsis' -%] scons [% scons_args %] diff --git a/projects/nsis/config b/projects/nsis/config index 7db7b60..24adc36 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -21,5 +21,6 @@ input_files: URL: 'http://http.debian.net/debian/pool/main/n/nsis/nsis_2.51-1.debian.tar.xz' sha256sum: 1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a - filename: nsis-missing-unistd-include.patch + - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch new file mode 100644 index 0000000..e71af21 --- /dev/null +++ b/projects/nsis/no-insert-timestamp.patch @@ -0,0 +1,27 @@ +diff -ur nsis-2.51-src/SCons/Config/gnu nsis-2.51-src.n/SCons/Config/gnu +--- nsis-2.51-src/SCons/Config/gnu 2018-05-24 20:40:06.508000000 +0200 ++++ nsis-2.51-src.n/SCons/Config/gnu 2018-05-24 21:04:16.501000000 +0200 +@@ -89,6 +89,7 @@ + stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align + stub_env.Append(LINKFLAGS = ['-Wl,-e,_WinMain@16']) # entry point + stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file ++stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + ### makensis environment + +@@ -125,6 +126,7 @@ + plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file + plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # Make sure libgcc is statically linked in, for the plugins to work. + plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # Make sure libstdc++ is statically linked in, for the plugins to work. ++plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + ### cross-platform util environment + +@@ -148,6 +150,7 @@ + + util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables + util_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align ++util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + conf = FlagsConfigure(util_env) + if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']: diff --git a/projects/openssl/config b/projects/openssl/config index 9ab54c6..9c191fa 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,7 +15,7 @@ targets: configure_opts: -shared linux-generic32 windows: var: - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs"' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs"' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/projects/selfrando/config b/projects/selfrando/config index f8afa5d..07195f7 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.3.3 +version: 0.4.1 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg diff --git a/projects/zlib/build b/projects/zlib/build index 4cb384b..ef26882 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -7,8 +7,8 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] export CFLAGS="[% c("var/CFLAGS") %]" export LDFLAGS="[% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs" install +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install cd /var/tmp/dist [% c('tar', { diff --git a/rbm.conf b/rbm.conf index 6adcd6f..0d6de69 100644 --- a/rbm.conf +++ b/rbm.conf @@ -217,7 +217,7 @@ targets: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -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' + LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 May '18

29 May '18

commit 30544586f8a98e985e0038b2e905bfddb14e999e Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 19:40:31 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. A fix for our bug 26127. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8a187a8cefad..4289b7bcc5f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -297,6 +297,9 @@ pref("xpinstall.whitelist.add.36", ""); // don't want to have some random Google Analytics script running either on the // about:addons page, see bug 22073 and 22900. pref("extensions.getAddons.showPane", false); +// Show our legacy extensions directly on about:addons and get rid of the +// warning for the default theme. +pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org"); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"loop-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":4,\"newElementCount\":0}");

1 0

[tor-browser-build/master] disable selfrando
by gk＠torproject.org 29 May '18

29 May '18

commit d3339fe091e96daa6fb1918880a3eef82c068cad Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 3 22:51:38 2018 -0700 disable selfrando --- projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 7f74c9c..88bffc2 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -40,13 +40,13 @@ EOF export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% 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" - # We need to avoid the shuffling while building as this breaks compilation - export SELFRANDO_skip_shuffle= -[% END -%] +#[% 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" +# # We need to avoid the shuffling while building as this breaks compilation +# export SELFRANDO_skip_shuffle= +#[% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/firefox/config b/projects/firefox/config index 77ae405..0692ead 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,9 +81,9 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' - - project: selfrando - name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' +# - project: selfrando +# name: selfrando +# 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] Update signing key for llvm
by gk＠torproject.org 29 May '18

29 May '18

commit 21b610639107c66bcd49cd219c26560261257aa4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue May 15 10:37:50 2018 -0400 Update signing key for llvm LLVM 3.9.1 is signed with 0x02119294 --- keyring/llvm.gpg | Bin 2507 -> 3335 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg index 9911f65..a94f435 100644 Binary files a/keyring/llvm.gpg and b/keyring/llvm.gpg differ

1 0

[tor-browser-build/master] Bug 26073: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 29 May '18

29 May '18

commit 473342eefe9e19dde3a7548b16b29fcfc1f13855 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed May 23 12:12:01 2018 -0300 Bug 26073: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index c542818..4d1be00 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -194,7 +194,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir rm -rf chrome [% END %] # Set the locale of the bundle. -echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js +echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/000-tor-browser.js [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults @@ -325,7 +325,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ mkdir -p defaults/preferences cp $rootdir/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. - echo "pref(\"general.useragent.locale\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js + echo "pref(\"intl.locale.requested\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults

1 0

[tor-browser-build/master] Update NoScript to 10.1.8.1
by gk＠torproject.org 29 May '18

29 May '18

commit 4398ed2d7050c8539068d0e6e3ed4a3ca7ff93a7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:16:46 2018 -0400 Update NoScript to 10.1.8.1 Revert the download URL to Mozilla Add-ons (AMO) --- 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 dec5648..62ed70c 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://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 + sha256sum: 63a8a6a582af6e28084fae3bc72ebc5c5c2437467f8d445c8ea69d1061a3f7b2 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] new certutil location for firefox 60
by gk＠torproject.org 29 May '18

29 May '18

commit 66c38da52239e4d8c408f793ce6178f4131cf0cb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 8 20:12:18 2018 -0700 new certutil location for firefox 60 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index a9d5125..62186d1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -169,7 +169,7 @@ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ - cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do

1 0

[tor-browser-build/master] Use a more recent version of gcc
by gk＠torproject.org 29 May '18

29 May '18

commit 77b52782bc81b00a7cd702fa50459cd56a0752e8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:06:40 2018 -0400 Use a more recent version of gcc --- projects/llvm/build | 7 +++++++ projects/llvm/config | 3 +++ 2 files changed, 10 insertions(+) diff --git a/projects/llvm/build b/projects/llvm/build index b018ca5..0958a4c 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -4,6 +4,13 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc +[% END -%] mkdir -p /var/tmp/build cd /var/tmp/build tar -xf $rootdir/[% c('input_files_by_name/llvm') %] diff --git a/projects/llvm/config b/projects/llvm/config index 44252b4..76fb2c0 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -8,6 +8,9 @@ var: input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz'

1 0

[tor-browser-build/master] Use Rust and LLVM for Stylo bindgen in Firefox
by gk＠torproject.org 29 May '18

29 May '18

commit b5a67ed318c316c1c5258e2f5e793abbe8bf84ee Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 28 09:54:37 2018 -0400 Use Rust and LLVM for Stylo bindgen in Firefox --- projects/firefox/build | 9 +++++++++ projects/firefox/config | 6 ++++++ projects/llvm/config | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 88bffc2..a9d5125 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -48,6 +48,15 @@ EOF # export SELFRANDO_skip_shuffle= #[% END -%] +[% IF c("var/linux") %] + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] + export PATH="/var/tmp/dist/rust/bin:$PATH" + # Add llvm so stylo can build + tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] + export LLVM_CONFIG="/var/tmp/dist/llvm/bin/llvm-config" +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 0692ead..d6b8313 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -97,3 +97,9 @@ input_files: enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' + - project: rust + name: rust + enable: '[% c("var/linux") %]' + - project: llvm + name: llvm + enable: '[% c("var/linux") %]' diff --git a/projects/llvm/config b/projects/llvm/config index daa779d..44252b4 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.8.0 +version: 3.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR
by gk＠torproject.org 29 May '18

29 May '18

commit ed1e40688ca502e1adc1819024c430c24aebebb0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 28 09:48:35 2018 -0400 Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR --- projects/firefox/config | 1 + projects/firefox/mozconfig-linux-i686 | 4 ++-- projects/firefox/mozconfig-linux-x86_64 | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c53ea7e..77ae405 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -37,6 +37,7 @@ targets: var: arch_deps: - libgtk2.0-dev + - libgtk-3-dev - libdbus-glib-1-dev - libxt-dev - hardening-wrapper diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index a7d75fa..b677df3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -17,8 +17,8 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -# Let's support GTK2 for ESR52 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 7d9ab1c..2e8e2fa 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -9,8 +9,8 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -# Let's support GTK2 for ESR52 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar

1 0

[tor-browser-build/master] Disable checking the hashes of the language packs for Firefox 60 ESR
by gk＠torproject.org 29 May '18

29 May '18

commit a80e0d5b49e827b613b624c5516b087b3c402f73 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:59:06 2018 -0400 Disable checking the hashes of the language packs for Firefox 60 ESR ... pending https://bugzilla.mozilla.org/show_bug.cgi?id=1463749 is fixed. --- projects/firefox-langpacks/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 6bc1810..cbbc9ca 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -4,8 +4,8 @@ [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] - shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') - echo "$shasum [% filename %]" | sha512sum -c + #shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + #echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %]

1 0

[tor-browser-build/master] Use mach configure to pass build configuration arguments
by gk＠torproject.org 29 May '18

29 May '18

commit 74e8c6a9803cc778b73dfa08c23ab7c75bb40718 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 11:05:32 2018 -0400 Use mach configure to pass build configuration arguments --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index cfef91d..7f74c9c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -111,10 +111,10 @@ fi 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" -make -j[% c("buildconf/num_procs") %] -f client.mk build -make -C obj-* package INNER_MAKE_PACKAGE=true +./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts +./mach build +./mach package [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir

1 0

[tor-browser-build/master] Update Firefox to 60.0.1esr (tor-browser-60.0.1esr-8.0-1)
by gk＠torproject.org 29 May '18

29 May '18

commit a4ed53bb203f03b76853f42efc0564a75cc7e562 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 09:44:02 2018 -0400 Update Firefox to 60.0.1esr (tor-browser-60.0.1esr-8.0-1) --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4458d48..c53ea7e 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.8.0 + firefox_platform_version: 60.0.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26165_v2'
by gk＠torproject.org 29 May '18

29 May '18

commit b1e6dd922f17555ad153cd9e05997ca41e50417a Merge: 8fd3d1d 2b3a355 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 07:48:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_26165_v2' projects/firefox/build | 10 ++-------- projects/gcc/config | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-)

1 0