- tbb-commits - lists.torproject.org

[tor-launcher/master] Remove superfluous whitespace.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0717ad71785545ec167c531d60b5410a19ebbc1a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:03:50 2015 +0000 Remove superfluous whitespace. --- src/chrome/content/network-settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f100f90..aa07e1e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -123,7 +123,7 @@ function initDialog() // Hide the Tor Browser logo and associated separator element if the // TOR_HIDE_BROWSER_LOGO environment variable is set. let env = Cc["@mozilla.org/process/environment;1"] - .getService(Ci.nsIEnvironment); + .getService(Ci.nsIEnvironment); if (env.exists("TOR_HIDE_BROWSER_LOGO")) wizardElem.setAttribute("tor_hide_browser_logo", true);

1 0

[torbutton/master] Bug 14100: Add option to hide NetworkSettings
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 765fee607af6fa88b99476dee10298e5db3b9eb1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 09:36:35 2015 +0000 Bug 14100: Add option to hide NetworkSettings This patch hides the NetworkSettings menuitem if the environment variable TOR_NO_DISPLAY_NETWORK_SETTINGS is set. Thanks to linostar for writing it. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf06e04..4715fb6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2386,6 +2386,16 @@ function torbutton_close_on_toggle(mode, newnym) { // New Identity where it is not supported (ie no control port). function torbutton_check_protections() { + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + + // Bug 14100: check for the existence of an environment variable + // in order to toggle the visibility of networksettings menuitem + if (env.exists("TOR_NO_DISPLAY_NETWORK_SETTINGS")) + document.getElementById("torbutton-networksettings").hidden = true; + else + document.getElementById("torbutton-networksettings").hidden = false; + var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref;

1 0

[torbutton/master] Bug #13078: environment variable to skip TorButton control port verification
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 38a59e819604de5018db5db54fb08fd9e1581d1f Author: Patrick Schleizer <adrelanos(a)riseup.net> Date: Sun Sep 7 20:49:41 2014 +0000 Bug #13078: environment variable to skip TorButton control port verification --- src/chrome/content/torbutton.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5aed682..bf06e04 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1875,8 +1875,12 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. + const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST"; + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); if (m_tb_control_port && !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful;

1 0

[tor-browser-bundle/maint-4.0] We are at 4.0.3 now
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 2a3a14746c15aed4350425ce96e2b7967cafee85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:08:20 2015 +0000 We are at 4.0.3 now --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 911afdd..7cd1a03 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ channels: release: 4.0.3 alpha: 4.5-alpha-2 versions: - 4.0.2: + 4.0.3: platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/4.0.3

1 0

[tor-browser-bundle/maint-4.0] Update the config.yml
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 1c40c56419150c42daf5b874b4dccd52507b8d85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:04:58 2015 +0000 Update the config.yml --- tools/update-responses/config.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index bdecdec..911afdd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,23 +6,21 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.2 - alpha: 4.5-alpha-1 + release: 4.0.3 + alpha: 4.5-alpha-2 versions: 4.0.2: - platformVersion: 31.3.0 + platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.2 + download_url: https://www.torproject.org/dist/torbrowser/4.0.3 incremental_from: - - 4.0 - - 4.0.1 - 4.5-alpha-1: - platformVersion: 31.2.0 + - 4.0.2 + 4.5-alpha-2: + platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2 incremental_from: - - 4.0 - - 4.0.1 + - 4.5-alpha-1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-4.0] Preparing 4.0.3.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 9c67ead33843115e7f4dcd2f7ce96c6008b19d0d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:35:17 2015 +0000 Preparing 4.0.3. Update Changelog; bump version of Tor Launcher, Firefox and NoScript. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ gitian/versions | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 50f7974..12f5180 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 4.0.3 -- Jan 13 2014 + * All Platforms + * Update Firefox to 31.4.0esr + * Update NoScript to 2.6.9.10 + * Update meek to 0.15 + * Update Tor Launcher to 0.2.7.0.2 + * Translation updates only + Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms * Update Firefox to 31.3.0esr diff --git a/gitian/versions b/gitian/versions index a8c9475..ee4435c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,16 +1,16 @@ -TORBROWSER_VERSION=4.0.2 +TORBROWSER_VERSION=4.0.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 TOR_TAG=tor-0.2.5.10 -TORLAUNCHER_TAG=0.2.7.0.1 +TORLAUNCHER_TAG=0.2.7.0.2 TORBUTTON_TAG=1.7.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 @@ -33,7 +33,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-4.0] Separate MAR file/htdocs generation.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit dca3ac0e09d1feda5d4f370960f824c0124f6492 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 21:44:36 2015 +0000 Separate MAR file/htdocs generation. This is part of d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 which we need in order to be able to backport #13857 cleanly. The related part of the commit message is: Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. --- gitian/Makefile | 3 +++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 ++++++++++++++++++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..b2e3224 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,9 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser-bundle/maint-4.0] Bug 13857: allow making incrementals MARs for a specific channel
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit c39111b403e519aa56660c32c65fc9a64519ac17 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 14:43:12 2014 +0100 Bug 13857: allow making incrementals MARs for a specific channel The gen_incrementals can now receive a channel name as argument. In that case, incremental MARs will be created for this channel only. If there is no argument, incremental MARs for all channels are created. Makefile rules have been added for the different channels. --- gitian/Makefile | 8 +++++++- gitian/README.build | 7 +++++++ tools/update-responses/update_responses | 24 +++++++++++++++--------- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index b2e3224..5b646c8 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,7 +33,13 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals + ../tools/update-responses/gen_incrementals release + +incrementals-alpha: + ../tools/update-responses/gen_incrementals alpha + +incrementals-beta: + ../tools/update-responses/gen_incrementals beta update_responses: ../tools/update-responses/update_responses diff --git a/gitian/README.build b/gitian/README.build index 24a67a8..a5de8e2 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -71,6 +71,13 @@ Detailed Explanation of Scripts: - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - match-beta: The equivalent to the 'match' rule for beta packages + - hash-nightly: The equivalent to the 'hash' rule for nightly packages + - hash-alpha: The equivalent to the 'hash' rule for alpha packages + - hash-beta: The equivalent to the 'hash' rule for beta packages + - incrementals-alpha: The equivalent to the 'incrementals' rule for + alpha packages + - incrementals-beta: The equivalent to the 'incrementals' rule for + beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5b85037..e66b27d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -180,14 +180,6 @@ sub create_missing_incremental_mars_for_version { $pm->wait_all_children; } -sub create_all_missing_incremental_mars { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { - get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); - } -} - sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -195,6 +187,16 @@ sub get_config { // $config->{$name}; } +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -325,9 +327,13 @@ my %actions = ( clean_htdocs; }, gen_incrementals => sub { + my ($config) = @_; extract_martools; check_deps; - create_all_missing_incremental_mars(@_); + foreach my $version (channel_to_version($config, @ARGV)) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } }, );

1 0

[tor-browser-bundle/maint-4.0] Add a command to check an update_responses deployement
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 8286124e36d9dd366b0e13b4a5a10ba80c3bd16c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0

[tor-browser-bundle/maint-4.0] Bug 13857: allow updating responses for a specific channel
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 06e8c9e859109da8bff3668e95cd3641bde48083 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 19:19:19 2014 +0100 Bug 13857: allow updating responses for a specific channel The update_responses command can now receive a channel name as argument. In that case, only the xml responses for the selected channel(s) are updated. The files are now located in directory htdocfiles/$channel and each channel has its own .htaccess file in that directory. Makefile rules have been added to update the different channels. --- gitian/Makefile | 8 +++- gitian/README.build | 4 ++ tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 66 ++++++++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 5b646c8..33403b5 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -42,7 +42,13 @@ incrementals-beta: ../tools/update-responses/gen_incrementals beta update_responses: - ../tools/update-responses/update_responses + ../tools/update-responses/update_responses release + +update_responses-alpha: + ../tools/update-responses/update_responses alpha + +update_responses-beta: + ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions diff --git a/gitian/README.build b/gitian/README.build index a5de8e2..b3e8be5 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -78,6 +78,10 @@ Detailed Explanation of Scripts: alpha packages - incrementals-beta: The equivalent to the 'incrementals' rule for beta packages + - update_responses-alpha: The equivalent to the 'update_responses' rule + for alpha packages + - update_responses-beta: The equivalent to the 'update_responses' rule + for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml deleted file mode 100644 index 910e99d..0000000 --- a/tools/update-responses/htdocs/no-update.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates></updates> diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e66b27d..0c487e3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -24,7 +24,7 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { @@ -46,17 +46,21 @@ sub get_nbprocs { } sub write_htdocs { - my ($file, $content) = @_; + my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; - write_file("$htdocsdir/$file", $content); - $htdocsfiles{$file} = 1; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; } sub clean_htdocs { - opendir(my $d, $htdocsdir); - my @files = grep { ! $htdocsfiles{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$_" } @files; + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } } sub get_sha512_hex_of_file { @@ -233,8 +237,10 @@ sub get_response { } sub write_responses { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; get_version_files($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; @@ -249,43 +255,44 @@ sub write_responses { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}); - write_htdocs("$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}, $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); } } } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } } sub write_htaccess { - my ($config) = @_; - my $htaccess = "RewriteEngine On\n"; + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; my $flags = "[last]"; - foreach my $channel (sort keys %{$config->{channels}}) { + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule " - . "^$channel/[^\/]+/$version/ " - . "no-update.xml $flags\n"; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) { foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt " - . "$version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } + write_htdocs($channel, '.htaccess', $htaccess); } - write_htdocs('.htaccess', $htaccess); } sub check_deps { @@ -322,9 +329,16 @@ sub extract_martools { my %actions = ( update_responses => sub { - write_responses(@_); - write_htaccess(@_); - clean_htdocs; + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + clean_htdocs(@channels); }, gen_incrementals => sub { my ($config) = @_;

1 0

[tor-launcher/master] Update translations from Transifex.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 08b65c7a8a35fe32204c0343c49286988a0f3e79 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:12:52 2015 +0000 Update translations from Transifex. --- src/chrome/locale/af/torlauncher.properties | 2 +- src/chrome/locale/am/torlauncher.properties | 2 +- src/chrome/locale/az/network-settings.dtd | 83 ++++++++--------- src/chrome/locale/az/progress.dtd | 8 +- src/chrome/locale/az/torlauncher.properties | 114 +++++++++++------------ src/chrome/locale/bg/network-settings.dtd | 2 +- src/chrome/locale/bg/torlauncher.properties | 8 +- src/chrome/locale/de/torlauncher.properties | 2 +- src/chrome/locale/el/network-settings.dtd | 6 +- src/chrome/locale/eo/network-settings.dtd | 8 +- src/chrome/locale/eo/progress.dtd | 6 +- src/chrome/locale/eo/torlauncher.properties | 44 ++++----- src/chrome/locale/es-AR/torlauncher.properties | 2 +- src/chrome/locale/es-CL/network-settings.dtd | 2 +- src/chrome/locale/es-CL/progress.dtd | 6 +- src/chrome/locale/es-CL/torlauncher.properties | 2 +- src/chrome/locale/eu/network-settings.dtd | 24 ++--- src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/fil/network-settings.dtd | 10 +- src/chrome/locale/fil/progress.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 8 +- src/chrome/locale/fo/network-settings.dtd | 4 +- src/chrome/locale/fo/torlauncher.properties | 2 +- src/chrome/locale/fy/network-settings.dtd | 6 +- src/chrome/locale/fy/torlauncher.properties | 4 +- src/chrome/locale/he/network-settings.dtd | 14 +-- src/chrome/locale/he/progress.dtd | 2 +- src/chrome/locale/hy-AM/network-settings.dtd | 2 +- src/chrome/locale/id/network-settings.dtd | 6 +- src/chrome/locale/id/torlauncher.properties | 40 ++++---- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ko/network-settings.dtd | 8 +- src/chrome/locale/ko/torlauncher.properties | 2 +- src/chrome/locale/lo/torlauncher.properties | 4 +- src/chrome/locale/lt/network-settings.dtd | 6 +- src/chrome/locale/lt/torlauncher.properties | 64 ++++++------- src/chrome/locale/lv/network-settings.dtd | 10 +- src/chrome/locale/lv/torlauncher.properties | 2 +- src/chrome/locale/mr/torlauncher.properties | 2 +- src/chrome/locale/ms-MY/network-settings.dtd | 2 +- src/chrome/locale/nn/network-settings.dtd | 2 +- src/chrome/locale/nn/torlauncher.properties | 8 +- src/chrome/locale/pt-BR/network-settings.dtd | 4 +- src/chrome/locale/ro/network-settings.dtd | 8 +- src/chrome/locale/ru/torlauncher.properties | 8 +- src/chrome/locale/sl-SI/network-settings.dtd | 92 +++++++++---------- src/chrome/locale/sl-SI/progress.dtd | 8 +- src/chrome/locale/sl-SI/torlauncher.properties | 116 ++++++++++++------------ src/chrome/locale/sr/network-settings.dtd | 58 ++++++------ src/chrome/locale/sr/torlauncher.properties | 8 +- src/chrome/locale/sv/progress.dtd | 4 +- src/chrome/locale/sv/torlauncher.properties | 8 +- src/chrome/locale/tr/network-settings.dtd | 6 +- src/chrome/locale/tr/progress.dtd | 2 +- src/chrome/locale/tr/torlauncher.properties | 18 ++-- src/chrome/locale/zh-TW/torlauncher.properties | 2 +- 56 files changed, 439 insertions(+), 438 deletions(-) diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index 02be756..c347389 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(aanbeveel) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index 02be756..8329edd 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(የሚመከር) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 3cf2d1d..356db72 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -1,62 +1,63 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor şəbəkə paramertləri">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor şəbəkəsinə qoşulmaq üçün, kompüterin intrenet bağlantısı haqqında bəzi məlumatları verməlisiniz."> <!ENTITY torSettings.yes "Bəli"> <!ENTITY torSettings.no "Xeyr"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.firstQuestion "Aşağıdakılardan hansı sizin vəziyyətinizi tam təsvir edir?"> +<!ENTITY torSettings.configurePrompt1 "Bu kompüterin internet şəbəkəsi senzorlu vəya proksilidir."> +<!ENTITY torSettings.configurePrompt2 "Mən proksi və ya körpü quraşdırmalıyam."> +<!ENTITY torSettings.configure "Quraşdır"> +<!ENTITY torSettings.connectPrompt2 "Mən birbaşa Tor şəbəkəsinə qoşulmaq istəyirəm."> +<!ENTITY torSettings.connectPrompt3 "Bu əksər hallarda işləyir."> +<!ENTITY torSettings.connect "Qoşul"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Bu kompüterin İnernetə qoşulmaq üçün proksiyə ehtiyacı var?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Əgər siz bu suala nə cavab verəcəyinizə əmin deyilsinizsə, proksinin necə konfiqurasiya edildiyini öyrənmək üçün başqa bir brauzerin parametrlərinə nəzər salın "> +<!ENTITY torSettings.enterProxy "Proksy parametrlərini daxil edin"> +<!ENTITY torSettings.bridgeQuestion "Sizin internet provayderiniz(İSP) Tor şəbəkəsinə hər-hansı qadağa qoyub?"> +<!ENTITY torSettings.bridgeHelp "Əgər bu saula nə cavab verəcəyinizi bilirsinizsə Xeyr seçin.No.  +Əgər bəli seçsəniz, sizdən Tor körpüsü quraşdırmağınız tələb olunacaq,hansı ki bunlar qeydə alınmamış, qarşısının alınması daha çətin olan vasitələrdir."> +<!ENTITY torSettings.bridgeSettingsPrompt "Siz təmin olunmuş körpü dəstindən istifadə edə, və ya özünüz şəxsi körpü dəsti daxil edə bilərsiz.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Torun açılması üçün gözləyin..."> +<!ENTITY torsettings.restartTor "Tor`u yenidən başlat"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Əlavə"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "Bu kompüte İnternetə qoşulmaq üçün proksi istifadə etməlidir"> +<!ENTITY torsettings.useProxy.type "Proxy Tipi:"> +<!ENTITY torsettings.useProxy.address "Ünvan:"> +<!ENTITY torsettings.useProxy.address.placeholder "İP ünvanı və ya anakompüterin adı"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "İstifadəçi adı:"> <!ENTITY torsettings.useProxy.password "Şifrə:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.firewall.checkbox "Bu kompüter yalnız müəyyən portlarla əlaqəyə icazə verən təhlükəsizlik divarindan keçir"> +<!ENTITY torsettings.firewall.allowedPorts "İczaə verilən portlar:"> +<!ENTITY torsettings.useBridges.checkbox "Mənim İnternet provayderim(İSP) Tor şəbəkəsinə qoşulmağı qadağan edir"> +<!ENTITY torsettings.useBridges.default "Təmin olunmuş köpüdən istifadə et"> +<!ENTITY torsettings.useBridges.type "Nəqliyyat tipi:"> +<!ENTITY torsettings.useBridges.custom "Körpü daxil edin"> +<!ENTITY torsettings.useBridges.label "Bir və ya daha çox Körpü qoşqusu daxil edin (hər sətirə ancaq bir dənə)"> <!ENTITY torsettings.useBridges.placeholder "type address:port"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.copyLog "Tor bort jurnalını panoya kopyalayın"> +<!ENTITY torsettings.bridgeHelpTitle "Körpü Keçid Dəstəyi"> +<!ENTITY torsettings.bridgeHelp1 "Əgər sən Tor şəbəkəsinə qoşula bilmirsənsə, ola bilsin ki, sənin İnternet Xidmət Provayderin (İXP) və ya digər agentlik Tor-la əlaqəni bloklayır.  Çox hallarda sən bu problemdən qaçınmaq üçün Tor Körpülərini istifadə edə bilərsən. Onların tapılıb bloklanması qat-qat çətin başa gəlir. "> +<!ENTITY torsettings.bridgeHelp1B "Aşağıdakı üç üsuldan birini istifadə etməklə əvvəlcədən konfiqurasiya edilmiş körpü ünvanları dəstini və ya istəyinə uyğun ünvan dəstini istifadə edə bilərsən:"> +<!ENTITY torsettings.bridgeHelp2Heading "Bilavasitə web ilə"> +<!ENTITY torsettings.bridgeHelp2 "web brauzer istifadə edərək bu səhifəni ziyarət edin https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Email Avtocavablayıcı Vasitəsilə"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Mətnində 'körpü əldə et' yazaraq bridges(a)torproject.org ünvanına email göndər.  Casus və ya hücumçunun körpü ünvanlarını aşkarlamasının qarşısını almaq üçün aşağıda sıralanmış email ünvanlardan (üstünlüyə uyğun sıralanmışdır) bu tələbi göndərməlisən:"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, və ya https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Dəstək Masası Vasitəsilə"> +<!ENTITY torsettings.bridgeHelp4 "Son çarə olaraq körpü ünvanlarını help(a)rt.torproject.org ünvanına mədəni tələb emaili göndərməklə əldə edə bilərsən.  Lütfən, unutma ki, yazdığın insan hər bir tələbə ayrı ayrı cavab yazacaq."> diff --git a/src/chrome/locale/az/progress.dtd b/src/chrome/locale/az/progress.dtd index ebd9cef..473b050 100644 --- a/src/chrome/locale/az/progress.dtd +++ b/src/chrome/locale/az/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "Tor Statusu"> +<!ENTITY torprogress.openSettings "Parametrləri aç"> +<!ENTITY torprogress.heading "Tor şəbəkəsinə qoşulur"> +<!ENTITY torprogress.pleaseWait "Zəhmət olmasa biz Tor şəbəkəsini quraşdiranadək gözləyin."> diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index a70b15b..55df92f 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -1,61 +1,61 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.error_title=Tor İşlədici + +torlauncher.tor_exited=Tor gözlənilmədən dayandı. Bu Tor-un özündəki problemlə, sistemindəki başqa proqramla və ya avadanlıqdakı xətayla bağlı ola bilər. Tor-u yenidən başlatmadığın vaxt ərzində Tor Browser heç bir sayta daxil ola bilməyəcək. Bu problem olduğu kimi qalarsa, öz Tor Girişinin üzünü dəstək komandasına göndər. +torlauncher.tor_exited2=Tor-un yenidən başladılması sənin brauzerlərinə təsir etməyəcək. +torlauncher.tor_controlconn_failed=Tor yoxlama portu ilə bağlantı yarada bilmədi. +torlauncher.tor_failed_to_start=Tor başlaya bilmədi. +torlauncher.tor_control_failed=Tor-a nəzarət alınmadı. +torlauncher.tor_bootstrap_failed=Tor şəbəkə əlaqəsini Tor quraşdıra bilmədi. +torlauncher.tor_bootstrap_failed_details=%1$S xətası (%2$S). + +torlauncher.unable_to_start_tor=Tor başlaya bilmir.\n\n%S +torlauncher.tor_missing=İcra edilə bilən Tor çatışmır. +torlauncher.torrc_missing=Torrc faylı çatışmır. +torlauncher.datadir_missing=Tor məlumat kataloqu mövcud deyil. +torlauncher.password_hash_missing=Qarışıd şifrə əldə edə bilmədi. + +torlauncher.failed_to_get_settings=Tor parametrlərinin bərpası mümkün olmadı.\n\n%S +torlauncher.failed_to_save_settings=Tor parametrlərini saxlamaq mümkün olmadı.\n\n%S +torlauncher.ensure_tor_is_running=Tor-un işlədiyindən əmin ol. + +torlauncher.error_proxy_addr_missing=Tor internetə daxil olmaq üçün proksi istifadə etsin deyə sən hər ikisini - IP ünvan və ya host adını və port nömrəsini qeyd etməlisən. +torlauncher.error_proxy_type_missing=Sən proksi növünü seçməlisən. +torlauncher.error_bridges_missing=Sən bir və ya daha çox körpü seçməlisən. +torlauncher.error_default_bridges_type_missing=Təqdim edilmiş körpülər üçün nəqliyyat növünü seçməlisən. +torlauncher.error_bridge_bad_default_type=%S növ nəqliyyata sahib olan təqdim edilmiş körpü yoxdur. Lütfən, parametrlərini quraşdır. + +torlauncher.recommended_bridge=(məsləhət edilən) + +torlauncher.connect=Qoşul +torlauncher.restart_tor=Tor`u yenidən başlat +torlauncher.quit=Bitir torlauncher.quit_win=Çıx -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.done=Oldu + +torlauncher.forAssistance=Dəstək üçün %S ilə əlaqə saxla + +torlauncher.copiedNLogMessages=Köçürülmə tamamlandı. %S Tor giriş mesajları mətn dəyişdiricisi və ya email mesajına daxil edilməyə hazırdır. + +torlauncher.bootstrapStatus.conn_dir=Keçid kataloqu ilə əlaqə +torlauncher.bootstrapStatus.handshake_dir=Şifrələnmiş kataloq əlaqəsinin yaradılması +torlauncher.bootstrapStatus.requesting_status=Şəbəkə statusunun bərpası +torlauncher.bootstrapStatus.loading_status=Şəbəkə statusunun yüklənməsi +torlauncher.bootstrapStatus.loading_keys=Səlahiyyət sertifikatlarının yüklənməsi +torlauncher.bootstrapStatus.requesting_descriptors=Keçid məlumatının tələb edilməsi +torlauncher.bootstrapStatus.loading_descriptors=Keçid məlumatının yüklənməsi +torlauncher.bootstrapStatus.conn_or=Tor şəbəkəsinə qoşulur +torlauncher.bootstrapStatus.handshake_or=Tor dövrəsinin yaradılması +torlauncher.bootstrapStatus.done=Tor şəbəkəsi ilə əlaqə! + +torlauncher.bootstrapWarning.done=oldu +torlauncher.bootstrapWarning.connectrefused=əlaqə rədd edildi +torlauncher.bootstrapWarning.misc=qarışıq +torlauncher.bootstrapWarning.resourcelimit=qeyri-kafi mənbə +torlauncher.bootstrapWarning.identity=müəyyənəşdirmə uyğunsuzluğu +torlauncher.bootstrapWarning.timeout=əlaqə vaxtının bitməsi +torlauncher.bootstrapWarning.noroute=host üçün istiqamət yoxdur +torlauncher.bootstrapWarning.ioerror=oxuma/yazma xətası +torlauncher.bootstrapWarning.pt_missing=çatışmayan pluggable transport diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 27ae588..ebd1fbc 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Рестартирайте Тор"> <!ENTITY torsettings.optional "Допълнителен"> diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index 2363674..af17760 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Тор лънчер -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Тор се изключи неочаквано.Това може да е поради бъг в самият Тор,друга програма в системата ви или повреден хардуер.Докато не рестартирате Тор браузърът няма да може да отваря никакви сайтове.Ако проблемът продължава моля изпратете вашият Тор Log към нашия екип по поддръжката. +torlauncher.tor_exited2=Рестартирането на Тор няма да затвори вашите прозорци в браузъра. torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт torlauncher.tor_failed_to_start=Тор не стартира успешно torlauncher.tor_control_failed=Неуспя да поеме контрол над Тор. @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Никой от избраните м torlauncher.recommended_bridge=(препоръчително) torlauncher.connect=Свържи се -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Рестартирайте Тор torlauncher.quit=Край torlauncher.quit_win=Изход torlauncher.done=Готово torlauncher.forAssistance=За съдействие , моля свържете се с %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Копирането е завършено. %S Съобщенията от Тор log-а са готови да бъдат поставени в текстов редактор или имейл. torlauncher.bootstrapStatus.conn_dir=Свързване с препредаващата директория torlauncher.bootstrapStatus.handshake_dir=Осъществяване на връзка с криптираната директория diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 5dc89c9..5a24e5d 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=Nichtübereinstimmung der Identitäten torlauncher.bootstrapWarning.timeout=Verbindungszeitüberschreitung torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler -torlauncher.bootstrapWarning.pt_missing=Pluggable Transport fehlt +torlauncher.bootstrapWarning.pt_missing=Steckbarer Transport fehlt diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index b375a22..5393cb2 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "TorΡυθμίσεις Δικτύου "> +<!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου ">  @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Χρειάζονται ρυθμίσεις για τις γέφυρες, για το firewall, ή για τον proxy μου."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connectPrompt2 "Θα ήθελα να συνδεθεί άμεσα με το δίκτυο Tor."> <!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> @@ -57,7 +57,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> <!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Αποστολή email στο bridges(a)torproject.org με τη γραμμή «λήψη γεφυρών» από μόνη της στο σώμα του μηνύματος.  Ωστόσο, για να γίνει πιο δύσκολο για έναν εισβολέα να μάθει πολλά από τις διευθύνσεις γεφυρών, θα πρέπει να στείλετε αυτό το αίτημα από ένα από τους επόμενους πάροχους υπηρεσιών ηλεκτρονικού ταχυδρομείου (αναφέρονται κατά σειρά προτίμησης):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> <!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 4f96a94..de02431 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.yes "Jes"> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Konekti"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Restartigi Tor"> <!ENTITY torsettings.optional "Optional"> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Pordo:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Pasvorto:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/eo/progress.dtd b/src/chrome/locale/eo/progress.dtd index 813ba94..9fc2f3b 100644 --- a/src/chrome/locale/eo/progress.dtd +++ b/src/chrome/locale/eo/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.dialog.title "Stato de Tor"> +<!ENTITY torprogress.openSettings "Malfermi agordojn"> <!ENTITY torprogress.heading "Konektante al Tor-reto"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Bonvolu atendi ĝis kiam ni ne starigos konekton al la Tor-reto."> diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 8a3706c..7609a5c 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -1,43 +1,43 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor-startigilo torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_controlconn_failed=Ne eblas konektiĝi al kontrolpordo de Tor. +torlauncher.tor_failed_to_start=Starto de Tor malsukcesis. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed=Tor malsukcesis starigi Tor-retkonekton. +torlauncher.tor_bootstrap_failed_details=%1$S malsukcesis (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S +torlauncher.tor_missing=Tor-komandodosiero mankas. +torlauncher.torrc_missing=Konfigura dosiero torrc mankas. +torlauncher.datadir_missing=Datuma dosierujo de Tor ne ekzistas. +torlauncher.password_hash_missing=Malsukcesis ricevado de haketigita pasvorto. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S +torlauncher.failed_to_save_settings=Ne eblas konservi agordojn de Tor.\n\n%S +torlauncher.ensure_tor_is_running=Bonvolu certiĝi ĉu Tor estas startigita. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_proxy_type_missing=Vi devas elekti tipon de prokurservilo. +torlauncher.error_bridges_missing=Vi devas specifi unu aŭ pli da pontojn. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(rekomendita) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.connect=Konekti +torlauncher.restart_tor=Restartigi Tor +torlauncher.quit=Eliri torlauncher.quit_win=Eliri -torlauncher.done=Done +torlauncher.done=Preta -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Por asiston kontaktu %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopiado estas preta. %S Tor-protokolaj mesaĝoj pretas por enigi ilin en tekstredaktilon aŭ retpoŝtmesaĝon. torlauncher.bootstrapStatus.conn_dir=Konektante al relajsa dosierujo torlauncher.bootstrapStatus.handshake_dir=Starigante ĉifritan dosierujan konekton diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 6b9b4af..3c010cb 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor están listos para ser pegados en un editor de textos o un e-mail. torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 3661088..b1daa5b 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Configuracion De Internet Tor">  diff --git a/src/chrome/locale/es-CL/progress.dtd b/src/chrome/locale/es-CL/progress.dtd index ebd9cef..73f1bbf 100644 --- a/src/chrome/locale/es-CL/progress.dtd +++ b/src/chrome/locale/es-CL/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "Estado Del Modulo Tor"> <!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.heading "Conectando a la red Tor"> +<!ENTITY torprogress.pleaseWait "Por favor espere mientras establecemos una conexión a la red Tor."> diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index 02be756..292e182 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -46,7 +46,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 3e90c07..aab8b06 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor sarera konektatu baino lehen, ordenagailu honen Interneteko konexioari buruzko informazioa eman behar duzu."> <!ENTITY torSettings.yes "Bai"> <!ENTITY torSettings.no "Ez"> <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> @@ -19,9 +19,9 @@  <!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> +<!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> +<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi taldea erabili dezakezu edo zubi talde pertsonalizatua eskuratu eta sar dezakezu.">  @@ -43,20 +43,20 @@ <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa"> <!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:"> <!ENTITY torsettings.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Emandako zubiekin konektatu"> +<!ENTITY torsettings.useBridges.type "Garraio mota:"> +<!ENTITY torsettings.useBridges.custom "Sartu zubi pertsonalizatuak"> <!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka"> <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> <!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "Aurrez konfiguratutako, emandako zubi taldea erabili dezakezu, edo zubi talde pertsonalizatua eskuratu dezakezu hurrengo hiru metodoetako bat aukeratuz: "> <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.  Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu (lehentasunaren arabera zerrendatuta):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 3b755f8..f42720d 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -57,7 +57,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "از طریق اینترنت"> <!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید."> <!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "یک ایمیل حاوی عبارت 'get bridges' به آدرس bridges(a)torproject.org ارسال کنید.  هر چند ، برای اینکه بتوانیم یادگیری آدرس بسیاری از پل‌ها را برای مهاجم سخت‌تر کنیم ، می‌بایست این درخواست را از یکی از سرویس دهنده‌های ایمیل زیر بفرستید ( ذکر شده به ترتیب اولویت ) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, یا https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> <!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index 41348a6..ca5fe24 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -2,20 +2,20 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Bago ka maka-connect sa Tor network, kailangan mong mag-bigay ng impormasyon tungkol sa koneksyon sa Internet ng kompyuter na ito. "> <!ENTITY torSettings.yes "Oo"> <!ENTITY torSettings.no "Wala"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Alin dito ang pinaka angkop na nagsasaad ng iyong sitwasyon?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Kailangan kong i-configure ang bridge o proxy settings"> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Makipag-ugnay"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Kailangan ba ng kompyuter na ito na gumamit ng proxy upang makagamit ng Internet?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "I-restart ang Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index 372f1af..df60b42 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.openSettings "Buksan ang Settings"> <!ENTITY torprogress.heading "Kumukonekta sa network ng Tor"> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index a801b32..23dfc4d 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tagapaglunsad ng Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team. +torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser. torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor. torlauncher.tor_control_failed=Nabigong kontrolin ang Tor. @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibiniga torlauncher.recommended_bridge=(rekomendado) torlauncher.connect=Kumonekta -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=I-restart ang Tor torlauncher.quit=Tumigil torlauncher.quit_win=Lumabas torlauncher.done=Tapos na torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message. torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index 3661088..c2db870 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ja"> +<!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index 02be756..954ef11 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(viðmælt) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 3661088..e189a46 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ja"> +<!ENTITY torSettings.no "Nee"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Wachtwurd:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index 02be756..d735f57 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -27,13 +27,13 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(oanbefelle) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=Klear torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index e377cdf..4d52e92 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -2,25 +2,25 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "לפני שאתה מתחבר לרשת ה-Tor, אתה צריך לספק מידע על חיבור האינטרנט של מחשב זה."> <!ENTITY torSettings.yes "כן"> <!ENTITY torSettings.no "לא"> <!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את המצב שלך באופן הטוב ביותר?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של המחשב הזה מצונזר או עובר בשרת פרוקסי"> +<!ENTITY torSettings.configurePrompt2 "אני צריך להגדיר גשר או הגדרות פרוקסי"> <!ENTITY torSettings.configure "הגדר"> <!ENTITY torSettings.connectPrompt2 "ברצוני להתחבר ישירות אל הרשת Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "זה יעבוד ברוב המקרים."> <!ENTITY torSettings.connect "התחבר"> <!ENTITY torSettings.proxyQuestion "האם מחשב זה צריך להשתמש בפרוקסי כדי לגשת אל האינטרנט?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.proxyHelp "אם אינך בטוח איך לענות לשאלה זו, תבדוק את הגדרות האינטרנט בדפדפן אחר, לראות האם הוא מוגדר להשתמש בפרוקסי."> <!ENTITY torSettings.enterProxy "הזן את הגדרות הפרוקסי."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מצנזר אחרת חיבורים לרשת Tor ?"> +<!ENTITY torSettings.bridgeHelp "אם אינך בטוח איך לענות לשאלה הזו, בחר No.  במידה ותבחר כן, תתבקש להגדיר את גשרי Tor, שהם ממסרים לא רשומים שמקשים לחסום חיבורים לרשת Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  diff --git a/src/chrome/locale/he/progress.dtd b/src/chrome/locale/he/progress.dtd index 136f245..2e3d2c3 100644 --- a/src/chrome/locale/he/progress.dtd +++ b/src/chrome/locale/he/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "מצב Tor"> <!ENTITY torprogress.openSettings "פתח הגדרות"> <!ENTITY torprogress.heading "מתחבר כעת אל רשת Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "בבקשה המתן בזמן שאנחנו יוצרים חיבור לרשת ה-Tor"> diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index 572c45e..cfb3590 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -5,7 +5,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "Ոչ"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index e1b9efd..c1c6e5d 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Yang mana dari di bawah ini cocok dengan situasi anda?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Saya perlu mengkonfigurasi setelan Bridge atau proxy."> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt2 "Saya ingin menghubungkan secara langsung ke jaringan Tor."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Muat ulang Tor"> <!ENTITY torsettings.optional "Opsional"> @@ -57,6 +57,6 @@ <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index fc86fca..cc23057 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -3,50 +3,50 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port Tor +torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada tim pendukung. +torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda. +torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol Tor. torlauncher.tor_failed_to_start=Tor gagal untuk memulai. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor tidak dapat tersambung pada jaringan. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Gagal untuk mendapatkan kontrol Tor. +torlauncher.tor_bootstrap_failed=Tor gagal menghasilkan koneksi jaringan Tor. +torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S torlauncher.tor_missing=Tor executable hilang torlauncher.torrc_missing=File torrc hilang -torlauncher.datadir_missing=Tor data direktori tidak ada. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.datadir_missing=Direktori data Tor tidak ada. +torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S +torlauncher.failed_to_save_settings=Tidak dapat menyimpan pengaturan Tor.\n\n%S +torlauncher.ensure_tor_is_running=Mohon pastikan Tor sedang berjalan. -torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk mengkonfigurasi Tor untuk menggunakan proxy untuk mengakses Internet. +torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk mengkonfigurasi Tor supaya menggunakan sebuah proxy untuk mengakses Internet. torlauncher.error_proxy_type_missing=Anda harus memilih jenis proxy. torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau lebih. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Anda harus memilih satu tipe transportasi untuk bridges yang tersedia. +torlauncher.error_bridge_bad_default_type=Tidak ada bridges tersedia yang memiliki tipe transportasi %S tersedia. Mohon sesuaikan pengaturan Anda. torlauncher.recommended_bridge=(recommended) torlauncher.connect=Hubungi -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Muat ulang Tor torlauncher.quit=Berhenti torlauncher.quit_win=Keluar torlauncher.done=Selesai. -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Untuk bantuan, hubungi $S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email. -torlauncher.bootstrapStatus.conn_dir=Menghubungkan diri ke direktori relay +torlauncher.bootstrapStatus.conn_dir=Menghubungkan ke direktori relay torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori terenkripsi torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan torlauncher.bootstrapStatus.loading_status=Memuat status jaringan torlauncher.bootstrapStatus.loading_keys=Memuat sertifikat otoritas torlauncher.bootstrapStatus.requesting_descriptors=Meminta informasi relay torlauncher.bootstrapStatus.loading_descriptors=Memuat informasi relay -torlauncher.bootstrapStatus.conn_or=Menghubungkan diri ke jaringan Tor +torlauncher.bootstrapStatus.conn_or=Menghubungkan ke jaringan Tor torlauncher.bootstrapStatus.handshake_or=Membuat sirkuit Tor torlauncher.bootstrapStatus.done=Telah terhubung ke jaringan Tor @@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=identitas tidak cocok torlauncher.bootstrapWarning.timeout=waktu koneksi habis torlauncher.bootstrapWarning.noroute=tidak ada rute ke host torlauncher.bootstrapWarning.ioerror=error baca/tulis -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=kehilangan pluggable transport diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 76034db..a5a7768 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -18,7 +18,7 @@ <!ENTITY torSettings.proxyQuestion "このコンピューターはインターネットにアクセスするのにプロキシが必要ですか？">  <!ENTITY torSettings.proxyHelp "この質問にどう答えるべきか確信が持てなければ、Proxyの使用がどのように設定されているか確認するために、他のブラウザのインターネット設定を見てください。"> -<!ENTITY torSettings.enterProxy "Proxy設定を入力"> +<!ENTITY torSettings.enterProxy "プロキシ設定を入力"> <!ENTITY torSettings.bridgeQuestion "あなたのインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックしているか、あるいは別のやり方で検閲していますか？"> <!ENTITY torSettings.bridgeHelp "この質問にどう答えるべきかよくわからない場合は、いいえを選択してください。  はいを選択すると、Tor ネットワークへの接続をブロックすることをさらに困難にするリスト化されていないリレーである Tor Bridges を構成することが求められます。"> <!ENTITY torSettings.bridgeSettingsPrompt "提供されたブリッジのセットを使用するか、あるいはカスタムのブリッジのセットを取得して入力することができます。"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 2dd94b2..a89866e 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "아니오"> <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> +<!ENTITY torSettings.configurePrompt2 "브릿지 또는 프록시 설정을 구성해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> <!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.  단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 아래의 이메일(우선순위대로 기재되어 있음)으로 보내주시면 감사하겠습니다."> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 또는 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> <!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중 한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의해주십시오"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 5ebf2d7..c20a6ac 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=완료 torlauncher.forAssistance=지원자 연결 %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결 torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정 diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index 3640155..a849dfe 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -1,9 +1,9 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=ໂຕເປີດ Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=ອອກຈາກ Tor ໂດຍບໍ່ຄາດຄິດ. ນີ້ອາດເປັນຍ້ອນຂໍ້ຜິດພາດໃນໂຕ ຂອງ Tor ເອງ, ຈາກໂປຣແກຣມອື່ນໃນລະບົບຂອງທ່ານ ຫຼື ຂໍ້ຜິດພາດຈາກໂຕເຄື່ອງເອງ. Tor ຈະບໍ່ສາມາດເຂົ້າເຖິງ ເວັບໄຊຕ໌ ໃດໆໄດ້ ຈົນກວ່າ ທ່ານຈະແລ່ນ Tor ຄືນໃໝ່. ຖ້າຫາກວ່າ ບັນຫາຍັງເປັນຄືເກົ່າ, ກະລຸນາ ສົ່ງສຳເນົາບັນທຶກ Tor ຂອງ ທ່ານ ໄປຍັງ ໜ່ວຍງານສະໜັບສະໜູນໄດ້. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 0e51ad5..3b50645 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor tinklo parametrai">  @@ -7,7 +7,7 @@ <!ENTITY torSettings.yes "Taip"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi Jūsų padėtį?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index b1f594d..99962c4 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -1,43 +1,43 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor Leistuvas -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor arba kitoje programoje, Jūsų sistemoje arba dėl sugedusios techninės įrangos. Kol iš naujo nepaleisite Tor, Tor Naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema kartojasi, prašome išsiųsti Tor įvykių žurnalo kopiją paramos grupei. +torlauncher.tor_exited2=Pakartotinai paleidus Tor naršyklės kortelės nebus uždarytos. +torlauncher.tor_controlconn_failed=Nepavyko prisijungti prie Tor valdymo prievado. torlauncher.tor_failed_to_start=Tor nepavyko paleisti. -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Nepavyko perimti Tor valdymo torlauncher.tor_bootstrap_failed=Tor nepavyko užmegzti ryšio su Tor tinklu. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S). torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.tor_missing=Trūksta Tor vykdomojo failo. +torlauncher.torrc_missing=Trūksta torrc failo +torlauncher.datadir_missing=Nesukurtas Tor duomenų aplankas +torlauncher.password_hash_missing=Nepavyko perskaityti slaptažodžio santrumpos -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Nepavyko perskaityti Tor nustatymo parametrų.\n\n%S +torlauncher.failed_to_save_settings=Nepavyko įrašyti Tor nustatymo parametrų.\n\n%S +torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor yra vykdomas. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=Jei norite, kad Tor prie interneto jungtųsi per įgaliotąjį serverį, turite nurodyti ir prievado numerį, ir serverio IP adresą arba serverio vardą. +torlauncher.error_proxy_type_missing=Turite pasirinkti įgaliotojo serverio tipą. +torlauncher.error_bridges_missing=Turite nurodyti bent vieną tinklų tiltą +torlauncher.error_default_bridges_type_missing=Turite pasirinkti perdavimo būdą nurodytiems tinklų tiltams +torlauncher.error_bridge_bad_default_type=Nepasiekiamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome pakoreguoti nustatymo parametrus. torlauncher.recommended_bridge=(rekomenduojama) torlauncher.connect=Prisijungti -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Pakartotinai paleisti Tor torlauncher.quit=Nutraukti torlauncher.quit_win=Išeiti torlauncher.done=Atlikta -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys @@ -48,14 +48,14 @@ torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliacijos torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliacijos taško informacija torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapStatus.done=Prisijungta prie Tor tinklo! + +torlauncher.bootstrapWarning.done=atlikta +torlauncher.bootstrapWarning.connectrefused=atsisakyta sujungti +torlauncher.bootstrapWarning.misc=įvairūs +torlauncher.bootstrapWarning.resourcelimit=nepakanka išteklių +torlauncher.bootstrapWarning.identity=tapatybės neatitiktis +torlauncher.bootstrapWarning.timeout=per nustatytą laiką nepavyko prisijungti +torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio +torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida +torlauncher.bootstrapWarning.pt_missing=Trūksta įterpiamojo perdavimo diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 63b8ede..6a33288 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tīkla Tor iestatījumi"> +<!ENTITY torsettings.dialog.title "Tor tīkla iestatījumi">  @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nē"> <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> +<!ENTITY torSettings.configurePrompt2 "Man jākonfigurē tiltu vai starpniekserveru iestatījumi."> <!ENTITY torSettings.configure "Konfigurēt"> <!ENTITY torSettings.connectPrompt2 "Es vēlos tieši pieslēgties tīklam Tor."> <!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> <!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu lai apmeklētu https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Sūtiet e-pastu uz bridges(a)torproject.org ar rindu 'get bridges' ziņojuma tekstā.  Taču, lai uzbrucējam būtu sarežģītāk uzzināt daudz tiltu adrešu, Jums jāsūta šis pieprasījums no kāda no šo e-pasta pakalpojumu sniedzēju e-pastiem (uzskatītiem vēlamās izvēles kārtībā):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index 8be9868..fff24bf 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Gatavs torlauncher.forAssistance=Lai saņemtu palīdzību, sazinieties ar %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopēšana paveikta. %S Tor žurnāla ziņojumi sagatavoti ielīmēšanai teksta redaktorā vai e-pasta ziņojumā. torlauncher.bootstrapStatus.conn_dir=Veido savienojumu ar retranslatoru direktoriju torlauncher.bootstrapStatus.handshake_dir=Izveido šifrētu savienojumu ar direktoriju diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index 2367cd5..010b0d4 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=एक किंवा अधिक ब्र torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(शिफारस केलेली) torlauncher.connect=जोडा torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 35f9827..e6d2ccc 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Sebelum anda menyambung ke jaringan Tor, anda mestilah memberi maklumat tentang talian internet komputer ini terlebih dahulu."> <!ENTITY torSettings.yes "Ya"> <!ENTITY torSettings.no "Tidak"> diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 217e82e..8fc9a22 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "Eg vil kopla til direkte til Tor-nettverket."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve"> <!ENTITY torSettings.connect "Kopla til"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index 2a7698b..062fb5c 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -9,7 +9,7 @@ torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S feila (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. @@ -33,7 +33,7 @@ torlauncher.connect=Kople til torlauncher.restart_tor=Start Tor på nytt torlauncher.quit=Avslutt torlauncher.quit_win=Avslutt -torlauncher.done=Done +torlauncher.done=Ferdig torlauncher.forAssistance=For hjelp, kontakt %S @@ -50,9 +50,9 @@ torlauncher.bootstrapStatus.conn_or=Koplar til Tor-nettverket torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Kopla til Tor-nettverket! -torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.done=ferdig torlauncher.bootstrapWarning.connectrefused=tilkopling avslått -torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.misc=ymse torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch torlauncher.bootstrapWarning.timeout=connection timeout diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index b78b35c..2b673b5 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "A conexão internet deste computador encontra-se sob censura ou proxy."> -<!ENTITY torSettings.configurePrompt2 "É preciso configurar bridge ou "> +<!ENTITY torSettings.configurePrompt1 "A conexão Internet deste computador foi censurada, filtrada ou limitada por um proxy."> +<!ENTITY torSettings.configurePrompt2 "Preciso configurar bridge ou configurações de proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index cc07448..2c6d361 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nu"> <!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Această conexiune la internet a computerului este cenzurată sau prin proxy."> +<!ENTITY torSettings.configurePrompt2 "Trebuie să configurez puntea sau configurări proxy."> <!ENTITY torSettings.configure "Configuraţi "> <!ENTITY torSettings.connectPrompt2 "Vreau sa ma conectez direct la reţeaua Tor ."> <!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Prin Web"> <!ENTITY torsettings.bridgeHelp2 "Folosiți un webbrowser pentru a vizita https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Prin email automat"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Trimiteți email la bridges(a)torproject.org cu linia 'get bridges' inclusă în contextul message.  Totuși, pentru a face dificil unui atacator să învețe cât mai multe adrese de punți, trebuie să trimiteți această cerere de la unul dintre următorii furnizori de servicii email (listați în ordinea preferinței):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 1e374d2..127e367 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -3,11 +3,11 @@ torlauncher.error_title=Загрузчик Tor -torlauncher.tor_exited=Tor неожидано завершил работу. Это может быть вызвано ошибкой в сомом Tor, другой программой на компьютере или неисправным оборудованиемю. Пока Tor не будет перезапущен, веб-страницы будут недоступны через Tor Browser. Если проблема неустранима, пожалуйста, отправте копию ваших логов Tor нашей команде поддержки. +torlauncher.tor_exited=Tor неожидано завершил работу. Это может быть вызвано сбоем в самом Tor, другой программой на вашем компьютере или его неисправностью. Пока Tor не будет перезапущен, веб-страницы через Tor Browser будут недоступны. Если проблема не устраняется, пожалуйста, отправьте копию ваших логов Tor нашей команде поддержки. torlauncher.tor_exited2=Перезапуск Тор не закроет вкладки браузера. torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. -torlauncher.tor_control_failed=Не удалось взять контроль над Tor. +torlauncher.tor_control_failed=Не удалось установить связь с Tor. torlauncher.tor_bootstrap_failed=Тор не удалось установить подключение к сети Tor. torlauncher.tor_bootstrap_failed_details=%1$S неудачно (%2$S). @@ -17,13 +17,13 @@ torlauncher.torrc_missing=Файл torrc отсутствует. torlauncher.datadir_missing=Каталог данных Tor не существует. torlauncher.password_hash_missing=Не удаётся получить хэшированный пароль. -torlauncher.failed_to_get_settings=Не удаётся считать настройки Tor.\n\n%S +torlauncher.failed_to_get_settings=Не удаётся загрузить настройки Tor.\n\n%S torlauncher.failed_to_save_settings=Не удаётся сохранить настройки Tor.\n\n%S torlauncher.ensure_tor_is_running=Убедитесь что Tor запущен. torlauncher.error_proxy_addr_missing=Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и использовать прокси для доступа в Интернет. torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси. -torlauncher.error_bridges_missing=Необходимо задать один или несколько мостов. +torlauncher.error_bridges_missing=Необходимо указать один или несколько мостов. torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 3661088..6448004 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor mrežne nastavitve">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Preden se povežete na Tor omrežje, si morate priskrbeti informacije o tej računalniški internet povezavi."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Da"> +<!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.firstQuestion "Kaj od sledečega najbolj ustzrezno opisuje vašo situacijo?"> +<!ENTITY torSettings.configurePrompt1 "Ta računalniška internet povezava je cenzurirana ali neposredna."> +<!ENTITY torSettings.configurePrompt2 "Nastaviti moram premostitev ali nastavitev proxi-ja."> +<!ENTITY torSettings.configure "Oblikovanje"> +<!ENTITY torSettings.connectPrompt2 "Hočem se neposredno povezati na Tor omrežje."> +<!ENTITY torSettings.connectPrompt3 "To deluje v večini primerov."> +<!ENTITY torSettings.connect "Povezava"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Ali ta računalnik rabi proxy za vstop na internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Če niste prepričani za odgovor, poglejte internetne nastavitve v drugem brskalniku, da vidite, ali je nastavljen tako, da uporabljate proxy."> +<!ENTITY torSettings.enterProxy "Vnesite nastavitve strežnika proxy."> +<!ENTITY torSettings.bridgeQuestion "Ali vaš internetni ponudnik (ISP) blokira ali kako drugače cenzurira povezavo na Tor omrežje?"> +<!ENTITY torSettings.bridgeHelp "Če niste prepričani kako odgovoriti na to vprašanje, izberite Ne.  Če ste izbrali Da, boste morali nastaviti Tor premostitve na nenašteta vozlišča, za težje blokiranje povezave na Tor omrežje."> +<!ENTITY torSettings.bridgeSettingsPrompt "Lahko uporabite pripravljene nastavitve povezav ali pridobite in vnesete običajne nastavitve povezav.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Čakanje na zagon Tor-a..."> +<!ENTITY torsettings.restartTor "Ponovno zaženite Tor"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Po izbiri"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.checkbox "Računalnik rabi uporabo proxy-ja za dostop na internet"> +<!ENTITY torsettings.useProxy.type "Proxy tip:"> +<!ENTITY torsettings.useProxy.address "Naslov:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene"> +<!ENTITY torsettings.useProxy.port "Vhod:"> +<!ENTITY torsettings.useProxy.username "Uporabniško ime:"> +<!ENTITY torsettings.useProxy.password "Geslo:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.firewall.checkbox "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata"> +<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:"> +<!ENTITY torsettings.useBridges.checkbox "Moj internetni ponudnik (ISP) blokira povezave na Tor omrežje"> +<!ENTITY torsettings.useBridges.default "Povezava z ponujeno premostitvijo"> +<!ENTITY torsettings.useBridges.type "Tip prometa:"> +<!ENTITY torsettings.useBridges.custom "Vnesite običajne premostitve"> +<!ENTITY torsettings.useBridges.label "Vnesite enega ali več premostitvenih vozlišč (vsakega v svojo vrsto)"> +<!ENTITY torsettings.useBridges.placeholder "vpišite naslov:vrata"> + +<!ENTITY torsettings.copyLog "Kopirajte Tor poročilo v odložišče"> +<!ENTITY torsettings.bridgeHelpTitle "Pomoč premostitveno vozlišče"> +<!ENTITY torsettings.bridgeHelp1 "Če se ne morete povezati v omrežje Tor, je mogoče, da vaš ponudnik internetnih storitev (ISP) ali druga agencija blokira Tor.  Pogosto lahko to obidete s pomočjo Tor premostitvijo, na nenašteta vozlišča, za težje blokiranje."> +<!ENTITY torsettings.bridgeHelp1B "Uporabite lahko že prednastavljen, ponujen niz premostitvenih naslovov ali pa lahko pridobite običajen set naslovov z uporabo enega od treh načinov:"> +<!ENTITY torsettings.bridgeHelp2Heading "Preko Web"> +<!ENTITY torsettings.bridgeHelp2 "Uporabite web brskalnik za obisk https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Preko poštnega avtomatskega odzivnika"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošljite e-pošto na bridges(a)torproject.org z vrstico 'get bridges' v sporočilu. Vendar pa, da otežite napadalcu učenje o vozliščnih naslovih, morate poslati ta zahtevek iz enega od naslednjih ponudnikov e-pošte (navedene po prednostnem vrstnem redu):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "Preko table Pomoči"> +<!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s pošiljanjem olikanega e-sporočila na help(a)rt.torproject.org.  Prosimo, upoštevajte, da dotična oseba odgovarja na vsako zahtevo."> diff --git a/src/chrome/locale/sl-SI/progress.dtd b/src/chrome/locale/sl-SI/progress.dtd index ebd9cef..3153326 100644 --- a/src/chrome/locale/sl-SI/progress.dtd +++ b/src/chrome/locale/sl-SI/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "Tor stanje"> +<!ENTITY torprogress.openSettings "Odpri Nastavitve"> +<!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> +<!ENTITY torprogress.pleaseWait "Prosim počakajte, da se stabilizira povezava v Tor omrežje."> diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index 02be756..e083df9 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -1,61 +1,61 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.error_title=Tor zaganjalnik + +torlauncher.tor_exited=Nepričakovan izstop Tor-a. To je lahko posledica napake v Tor-u samem, drugega programa na vašem sistemu, ali pomanjkljive opreme. Dokler ne boste ponovno zagnali Tor, Tor brskalnik ne more odpreti nobene spletne strani. Če se težave nadaljujejo, prosimo, pošljite kopijo Tor poročila ekipi za podporo. +torlauncher.tor_exited2=Ponoven zagon Tor-a ne bo zaprl tabulatorjev brskalnika +torlauncher.tor_controlconn_failed=Nemogoče se povezati z Tor kontrolnimi vrati +torlauncher.tor_failed_to_start=Tor se ni zagnal. +torlauncher.tor_control_failed=Neuspešen nadzor Tor-a. +torlauncher.tor_bootstrap_failed=Tor ni mogel vzpostaviti Tor mrežno povezavo +torlauncher.tor_bootstrap_failed_details=%1$S neuspešno (%2$S). + +torlauncher.unable_to_start_tor=Nemogoče zagnati Tor,\n\n%S +torlauncher.tor_missing=Tor zagonska manjka. +torlauncher.torrc_missing=Torrc datoteka manjka. +torlauncher.datadir_missing=Tor imenik podatkov ne obstoja. +torlauncher.password_hash_missing=Neuspelo pridobivanje hash gesla. + +torlauncher.failed_to_get_settings=Ni moč pridobiti nastavitve Tor,\n\n%S +torlauncher.failed_to_save_settings=Nastavitve Tor ni mogoče shraniti,\n\n%S +torlauncher.ensure_tor_is_running=Prepričajte se, da Tor deluje. + +torlauncher.error_proxy_addr_missing=Določiti morate tako IP-naslov ali ime gostitelja in številko vrat, da nastavite Tor uporabo proxi-ja za dostop do interneta. +torlauncher.error_proxy_type_missing=Izbrati morate tip proxi-ja +torlauncher.error_bridges_missing=Določiti morate enega ali več mostičkov. +torlauncher.error_default_bridges_type_missing=Izbrati morate tip prometa za ponujene premostitve. +torlauncher.error_bridge_bad_default_type=Nobenih ponujenih premostitev, ki imajo tip transporta% S ni na voljo. Prosimo, da prilagodite nastavitve. + +torlauncher.recommended_bridge=(priporočljivo) + +torlauncher.connect=Povezava +torlauncher.restart_tor=Ponovno zaženite Tor +torlauncher.quit=Opusti +torlauncher.quit_win=Izhod +torlauncher.done=Narejeno + +torlauncher.forAssistance=Za podporo, stik %S + +torlauncher.copiedNLogMessages=Kopiranje končano. % S Tor poročila so pripravljena za lepljenje v urejevalnik besedil ali e-poštno sporočilo. + +torlauncher.bootstrapStatus.conn_dir=Povezovanje na imenik vmesnika +torlauncher.bootstrapStatus.handshake_dir=Urejanje šifriranega imenika povezave +torlauncher.bootstrapStatus.requesting_status=Stanje vzpostavljenega omrežja +torlauncher.bootstrapStatus.loading_status=Stanje nalaganja omrežja +torlauncher.bootstrapStatus.loading_keys=Nalaganje veljavnosti certifikatov +torlauncher.bootstrapStatus.requesting_descriptors=Info zahtevanih vmesnikov +torlauncher.bootstrapStatus.loading_descriptors=Nalaganje informacij vmesnikov +torlauncher.bootstrapStatus.conn_or=Povezovanje v Tor omrežje +torlauncher.bootstrapStatus.handshake_or=Vzpostavljanje Tor povezave +torlauncher.bootstrapStatus.done=Povezan v Tor omrežje + +torlauncher.bootstrapWarning.done=narejeno +torlauncher.bootstrapWarning.connectrefused=povezava zavrnjena +torlauncher.bootstrapWarning.misc=razno +torlauncher.bootstrapWarning.resourcelimit=nezadostni viri +torlauncher.bootstrapWarning.identity=zmešnjava identitet +torlauncher.bootstrapWarning.timeout=potekel čas povezave +torlauncher.bootstrapWarning.noroute=ni poti gostitelja +torlauncher.bootstrapWarning.ioerror=napaka read/write +torlauncher.bootstrapWarning.pt_missing=manjka vtični promet diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 0fb1cbf..ed1ea8b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Подешавања Тор мреже">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Пре него што се повежете на Тор мрежу, требало би да пружите информације о интернет конекцији овог рачунара."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "NE"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.firstQuestion "Шта од понуђеног најбоље описује Вашу ситуацију?"> +<!ENTITY torSettings.configurePrompt1 "Интернет конекција овог рачунара је цензурисана или посредована."> +<!ENTITY torSettings.configurePrompt2 "Требало би да конфигуришем подешавања премошћивача или proxy."> +<!ENTITY torSettings.configure "Конфигуриши"> +<!ENTITY torSettings.connectPrompt2 "Желео бих да се повежем директно на Тор мрежу."> +<!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Да ли овај рачунар мора да користи посредника да би приступио интернету?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Ако нисте сигурни како да одговорите на ово питање, погледајте интернет подешавања у другом прегледачу да видите да ли је подешен да користи proxy."> +<!ENTITY torSettings.enterProxy "Унесите proxy подешавања."> +<!ENTITY torSettings.bridgeQuestion "Да ли Ваш интернет сервис провајдер (ИСП) блокира или на неки други начин цензурише повезивање на Тор мрежу?"> +<!ENTITY torSettings.bridgeHelp "Ако нисте сигурни како да одговорите на ово питање, изаберите Не.  Ако изаберете Да, бићете замољени да подесите Тор Премошћиваче, који су неизлистани преносници чија је улога да отежавају блокирање повезивања на Тор мрежу."> +<!ENTITY torSettings.bridgeSettingsPrompt "Можете користити понуђени сет премошћивача или можете добавити или унети жељени сет премошћивача.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Чекамо да се Тор покрене..."> +<!ENTITY torsettings.restartTor "Поново покрени Тор"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Опционо"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Овај рачунар мора да користи proxy да би приступио интернету."> +<!ENTITY torsettings.useProxy.type "Врста proxyja:"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname"> <!ENTITY torsettings.useProxy.port "Порт:"> <!ENTITY torsettings.useProxy.username "Корисничко име:"> <!ENTITY torsettings.useProxy.password "Lozinka:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове."> <!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.checkbox "Мој интернет сервис провајдер (ИСП) блокира повезивање на Тор мрежу."> +<!ENTITY torsettings.useBridges.default "Повежите се са понуђеним премошћивачима"> +<!ENTITY torsettings.useBridges.type "Врста транспорта:"> +<!ENTITY torsettings.useBridges.custom "Унесите жељене премошћиваче"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "куцајте aдреса:порт"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2Heading "Кроз Мрежу"> +<!ENTITY torsettings.bridgeHelp2 "Користите веб прегледач да посетите https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index 02ae889..9b0e52c 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Тоr Покретач -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Тор је неочекивано изашао. Ово може бити услед грешке у самом Тору, другом програму у Вашем систему, или неисправном хардверy. Пре него што поново покренете Тор, Тор прегледач неће бити у могућности да досегне ниједан сајт. Ако се проблем настави, молимо Вас да пошаљете копију Вашег Тор лога тиму за подршку. +torlauncher.tor_exited2=Поново покретање Тора неће затворити Ваше картице у прегледачу. torlauncher.tor_controlconn_failed=Повезивање на Tor port није успело torlauncher.tor_failed_to_start=Tor није успео да се покрене torlauncher.tor_control_failed=Неуспело преузимање контроле над Tor-om @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Не постоје услови да torlauncher.recommended_bridge=(препоручено) torlauncher.connect=Повежи се -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Поново покрени Тор torlauncher.quit=Искључити torlauncher.quit_win=Излаз torlauncher.done=Gotovo torlauncher.forAssistance=За помоћ контактирајте %Ѕ -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Копирање завршено. %S Top лог поруке су спремне да буду налепљене у уређивач текста или у поруку у електронској пошти. torlauncher.bootstrapStatus.conn_dir=Повезивање са релеј директоријумом torlauncher.bootstrapStatus.handshake_dir=Успостављање шифроване везе директоријума diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd index 878976d..c42db4e 100644 --- a/src/chrome/locale/sv/progress.dtd +++ b/src/chrome/locale/sv/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Öppna inställningar"> <!ENTITY torprogress.heading "Ansluter till Tor-nätverket"> -<!ENTITY torprogress.pleaseWait "Var vänlig vänta medans vi etablerar en anslutning till Tor-nätverket."> +<!ENTITY torprogress.pleaseWait "Vänta medan vi upprättar en anslutning till Tor-nätverket."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index f3839f3..095d0b7 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -3,10 +3,10 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor logg till vår support. +torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. -torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. +torlauncher.tor_failed_to_start=Det gick inte att starta Tor. torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor-nätverket. torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). @@ -37,7 +37,7 @@ torlauncher.done=Klar torlauncher.forAssistance=För assistans, kontakta %S -torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en texteditor eller ett e-postmeddelande. +torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande. torlauncher.bootstrapStatus.conn_dir=Ansluter till en reläkatalog torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning @@ -46,7 +46,7 @@ torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation -torlauncher.bootstrapStatus.conn_or=Ansluter till Tor nätverket +torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nätverket torlauncher.bootstrapStatus.handshake_or=Skapar en Tor-krets torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 4db8e1c..802e83c 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "Hayır"> <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> -<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın internet bağlantısı sansürlü veya vekil sunucu arkasında."> +<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü veya vekil sunucu arkasında."> <!ENTITY torSettings.configurePrompt2 "Köprü veya vekil sunucu ayarlarını yapılandırmam gerekli."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> @@ -17,10 +17,10 @@ <!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternete erişirken bir vekil kullanması gerekiyor mu?">  -<!ENTITY torSettings.proxyHelp "Eğer bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, farklı bir tarayıcıda İnternet seçeneklerine bakın ve bir vekil kullanmak üzere yapılandırılıp yapılandırılmadığına bakın"> +<!ENTITY torSettings.proxyHelp "Eğer bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, farklı bir tarayıcıda İnternet seçeneklerine bakın ve bir vekil kullanmak üzere yapılandırılıp yapılandırılmadığını denetleyin."> <!ENTITY torSettings.enterProxy "Vekil ayarlarını girin."> <!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına bağlantıları engelliyor veya sansürlüyor mu?"> -<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Eğer Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz.">  diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd index 4a46cde..b17bf4b 100644 --- a/src/chrome/locale/tr/progress.dtd +++ b/src/chrome/locale/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanıyor"> -<!ENTITY torprogress.pleaseWait "Biz Tor şebekesi ile bağlantı kurana kadar lütfen bekleyin."> +<!ENTITY torprogress.pleaseWait "Biz Tor ağı ile bağlantı kurana kadar lütfen bekleyin."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index f18ee80..f4ca504 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -25,7 +25,7 @@ torlauncher.error_proxy_addr_missing=İnternete bağlanırken vekil sunucusu kul torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. +torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı değiştirin. torlauncher.recommended_bridge=(önerilen) @@ -41,9 +41,9 @@ torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük mesajları torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor -torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelliyor +torlauncher.bootstrapStatus.requesting_status=Ağ durumu alınıyor torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor -torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını yüklüyor +torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikaları yükleniyor torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor @@ -51,11 +51,11 @@ torlauncher.bootstrapStatus.handshake_or=Tor ağına bağlantı sağlanıyor torlauncher.bootstrapStatus.done=Tor ağına bağlandı! torlauncher.bootstrapWarning.done=tamam -torlauncher.bootstrapWarning.connectrefused=Bağlantı red edildi -torlauncher.bootstrapWarning.misc=Diğer -torlauncher.bootstrapWarning.resourcelimit=Yetersiz kaynak +torlauncher.bootstrapWarning.connectrefused=bağlantı geri çevrildi +torlauncher.bootstrapWarning.misc=çeşitli +torlauncher.bootstrapWarning.resourcelimit=yetersiz kaynak torlauncher.bootstrapWarning.identity=kimlik uyumsuz -torlauncher.bootstrapWarning.timeout=Zaman aşımı -torlauncher.bootstrapWarning.noroute=Yönlendirilecek sunucu yok -torlauncher.bootstrapWarning.ioerror=Okuma/yazma hatası +torlauncher.bootstrapWarning.timeout=zaman aşımı +torlauncher.bootstrapWarning.noroute=yönlendirilecek sunucu yok +torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası torlauncher.bootstrapWarning.pt_missing=takılabilir taşıma kayıp diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index ed3f796..7cb086b 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -29,7 +29,7 @@ torlauncher.error_bridge_bad_default_type=沒有可用的傳輸類型為 %S 的 torlauncher.recommended_bridge=(建議使用) -torlauncher.connect=連接 +torlauncher.connect=連線 torlauncher.restart_tor=重新啟動 Tor torlauncher.quit=離開 torlauncher.quit_win=結束

1 0

[tor-launcher/master] Bump versions to 0.2.7.0.2 (translation updates only).
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit ae0cd6684b460f2602ac096814dc503116a4ed86 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:15:02 2015 +0000 Bump versions to 0.2.7.0.2 (translation updates only). --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7c4ebf6..b78c677 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.0.1</em:version> + <em:version>0.2.7.0.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/maint-4.0] Bug #13776: Incremental MAR files not reproducible
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 1fa248e28610b14a41228cd0533a8fb147c0b928 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Dec 12 11:54:40 2014 -0500 Bug #13776: Incremental MAR files not reproducible Set the locale and umask to avoid differences across systems and users when generating incremental MAR files. --- tools/update-responses/update_responses | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index c788586..b28b575 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -10,9 +10,16 @@ use Cwd; use File::Temp; use File::Find; use File::Which; +use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +# Set umask and locale to provide a consistent environment for MAR file +# generation, etc. +umask(0022); +$ENV{"LC_ALL"} = "C"; +setlocale(LC_ALL, "C"); + my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 );

1 0

[tor-browser-bundle/master] Bug 13857: allow updating responses for a specific channel
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 808746222a49af4e6294dc82397932e331d2a4fd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 19:19:19 2014 +0100 Bug 13857: allow updating responses for a specific channel The update_responses command can now receive a channel name as argument. In that case, only the xml responses for the selected channel(s) are updated. The files are now located in directory htdocfiles/$channel and each channel has its own .htaccess file in that directory. Makefile rules have been added to update the different channels. --- gitian/Makefile | 8 +++- gitian/README.build | 4 ++ tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 66 ++++++++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 1fce05e..eaa22c2 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -54,7 +54,13 @@ signmars-nightly: ./signmars.sh versions.nightly update_responses: - ../tools/update-responses/update_responses + ../tools/update-responses/update_responses release + +update_responses-alpha: + ../tools/update-responses/update_responses alpha + +update_responses-beta: + ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions diff --git a/gitian/README.build b/gitian/README.build index dd7af91..b51fd96 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -82,6 +82,10 @@ Detailed Explanation of Scripts: alpha packages - incrementals-beta: The equivalent to the 'incrementals' rule for beta packages + - update_responses-alpha: The equivalent to the 'update_responses' rule + for alpha packages + - update_responses-beta: The equivalent to the 'update_responses' rule + for beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - signmars-beta: The equivalent to the 'signmars' rule for beta packages diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml deleted file mode 100644 index 910e99d..0000000 --- a/tools/update-responses/htdocs/no-update.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates></updates> diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e66b27d..0c487e3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -24,7 +24,7 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { @@ -46,17 +46,21 @@ sub get_nbprocs { } sub write_htdocs { - my ($file, $content) = @_; + my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; - write_file("$htdocsdir/$file", $content); - $htdocsfiles{$file} = 1; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; } sub clean_htdocs { - opendir(my $d, $htdocsdir); - my @files = grep { ! $htdocsfiles{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$_" } @files; + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } } sub get_sha512_hex_of_file { @@ -233,8 +237,10 @@ sub get_response { } sub write_responses { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; get_version_files($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; @@ -249,43 +255,44 @@ sub write_responses { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}); - write_htdocs("$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}, $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); } } } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } } sub write_htaccess { - my ($config) = @_; - my $htaccess = "RewriteEngine On\n"; + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; my $flags = "[last]"; - foreach my $channel (sort keys %{$config->{channels}}) { + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule " - . "^$channel/[^\/]+/$version/ " - . "no-update.xml $flags\n"; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) { foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt " - . "$version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } + write_htdocs($channel, '.htaccess', $htaccess); } - write_htdocs('.htaccess', $htaccess); } sub check_deps { @@ -322,9 +329,16 @@ sub extract_martools { my %actions = ( update_responses => sub { - write_responses(@_); - write_htaccess(@_); - clean_htdocs; + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + clean_htdocs(@channels); }, gen_incrementals => sub { my ($config) = @_;

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug13857-v2'
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 5401e06508eae0aaa8f6357303b006dd833ba8e5 Merge: bf363a7 ca6ca42 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 8 14:28:00 2015 +0000 Merge remote-tracking branch 'boklm/bug13857-v2' gitian/Makefile | 16 +- gitian/README.build | 8 + tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 196 ++++++++++++++++---- 6 files changed, 189 insertions(+), 42 deletions(-)

1 0

[tor-browser-bundle/master] Add a command to check an update_responses deployement
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit ca6ca42b8a78f5dd6b0cad7db0f8416e3a419332 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0

[tor-browser-bundle/master] Bug 13857: allow making incrementals MARs for a specific channel
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 0f37c120647be48614d3af9512bcc06ba295fa34 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 14:43:12 2014 +0100 Bug 13857: allow making incrementals MARs for a specific channel The gen_incrementals can now receive a channel name as argument. In that case, incremental MARs will be created for this channel only. If there is no argument, incremental MARs for all channels are created. Makefile rules have been added for the different channels. --- gitian/Makefile | 8 +++++++- gitian/README.build | 4 ++++ tools/update-responses/update_responses | 24 +++++++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 9613db6..1fce05e 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,7 +33,13 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals + ../tools/update-responses/gen_incrementals release + +incrementals-alpha: + ../tools/update-responses/gen_incrementals alpha + +incrementals-beta: + ../tools/update-responses/gen_incrementals beta signmars: ./signmars.sh versions diff --git a/gitian/README.build b/gitian/README.build index 670e84c..dd7af91 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -78,6 +78,10 @@ Detailed Explanation of Scripts: - hash-nightly: The equivalent to the 'hash' rule for nightly packages - hash-alpha: The equivalent to the 'hash' rule for alpha packages - hash-beta: The equivalent to the 'hash' rule for beta packages + - incrementals-alpha: The equivalent to the 'incrementals' rule for + alpha packages + - incrementals-beta: The equivalent to the 'incrementals' rule for + beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - signmars-beta: The equivalent to the 'signmars' rule for beta packages diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5b85037..e66b27d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -180,14 +180,6 @@ sub create_missing_incremental_mars_for_version { $pm->wait_all_children; } -sub create_all_missing_incremental_mars { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { - get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); - } -} - sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -195,6 +187,16 @@ sub get_config { // $config->{$name}; } +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -325,9 +327,13 @@ my %actions = ( clean_htdocs; }, gen_incrementals => sub { + my ($config) = @_; extract_martools; check_deps; - create_all_missing_incremental_mars(@_); + foreach my $version (channel_to_version($config, @ARGV)) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } }, );

1 0

[torbutton/master] Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable.
by brade＠torproject.org 07 Jan '15

07 Jan '15

commit a8b1333f08cd79699bec0d3d9a74845487c9a8be Author: linostar <linux.anas(a)gmail.com> Date: Tue Jan 6 17:33:39 2015 +0200 Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable. If TOR_DEFAULT_HOMEPAGE is set and the user has not customized the browser home page, it is reset to the value contained in TOR_DEFAULT_HOMEPAGE. --- src/components/startup-observer.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index d7b7bcd..de39e64 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -38,6 +38,16 @@ function StartupObserver() { getService(Ci.nsIObserverService); observerService.addObserver(this, "quit-application-granted", false); + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + var prefName = "browser.startup.homepage"; + if (env.exists("TOR_DEFAULT_HOMEPAGE")) { + // if the user has set this value in a previous installation, don't override it + if (!this._prefs.prefHasUserValue(prefName)) { + this._prefs.setCharPref(prefName, env.get("TOR_DEFAULT_HOMEPAGE")); + } + } + try { var test = this._prefs.getCharPref("torbrowser.version"); this.is_tbb = true;

1 0

[tor-browser-bundle/master] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit bf363a746eeb3a5e7243f573a5ffeda93a31aa9f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit 8df1fb275aa6427f4af9c683e06d4ad4c0c07727 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit f256d6c751a7c51dfa511dcf18babe1b3f792577 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6f9d97b..a8c9475 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e17b071..b970b51 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit e8b710e8688b29e2850e38e72583713adf65c92a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index b6ec79f..d2d6e17 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4e6cead..2e1efeb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Updating the README.build.
by gk＠torproject.org 19 Dec '14

19 Dec '14

commit fa3ac404e97e5dcb25e31e9ec7dfddf229714d22 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 19 10:38:33 2014 +0000 Updating the README.build. This update takes account of the changes landed in #13379 and earlier updater related bugs. It removes the section with spurious hangs during builds as the underlying libfaketime problems should be fixed with the switch to a newer libfaketime providing a more fine-grained control via FAKETIME_SKIP_CMDS and friends. --- gitian/README.build | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 24a67a8..670e84c 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -46,15 +46,19 @@ Detailed Explanation of Scripts: several helper scripts to make things easier. 0. Makefile: The main Makefile. It has the following commands: + - all: The default. It calls the 'clean', 'prep' and 'build' rules - prep: Check OS prerequisites and download source dependency inputs - build: Build localized bundles for Linux, Windows, and Mac - clean: Remove prior partial build stages (see 'Partial Rebuilds' below for the usage of clean-* commands) - vmclean: Remove VM base images - - distclean: Remove source dependency inputs, and run clean and vmclean - - all: The default. It calls clean, prep, and then build. - - sign: Signs your build output and uploads it to people.torproject.org - - match: Checks your build output against public signed hashes + - distclean: Remove source dependency inputs, and run 'clean' and 'vmclean' + - sign: Sign your build output and uploads it to people.torproject.org + - match: Check your build output against public signed hashes + - hash: Create the SHA256 sums + - incrementals: Create the incremental update (.mar) files + - update_responses: Create .xml and .htaccess files for the updater + - signmars: Create the signatures for the update (.mar) files To build beta/alpha/nightly bundles, alternate targets are provided: - nightly: The equivalent to the 'all' rule for nightly packages - alpha: The equivalent to the 'all' rule for alpha packages @@ -71,6 +75,12 @@ Detailed Explanation of Scripts: - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - match-beta: The equivalent to the 'match' rule for beta packages + - hash-nightly: The equivalent to the 'hash' rule for nightly packages + - hash-alpha: The equivalent to the 'hash' rule for alpha packages + - hash-beta: The equivalent to the 'hash' rule for beta packages + - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages + - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages + - signmars-beta: The equivalent to the 'signmars' rule for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. @@ -119,7 +129,13 @@ Detailed Explanation of Scripts: 12. upload-signature.sh: This script signs and uploads your 'sha256sums.txt' file (for use if you are an official builder). - + 13. signmars.sh: This script generates the signatures on the update (.mar) + files. It expects an nssdb directory, containing the key, in the same + directory (i.e. tor-browser-bundle/gitian where it is located, too) and + a certificate with "marsigner" as nickname. Both the default nssdb + directory and the default certificate nickname can get overwritten by + exporting 'NSS_DB_DIR' and 'NSS_CERTNAME' pointing to the directory and + the nickname to be used instead. Partial Rebuilds: @@ -174,22 +190,14 @@ Known Issues and Quirks: creation hangs in the future (or help us write a wrapper script that tests VMs and re-runs the VM creation step if they don't boot). - 2. One out of every 50 builds or so, 'make' locks up at some point during a - build, probably due to timestamp issues inside the Gitian VM. The - symptoms of this are a hung build where the VM or LXC container processes - are consuming no CPU. - - Simply re-running 'make build' will resume the appropriate bundle - component for you. - - 3. If you use git branches for any repos instead of tags (for example, for + 2. If you use git branches for any repos instead of tags (for example, for a development or nightly build), fresh commits will need to be merged manually (or better git-fu is needed in ./fetch-inputs.sh, as it is currently meant to deal with tags only). - 4. Running more than one instance of Gitian at a time is not supported. + 3. Running more than one instance of Gitian at a time is not supported. - 5. Related: If you perform a fresh Gitian checkout for purposes of + 4. Related: If you perform a fresh Gitian checkout for purposes of verification, be sure to kill any stray qemu VM processes before starting the new build (because the new Gitian checkout will not have the PID or SSH keys of the previous instances' VM, and VM startup will either hang

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Adding our MAR signing keys.
by gk＠torproject.org 18 Dec '14

18 Dec '14

commit e1fdf99b8cf2d98e13ef5fa112935f96614d6af5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 18 13:25:44 2014 +0000 Bug 13379: Adding our MAR signing keys. --- toolkit/mozapps/update/updater/release_primary.der | Bin 709 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 713 -> 1233 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 11417c3..542fb24 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 16a7ef6..334fad8 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-bundle/master] Bug 13379: Sign our MAR files.
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 17 16:57:28 2014 -0500 Bug 13379: Sign our MAR files. In the Linux mar-tools package, include certutil, signmar, and the required NSS and NSPR libraries. Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. Add a series of 'signmar' make targets which run a new signmars.sh script, which does the following: 1. Prompts for an NSS password (the script assumes that an nssdb directory exists that contains the signing key/cert). 2. Moves original (unsigned) MAR files to a TORBROWSER_VERSION-unsigned/ directory. 3. Signs each of the MAR files, placing the signed files in the TORBROWSER_VERSION/ directory. You may set NSS_DB_DIR and/or NSS_CERTNAME before running signmars.sh; the defaults are ./nssdb and marsigner --- gitian/Makefile | 15 +++ gitian/descriptors/linux/gitian-firefox.yml | 11 +++ gitian/signmars.sh | 135 +++++++++++++++++++++++++++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 +++++-- 5 files changed, 189 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..9613db6 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,21 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +signmars: + ./signmars.sh versions + +signmars-alpha: + ./signmars.sh versions.alpha + +signmars-beta: + ./signmars.sh versions.beta + +signmars-nightly: + ./signmars.sh versions.nightly + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 5f96b6e..a1abf2e 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -136,12 +136,23 @@ script: | rm -f $INSTDIR/Browser/*.chk # # Make MAR-based update tools available for use during the bundle phase. + # Note that mar and mbsdiff are standalone tools, compiled for the build + # host's architecture. We also include signmar, certutil, and the libraries + # they require; these utilities and libraries are built for the target + # architecture. MARTOOLS=~/build/mar-tools mkdir -p $MARTOOLS cp -p config/createprecomplete.py $MARTOOLS/ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreebl3.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 + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done cd ~/build zip -r mar-tools-linux${GBUILD_BITS}.zip mar-tools cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ diff --git a/gitian/signmars.sh b/gitian/signmars.sh new file mode 100755 index 0000000..fdb531e --- /dev/null +++ b/gitian/signmars.sh @@ -0,0 +1,135 @@ +#!/bin/bash +# +# +# You may set NSS_DB_DIR and/or NSS_CERTNAME before invoking this script. + +set -e +set -u + +WRAPPER_DIR=$(dirname "$0") +WRAPPER_DIR=$(readlink -e "$WRAPPER_DIR") + +if [ -z "${NSS_DB_DIR+x}" ]; then + NSS_DB_DIR=$WRAPPER_DIR/nssdb +fi + +if [ -z "${NSS_CERTNAME+x}" ]; then + NSS_CERTNAME=marsigner +fi + +# Incorporate definitions from the versions file. +if [ -z "$1" ]; then + VERSIONS_FILE=$WRAPPER_DIR/versions +else + VERSIONS_FILE=$1 +fi + +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + +export LC_ALL=C + +# Check some prerequisites. +if [ ! -r "$NSS_DB_DIR/cert8.db" ]; then + >&2 echo "Please create and populate the $NSS_DB_DIR directory" + exit 2 +fi + +OSNAME="" +ARCH="$(uname -s)-$(uname -m)" +case $ARCH in + Linux-x86_64) + OSNAME="linux64" + ;; + Linux-i*86) + OSNAME="linux32" + ;; + *) + >&2 echo "Unsupported architecture $ARCH" + exit 2 +esac + +# Extract the MAR tools so we can use the signmar program. +MARTOOLS_TMP_DIR=$(mktemp -d) +trap "rm -rf $MARTOOLS_TMP_DIR" EXIT +MARTOOLS_ZIP="$WRAPPER_DIR/../../gitian-builder/inputs/mar-tools-${OSNAME}.zip" +cd $MARTOOLS_TMP_DIR +unzip -q "$MARTOOLS_ZIP" +cd $WRAPPER_DIR +export PATH="$MARTOOLS_TMP_DIR/mar-tools:$PATH" +if [ -z "${LD_LIBRARY_PATH+x}" ]; then + export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools" +else + export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools:$LD_LIBRARY_PATH" +fi + +# Prompt for the NSS password. +# TODO: Test that the entered NSS password is correct. But how? Unfortunately, +# both certutil and signmar keep trying to read a new password when they are +# given an incorrect one. +read -s -p "NSS password:" NSSPASS +echo "" + +# Sign each MAR file. +# +# Our strategy is to first move all .mar files out of the TORBROWSER_VERSION +# directory into a TORBROWSER_VERSION-unsigned/ directory. Details: +# If a file has not been signed, we move it to the -unsigned/ directory. +# If a file has already been signed and a file with the same name exists in +# the -unsigned/ directory, we just delete the signed file. +# If a file has already been signed but no corresponding file exists in +# the -unsigned/ directory, we report an error and exit. +# +# Once the above is done, the -unsigned/ directory contains a set of .mar +# files that need to be signed, so we go ahead and sign them one-by-one. +SIGNED_DIR="$WRAPPER_DIR/$TORBROWSER_VERSION" +UNSIGNED_DIR="$WRAPPER_DIR/${TORBROWSER_VERSION}-unsigned" +mkdir -p "$UNSIGNED_DIR" +cd "$SIGNED_DIR" +for marfile in *.mar; do + if [ ! -f "$marfile" ]; then + continue; + fi + + # First, we check for an existing signature. The signmar -T output will + # include a line like "Signature block found with N signatures". + SIGINFO_PREFIX="Signature block found with " + SIGINFO=$(signmar -T "$marfile" | grep "^${SIGINFO_PREFIX}") + SIGCOUNT=0 + if [ ! -z "$SIGINFO" ]; then + SIGCOUNT=$(echo $SIGINFO | sed -e "s/${SIGINFO_PREFIX}//" -e 's/$[0-9]*$.*$/\1/') + fi + if [ $SIGCOUNT -eq 0 ]; then + # No signature; move this .mar file to the -unsigned/ directory. + mv "$marfile" "$UNSIGNED_DIR/" + elif [ -e "$UNSIGNED_DIR/$marfile" ]; then + # We have an -unsigned/ copy; discard this file. + rm "$marfile" + else + >&2 echo "Error: $SIGNED_DIR/$marfile is already signed but $UNSIGNED_DIR/$marfile is missing" + # TODO: Try to remove the existing signature(s) from marfile? + exit 1 + fi +done + +# Use signmar to sign each .mar file that is now in the -unsigned directory. +TMPMAR="$SIGNED_DIR/tmp.mar" +trap "rm -f $TMPMAR" EXIT +cd "$UNSIGNED_DIR" +COUNT=0 +for marfile in *.mar; do + if [ ! -f "$marfile" ]; then + continue; + fi + echo "$NSSPASS" | signmar -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s \ + "$marfile" "$TMPMAR" + mv "$TMPMAR" "$SIGNED_DIR/$marfile" + COUNT=$((COUNT + 1)) +done + +echo "The $COUNT MAR files located in $SIGNED_DIR/ have been signed." +echo "The unsigned (original) MAR files are in $UNSIGNED_DIR/" diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits