May 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 25817: add ansible roles for tbb-nightly setup
by gk＠torproject.org 08 May '18

08 May '18

commit a2f565643d4c34a49712c37e3931dd6f80da7ba1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 16 19:30:02 2018 +0200 Bug 25817: add ansible roles for tbb-nightly setup --- README | 43 ++------ tools/ansible/Makefile | 3 + tools/ansible/README | 6 ++ tools/ansible/boklm-tbb-nightly-build.yml | 7 ++ .../boklm-tbb-nightly/tbb-nightly-build.yml | 3 + tools/ansible/inventory | 4 + .../roles/tbb-nightly-build/defaults/main.yml | 11 ++ .../roles/tbb-nightly-build/handlers/main.yml | 5 + .../ansible/roles/tbb-nightly-build/tasks/main.yml | 84 +++++++++++++++ .../roles/tbb-nightly-build/templates/nginx.conf | 16 +++ .../tbb-nightly-build/templates/rbm.local.conf | 116 +++++++++++++++++++++ .../tbb-nightly-build/templates/start-tbb-nightly | 5 + .../tbb-nightly-build/templates/testsuite-config | 27 +++++ .../tbb-nightly-build/templates/www-index.html | 10 ++ 14 files changed, 306 insertions(+), 34 deletions(-) diff --git a/README b/README index d498c05..a20b659 100644 --- a/README +++ b/README @@ -138,43 +138,18 @@ Automated builds using tbb-testsuite ------------------------------------ The Tor Browser testsuite scripts can also be used to do nightly builds -and publish the build logs. +and publish the build logs. The recommended way to do that is to use +the ansible roles from the tools/ansible directory. See next section +for details. -If you want to do that, start by cloning the git repository: - $ git clone https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +Using ansible to set up a nightly build machine +----------------------------------------------- -Install some dependencies: - - # apt-get install -y libdata-dump-perl libfile-slurp-perl \ - libio-captureoutput-perl perlmagick libjson-perl \ - libwww-perl liblwp-protocol-https-perl libtemplate-perl \ - libyaml-syck-perl libdatetime-perl \ - libemail-sender-perl libemail-simple-perl libfile-type-perl \ - libipc-run-perl libxml-libxml-perl - -Copy the config/tor-browser_build-boklm file and edit it: - - $ cd tor-browser-bundle-testsuite - $ cp config/tor-browser_build-boklm config/tor-browser_build-$user - $ vim config/tor-browser_build-$user - -Change the publish_dir and publish_url options. The publish_dir option is -the local directory where the builds will be stored. The publish_url -option is the public URL where the builds will be available. - -Copy the tools/tor-browser-builds-boklm file and edit it to change the ---config= option: - - $ cp tools/tor-browser-builds-boklm tools/tor-browser-builds-$user - $ vim tools/tor-browser-builds-$user - -You can now run ./tools/tor-browser-builds-$user to start the build, and -add it to your crontab. - -The html build reports will be available in the reports/ directory, and -the build files in the tor-browser-builds/ directory (unless you changed -the publish_dir option). +The directory tools/ansible contains some ansible roles to set up a +nightly build machine. You can look at the playbook defined in +boklm-tbb-nightly-build.yml and variables in group_vars/boklm-tbb-nightly/ +for an example of how it can be used. Signing builds diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 608f932..72deb5b 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -3,3 +3,6 @@ ansible-tbb-build: fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml + +boklm-tbb-nightly-build: + ansible-playbook -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/README b/tools/ansible/README index 6b2e6a4..dc69ad7 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -16,3 +16,9 @@ fpcentral: you need to be in the fpcentral tpo ldap group. Your ldap password will be asked, to sudo to the fpcentral user. +boklm-tbb-nightly-build: + This target is used by boklm to deploy a nightly build machine. If + anybody else wants to set up their own nightly builds, it is possible to + do it by adding a new host to the inventory file and making copies of + group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml new file mode 100644 index 0000000..cc37e23 --- /dev/null +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -0,0 +1,7 @@ +--- + +- hosts: boklm-tbb-nightly-build + roles: + - role: tbb-builder + - role: tbb-nightly-build + - role: unattended-upgrades diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml new file mode 100644 index 0000000..ebaadfe --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -0,0 +1,3 @@ +--- +nightly_build_hostname: f4amtbsowhix7rrf.onion +nightly_build_url: 'http://{{ nightly_build_hostname }}' diff --git a/tools/ansible/inventory b/tools/ansible/inventory index 32a5805..fc25842 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,8 +1,12 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True +boklm-tbb-nightly-build ansible_ssh_user=root ansible_become_method=su [tbb-build] build-sunet-a [fpcentral] fpcentral + +[boklm-tbb-nightly] +boklm-tbb-nightly-build diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml new file mode 100644 index 0000000..d84a161 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -0,0 +1,11 @@ +--- +nightly_build_user: tbb-nightly +nightly_build_cron_hour: 2 +nightly_build_cron_minute: 20 +nightly_build_keep_builds: 2 +testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" +testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" +nightly_build_nginx_enable: true +nightly_build_nginx_listen: 127.0.0.1:80 diff --git a/tools/ansible/roles/tbb-nightly-build/handlers/main.yml b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml new file mode 100644 index 0000000..3350d73 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart nginx + service: + name: nginx + state: restarted diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml new file mode 100644 index 0000000..64d31a9 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -0,0 +1,84 @@ +--- +- name: create tbb-nightly user + user: + name: "{{ nightly_build_user }}" + comment: "Tor Browser Nightly Builds" + groups: tbb-build + createhome: yes + home: "/home/{{ nightly_build_user }}" + +- name: clone tor browser testsuite + become: yes + become_user: "{{ nightly_build_user }}" + git: + repo: "{{ testsuite_git_url }}" + dest: "{{ testsuite_dir }}" + version: "{{ testsuite_git_commit }}" + +- name: install testsuite dependencies + command: "{{ testsuite_dir }}/install-deps" + +- name: add testsuite config + template: + src: testsuite-config + dest: "{{ testsuite_dir }}/config/tbb-nightly" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: create rbm-config directory + file: + path: '{{ testsuite_dir }}/rbm-config/' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add rbm config + template: + src: rbm.local.conf + dest: "{{ testsuite_dir }}/rbm-config/tbb-nightly.rbm.local.conf" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: add start-tbb-nightly script + template: + src: start-tbb-nightly + dest: "/home/{{ nightly_build_user }}/start-tbb-nightly" + mode: 0755 + owner: "{{ nightly_build_user }}" + +- name: add cron to start nighly build + cron: + name: tbb-nightly-build + user: "{{ nightly_build_user }}" + hour: "{{ nightly_build_cron_hour }}" + minute: "{{ nightly_build_cron_minute }}" + job: "/home/{{ nightly_build_user }}/start-tbb-nightly" + +- name: create wwwdir + file: + path: '{{ nightly_build_wwwdir }}' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add index page + template: + src: www-index.html + dest: "{{ nightly_build_wwwdir }}/index.html" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: install nginx + apt: + name: nginx + state: present + when: nightly_build_nginx_enable + +- name: add nginx config + template: + src: nginx.conf + dest: /etc/nginx/sites-enabled/tbb-nightly-build + mode: 0644 + notify: + - restart nginx + when: nightly_build_nginx_enable diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf new file mode 100644 index 0000000..9d44bec --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -0,0 +1,16 @@ +server { + listen {{ nightly_build_nginx_listen }}; + server_name {{ nightly_build_hostname }}; + root {{ nightly_build_wwwdir }}; + index index.html; + location / { + try_files $uri $uri/ =404; + } + location /reports { + alias {{ testsuite_dir }}/reports; + } + location /tor-browser-builds { + alias {{ testsuite_dir }}/tor-browser-builds; + autoindex on; + } +} diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf new file mode 100644 index 0000000..fcd6b34 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -0,0 +1,116 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + +buildconf: + buildconf: 1 + + ### The buildconf/num_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 + + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + +var: + local_conf: 1 + + ### The var/sign_build option defines if you want to sign the + ### sha256sums-unsigned-build.txt file with gpg. + #sign_build: 1 + + ### The var/sign_build_gpg_opts option can be used to define some gpg + ### options to select the key to use to sign the sha256sums-unsigned-build.txt + ### file. + #sign_build_gpg_opts: '--local-user XXXXXXXX' + + ### The clean configuration is used by the cleaning script to find the + ### branches and build targets you are using, to compute the list of + ### files that should be kept. + ### + ### If you only do alpha builds for all platforms, you can use the + ### following configuration: + clean: + HEAD: + - project: release + target: + - alpha + - torbrowser-all + - project: release + target: + - nightly + - torbrowser-all + # + ### If you are doing 'release' builds in the maint-7.0 branch and + ### 'alpha' builds in the master branch, you can use the following + ### configuration: + #clean: + # master: + # - project: release + # target: + # - alpha + # - torbrowser-all + # maint-7.0: + # - project: release + # target: + # - release + # - torbrowser-all + +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + + nightly: + + ### By default 'fetch' is set to 1 for nightly builds, meaning that new + ### commits will be fetched automatically during each build. You can + ### disable this during development if you want to do rebuilds to test + ### a specific change, but don't want rebuilds caused by unrelated + ### changes, or if you want to decide at which point new commits are + ### fetched. When 'fetch' is set to 'if_needed', new commits will only + ### be fetched if the selected commit (or branch, or tag) is not present, + ### which means that existing branches won't be updated. In that case + ### you can fetch new commits by running 'make fetch'. + fetch: 'if_needed' + +# vim: filetype=yaml sw=2 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly new file mode 100644 index 0000000..3c1847d --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -0,0 +1,5 @@ +#!/bin/sh +cd {{ testsuite_dir }} +export RBM_NO_DEBUG=1 +./tbb-testsuite --config=tbb-nightly "$@" +./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config new file mode 100644 index 0000000..b537f56 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -0,0 +1,27 @@ +# vim: filetype=perl expandtab +use strict; +use FindBin; +use DateTime; +use TBBTestSuite::TestSuite::TorBrowserBuild; + +my $date = DateTime->now->ymd; +my $name = "tor-browser-$date"; + +if (-d "$options->{'reports-dir'}/r/$name") { + print "Doing nothing: $name already done\n"; + return ( args => [] ); +} + +my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ + publish_dir => "$FindBin::Bin/tor-browser-builds/$date", + publish_url => "{{ nightly_build_url }}/tor-browser-builds/$date", + rbm_local_conf => "$FindBin::Bin/rbm-config/tbb-nightly.rbm.local.conf", + make_clean => 1, + }); + +my %res = ( + name => $name, + args => [ $testsuite ], + tags => [ 'nightly' ], +); +%res; diff --git a/tools/ansible/roles/tbb-nightly-build/templates/www-index.html b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html new file mode 100644 index 0000000..05050d8 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>Tor Browser Nightly Builds</title> +</head> +<body> + <h1>Tor Browser Nightly Builds</title> + <a href="reports/"><h3>Build Reports</h3></a> + <a href="tor-browser-builds/"><h3>Build files</h3></a> +</body> +</html>

1 0

[tor-browser-build/maint-7.5] Bug 20892: use sha256sums-signed-build.txt in download_missing_versions
by gk＠torproject.org 07 May '18

07 May '18

commit da514cdf49e89fb5efbb969cfd74dd561d50f54e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 2 16:10:34 2018 +0100 Bug 20892: use sha256sums-signed-build.txt in download_missing_versions This fixes the download of the osx64 mar files. Previously we were unsigning the downloaded mar files and checking them with sha256sums-unsigned-build.txt. The signed osx64 mar files include files that are code-signed, so unsigning the mar file is not enough to get a mar file matching sha256sums-unsigned-build.txt. --- tools/update-responses/update_responses | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b68e46a..658f451 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -526,22 +526,22 @@ sub download_version { my $destdir = "$releases_dir/$version"; my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; - foreach my $file (qw(sha256sums-unsigned-build.txt sha256sums-unsigned-build.txt.asc)) { + foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { exit_error "Error downloading $urldir/$file"; } } if (system('gpg', '--no-default-keyring', '--keyring', "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/sha256sums-unsigned-build.txt.asc", - "$tmpdir/sha256sums-unsigned-build.txt")) { + "$tmpdir/sha256sums-signed-build.txt.asc", + "$tmpdir/sha256sums-signed-build.txt")) { exit_error "Error checking gpg signature for version $version"; } mkdir $destdir; - move "$tmpdir/sha256sums-unsigned-build.txt.asc", "$destdir/sha256sums-unsigned-build.txt.asc"; - move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; + move "$tmpdir/sha256sums-signed-build.txt.asc", "$destdir/sha256sums-signed-build.txt.asc"; + move "$tmpdir/sha256sums-signed-build.txt", "$destdir/sha256sums-signed-build.txt"; my %sums = map { chomp; reverse split ' ', $_ } - read_file "$destdir/sha256sums-unsigned-build.txt"; + read_file "$destdir/sha256sums-signed-build.txt"; my $martools = 'mar-tools-' . osname . '.zip'; exit_error "Error downloading $urldir/$martools\n" @@ -557,19 +557,13 @@ sub download_version { unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); move "$tmpdir/$martools", "$destdir/$martools"; move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - extract_martools($config, $version); foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n" unless getstore("$urldir/$file", "$tmpdir/$file") == 200; - if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { - exit_error "Error unsigning $file" - if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); - exit_error "Wrong checksum for $file" - unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); - move "$tmpdir/$file.u", "$tmpdir/$file"; - } + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file")); move "$tmpdir/$file", "$destdir/$file"; } }

1 0

[tor-browser-build/master] Release preparations for 8.0a7
by gk＠torproject.org 03 May '18

03 May '18

commit 88f2fc7c4731c73337e0e8f9fb20c87f4768b719 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 08:00:17 2018 +0000 Release preparations for 8.0a7 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index ee79a15..4458d48 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b9d3941..089cbad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 8.0a7 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update Tor Launcher to 0.2.15.2 + * Bug 25807: Change front domain to unbreak Moat + * Translations update + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) + * Bug 25458: Fix broken UI customization + * Bug 25898: Make Youtube videos play automatically again + * Bug 25980: Improve backport of bug 1448771 (fixes broken Orfox build) + * OS X + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + * Linux + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 1d67b05..e72ce10 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.15.1 +version: 0.2.15.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 87ab109..bb53bcb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0a6' + torbrowser_version: '8.0a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a5 + - 8.0a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release preparations for 0.2.15.2
by gk＠torproject.org 03 May '18

03 May '18

commit 462e972213a2aedeee238361c47931dfa187fd7a Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:25:15 2018 +0000 Release preparations for 0.2.15.2 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..2686aee 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.15.1</em:version> + <em:version>0.2.15.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 03 May '18

03 May '18

commit 7df0806652ae0cba65f9927575fce900f80b5d03 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:23:24 2018 +0000 Translations update --- src/chrome/locale/ar/torlauncher.properties | 18 +++++++++--------- src/chrome/locale/bn-BD/network-settings.dtd | 8 ++++---- src/chrome/locale/da/network-settings.dtd | 8 ++++---- src/chrome/locale/da/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 6 +++--- src/chrome/locale/es/torlauncher.properties | 4 ++-- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 4 ++-- src/chrome/locale/ga/network-settings.dtd | 10 +++++----- src/chrome/locale/ga/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/he/network-settings.dtd | 6 +++--- src/chrome/locale/he/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/hu/network-settings.dtd | 2 +- src/chrome/locale/is/network-settings.dtd | 12 ++++++------ src/chrome/locale/is/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/it/network-settings.dtd | 6 +++--- src/chrome/locale/it/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/ja/network-settings.dtd | 6 +++--- src/chrome/locale/ja/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/ka/torlauncher.properties | 2 +- src/chrome/locale/nb/torlauncher.properties | 6 +++--- src/chrome/locale/nl/network-settings.dtd | 6 +++--- src/chrome/locale/nl/torlauncher.properties | 10 +++++----- src/chrome/locale/pt-BR/torlauncher.properties | 14 +++++++------- src/chrome/locale/pt/network-settings.dtd | 10 +++++----- src/chrome/locale/ro/torlauncher.properties | 4 ++-- src/chrome/locale/ru/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/sk-SK/network-settings.dtd | 8 ++++---- src/chrome/locale/sv/network-settings.dtd | 6 +++--- src/chrome/locale/sv/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/te/torlauncher.properties | 2 +- src/chrome/locale/ti/network-settings.dtd | 4 ++-- src/chrome/locale/ti/torlauncher.properties | 2 +- src/chrome/locale/tr/network-settings.dtd | 4 ++-- src/chrome/locale/tr/torlauncher.properties | 22 +++++++++++----------- 36 files changed, 193 insertions(+), 193 deletions(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 8dbc19a..a0190e7 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من ع torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=يُرجى طلب جسر. torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. torlauncher.bridge_suffix.meek-amazon=(شغال في الصين) torlauncher.bridge_suffix.meek-azure=(شغال في الصين) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.request_a_bridge=عملية طلب جسرٍ جارية … +torlauncher.request_a_new_bridge=عملية طلب جسرٍ جديدة جارية … +torlauncher.contacting_bridgedb=عملية الإتصال بقاعدة الجسور BridgeDB جارية. يُرجى الإنتظار. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=الحل ليس سليمًا بعد. يُرجى إعادة المحاولة. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=المعذرة. لا توجد هناك جسور متوفرة حاليا. torlauncher.connect=اتصل torlauncher.restart_tor=إعادة تشغيل تور @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة torlauncher.bootstrapWarning.pt_missing=الناقل المضاف مفقود -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=لقد قُطع الإتصال مع الخادوم. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=فشِل الإتصال بالخادوم. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=فشِل الإتصال بوكيل البروكسي. diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 51469da..4129ee0 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -41,10 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> <!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> <!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org থেকে একটি সেতুর জন্য অনুরোধ করুন"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "ইমেজ থেকে অক্ষর লিখুন"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "একটি নতুন চ্যালেঞ্জ পান"> +<!ENTITY torsettings.useBridges.captchaSubmit "জমা করা"> <!ENTITY torsettings.useBridges.custom "একটি ব্রিজ প্রদান আমি জানি"> <!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।"> <!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index d196708..77ae01e 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -41,10 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Anmod om en bro fra torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Indtast tegnene fra billedet"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny udfordring"> +<!ENTITY torsettings.useBridges.captchaSubmit "Indsend"> <!ENTITY torsettings.useBridges.custom "Formidl en bro jeg kender"> <!ENTITY torsettings.useBridges.label "Indtast broinformation fra en betroet kilde."> <!ENTITY torsettings.useBridges.placeholder "skriv adresse:port (én pr. linje)"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 8900731..daa4651 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller vært torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Anmod venligst om en bro. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. torlauncher.bridge_suffix.meek-amazon=(virker i kina) torlauncher.bridge_suffix.meek-azure=(virker i kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Anmod om en bro… +torlauncher.request_a_new_bridge=Anmod om en ny bro… +torlauncher.contacting_bridgedb=Kontakter BridgeDB. Vent venligst. +torlauncher.captcha_prompt=Løs CAPTCHA'en for at anmode om en bro. +torlauncher.bad_captcha_solution=Løsningen er ikke korrekt. Prøv venligst igen. +torlauncher.unable_to_get_bridge=Kan ikke hente en bro fra BridgeDB.\n\n%S +torlauncher.no_meek=Browseren er ikke konfigureret til meek, som behøves for at hente broer. +torlauncher.no_bridges_available=Der er ingen broer tilgængelige på nuværende tidspunkt. Beklager. torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ingen rute til vært torlauncher.bootstrapWarning.ioerror=læse/skrive fejl torlauncher.bootstrapWarning.pt_missing=mangler udskiftelig transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Mistede forbindelsen til serveren. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til serveren. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til proxyen. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 760f7b6..9cefcf3 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Geben Sie das Zeichen aus dem Bild ein"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Übermitteln"> <!ENTITY torsettings.useBridges.custom "Biete mir eine Brücke an, die ich kenne"> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index e5a7be7..1aa2bf8 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -74,5 +74,5 @@ torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler torlauncher.bootstrapWarning.pt_missing=Steckbarer Transport fehlt torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Konnte nicht mit dem Server verbinden. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Konnte nicht mit dem Proxy verbinden. diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 8fc6834..365318a 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -5,7 +5,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en tu fichero torrc, un fallo en Tor o en otro programa de tu sistema, o a hardware defectuoso. Hasta que soluciones el problema subyacente y reinices Tor, el Navegador Tor no se iniciará. torlauncher.tor_exited=Tor se cerró inesperadamente. Esto podría deberse a un fallo con el propio Tor, con otro programa de su sistema, o por hardware defectuoso. Hasta que reinicie Tor, el Navegador Tor no podrá abrir ningún sitio web. Si el problema persiste, por favor envíe una copia de su Registro de Tor (log) al equipo de soporte. -torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de su navegador. +torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de tu navegador. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. @@ -47,7 +47,7 @@ torlauncher.quit=Salir torlauncher.quit_win=Salir torlauncher.done=Listo -torlauncher.forAssistance=Para obtener ayuda, contacte con %S +torlauncher.forAssistance=Para obtener ayuda, contacta con %S torlauncher.forAssistance2=Para asistencia, visita %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index de2afe9..c93e71f 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Établissement d’une connexion">  -<!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> +<!ENTITY torlauncher.localePicker.title "Langue du Navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Veuillez choisir une langue.">  diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 804dafa..e3a4b03 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le Navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le Navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index f058db5..2e86b28 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -41,15 +41,15 @@ <!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Iarr droichead ó torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Cuir isteach na carachtair a fheiceann tú sa bpictiúr"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Faigh dúshlán nua"> +<!ENTITY torsettings.useBridges.captchaSubmit "Seol"> <!ENTITY torsettings.useBridges.custom "Úsáid droichead ar m'eolas"> <!ENTITY torsettings.useBridges.label "Cuir isteach eolas faoi dhroichead ó fhoinse iontaofa."> <!ENTITY torsettings.useBridges.placeholder "clóscríobh seoladh:port (ceann amháin ar gach líne)"> -<!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> +<!ENTITY torsettings.copyLog "Cóipeáil Logchomhad Tor go dtí an Ghearrthaisce"> <!ENTITY torsettings.proxyHelpTitle "Cabhair le Seachfhreastalaithe"> <!ENTITY torsettings.proxyHelp1 "Úsáidtear seachfhreastalaí áitiúil nuair a cheanglaítear ó líonra i gcomhlacht, i scoil, nó in ollscoil. Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais, le fáil amach an bhfuil seachfhreastalaí de dhíth."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 9eb336b..27c4568 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Caithfidh tú seoladh IP nó óstainm agus torlauncher.error_proxy_type_missing=Caithfidh tú cineál an tseachfhreastalaí a roghnú. torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú. torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Iarr droichead. torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. torlauncher.bridge_suffix.meek-amazon=(oibríonn sé sa tSín) torlauncher.bridge_suffix.meek-azure=(oibríonn sé sa tSín) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Iarr Droichead... +torlauncher.request_a_new_bridge=Iarr Droichead Nua... +torlauncher.contacting_bridgedb=Ag dul i dteagmháil le BridgeDB. Fan nóiméad. +torlauncher.captcha_prompt=Réitigh an CAPTCHA le droichead a iarraidh. +torlauncher.bad_captcha_solution=Níl an freagra sin ceart. Bain triail eile as. +torlauncher.unable_to_get_bridge=Níorbh fhéidir droichead a fháil ó BridgeDB.\n\n%S +torlauncher.no_meek=Níl thacaíonn an brabhsálaí seo le meek, acmhainn a theastaíonn uait chun droichid a fháil. +torlauncher.no_bridges_available=Níl aon droichead ar fáil faoi láthair. Ár leithscéal. torlauncher.connect=Ceangail torlauncher.restart_tor=Atosaigh Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=níl aon bhealach chuig an óstach torlauncher.bootstrapWarning.ioerror=earráid léite/scríofa torlauncher.bootstrapWarning.pt_missing=córas iompair ionphlugáilte ar iarraidh -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Briseadh an ceangal leis an bhfreastalaí. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Níorbh fhéidir ceangal leis an bhfreastalaí. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Níorbh fhéidir ceangal a bhunú leis an seachfhreastalaí. diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 02f7139..f11c418 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> <!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> <!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "בקש גשר מן torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "הכנס את התווים מהתמונה"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "קבל אתגר חדש"> <!ENTITY torsettings.useBridges.captchaSubmit "הגש"> <!ENTITY torsettings.useBridges.custom "סַפֵּק גשר שאני מכיר"> <!ENTITY torsettings.useBridges.label "הכנס מידע גשר ממקור מהימן."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index cf04e2c..e9b3488 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP א torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=אנא בקש גשר. torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. torlauncher.bridge_suffix.meek-amazon=(עובד בסין) torlauncher.bridge_suffix.meek-azure=(עובד בסין) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=בקש גשר... +torlauncher.request_a_new_bridge=בקש גשר חדש... +torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. +torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. +torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. +torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S +torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. torlauncher.connect=התחבר torlauncher.restart_tor=הפעל מחדש את Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=אין נתיב למארח torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=החיבור אל השרת אבד. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=לא היה ניתן להתחבר אל השרת. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=לא היה ניתן להתחבר אל ייפוי הכוח. diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 9ad1d97..d269276 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Adja meg a karaktereket amik a fenti képen láthatóak"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Elküld"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 617318a..6e259b9 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -41,12 +41,12 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu"> <!ENTITY torsettings.useBridges.default "Veldu innbyggða brú"> <!ENTITY torsettings.useBridges.default.placeholder "veldu brú"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.bridgeDB "Biðja um brú frá torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Settu inn stafina úr myndinni"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Fá nýja gátu"> +<!ENTITY torsettings.useBridges.captchaSubmit "Senda inn"> +<!ENTITY torsettings.useBridges.custom "Gefa brú sem ég þekki"> +<!ENTITY torsettings.useBridges.label "Settu inn upplýsingar um brú frá aðila sem þú treystir."> <!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt (eitt á hverja línu)"> <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c7e04fa..c68bbdc 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=You must specify both an IP address or host torlauncher.error_proxy_type_missing=Þú verður að velja tegund milliþjóns. torlauncher.error_bridges_missing=Þú verður að tilgreina eina eða fleiri brýr. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Biðja um brú. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.bridge_suffix.meek-amazon=(virkar í Kína) torlauncher.bridge_suffix.meek-azure=(virkar í Kína) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Biðja um brú… +torlauncher.request_a_new_bridge=Biðja um nýja brú… +torlauncher.contacting_bridgedb=Tengist BridgeDB. Bíddu aðeins. +torlauncher.captcha_prompt=Leystu CAPTCHA-þrautina til að biðja um brú. +torlauncher.bad_captcha_solution=Þessi lausn er ekki rétt. Reyndu aftur. +torlauncher.unable_to_get_bridge=Tókst ekki að fá brú frá BridgeDB.\n\n%S +torlauncher.no_meek=Þessi vafri er ekki stilltur til að nota 'meek', sem er nauðsynlegt til að geta beðið um brýr. +torlauncher.no_bridges_available=Engar brýr eru tiltækar í augnablikinu. Því miður. torlauncher.connect=Tengjast torlauncher.restart_tor=Endurræsa Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=les/skrifvilla torlauncher.bootstrapWarning.pt_missing=vantar 'pluggable transport' tengileiðir -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Missti tengingu við þjóninn. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Tókst ekki að tengjast þjóninum. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Tókst ekki að tengjast milliþjóninum. diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 94ea8ce..4ad241a 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese"> <!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato"> <!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Richiedi un bridge da torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Inserisci i caratteri dell'immagine"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Carica una nuova verifica"> <!ENTITY torsettings.useBridges.captchaSubmit "Invia"> <!ENTITY torsettings.useBridges.custom "Fornisci un bridge che conosco"> <!ENTITY torsettings.useBridges.label "Inserisci le informazioni del bridge da una fonte fidata."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index c09ad56..7c62bd1 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Affinché Tor sia configurato all'utilizzo torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy. torlauncher.error_bridges_missing=Devi specificare uno o più ponti. torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo di trasporto per il bridge preconfigurato. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Richiedi un bridge. torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. torlauncher.bridge_suffix.meek-amazon=(funziona in Cina) torlauncher.bridge_suffix.meek-azure=(funziona in Cina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Richiedi un bridge... +torlauncher.request_a_new_bridge=Richiedi un nuovo bridge... +torlauncher.contacting_bridgedb=Contatto BridgeDB. Attendere, prego. +torlauncher.captcha_prompt=Risolvi il CAPTCHA per richiedere un bridge. +torlauncher.bad_captcha_solution=La soluzione è sbagliata. Riprova. +torlauncher.unable_to_get_bridge=Impossibile ottenere un bridge da BridgeDB.\n\n%S +torlauncher.no_meek=Questo browser non è configurato per meek, necessario per ottenere dei bridge. +torlauncher.no_bridges_available=Nessun bridge disponibile al momento. Spiacenti. torlauncher.connect=Connetti torlauncher.restart_tor=Riavvia Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=nessun rotta per l'host torlauncher.bootstrapWarning.ioerror=errore di lettura/scrittura torlauncher.bootstrapWarning.pt_missing=pluggable transport mancante -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Connessione al server persa. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Connessione al server fallita. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Connessione al proxy fallita. diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 2e17417..dfcfd48 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています"> <!ENTITY torsettings.useBridges.default "内蔵ブリッジを選択する"> <!ENTITY torsettings.useBridges.default.placeholder "ブリッジを選択"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.orgからブリッジの要求をする"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "画像から文字を入力してください..."> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "チャレンジを更新する"> <!ENTITY torsettings.useBridges.captchaSubmit "生成"> <!ENTITY torsettings.useBridges.custom "知っているブリッジを使う"> <!ENTITY torsettings.useBridges.label "信頼できる情報源からのブリッジ情報を入力してください。"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 270ceba..b55a4df 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=インターネットのアクセスにプ torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。 torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。 torlauncher.error_default_bridges_type_missing=提供されたブリッジ用のトランスポートタイプを選択する必要があります。 -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=ブリッジをリクエストしてください。 torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S がある提供されたブリッジに利用できるものがありません。設定を調整してください。 torlauncher.bridge_suffix.meek-amazon=（中国で動作） torlauncher.bridge_suffix.meek-azure=（中国で動作） -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=ブリッジをリクエスト。\n +torlauncher.request_a_new_bridge=新たなブリッジをリクエスト。 +torlauncher.contacting_bridgedb=BridgeDBとの接続を確立しています。しばらく待って下さい。 +torlauncher.captcha_prompt= ブリッジをリクエストするにはCAPTCHAを解いて下さい。 +torlauncher.bad_captcha_solution=その解答は正しくありません。再度実行してください。 +torlauncher.unable_to_get_bridge=BridgeDBからブリッジを入手できません。\n\n%S +torlauncher.no_meek= このブラウザはmeekを使用するように設定されていないため、ブリッジを入手できません。 +torlauncher.no_bridges_available=今回利用可能なブリッジがありません。 torlauncher.connect=接続 torlauncher.restart_tor=Torを再起動する @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりませ torlauncher.bootstrapWarning.ioerror=読み書きエラー torlauncher.bootstrapWarning.pt_missing=プラグ可能な転送が見つかりません -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=サーバーへの接続が切断されました。\n +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=サーバーに接続できませんでした。\n +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=プロクシーに接続できませんでした。 diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 697b03f..c0dadd3 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=დაკავშირება torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=გასვლა torlauncher.done=შესრულებულია torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 7e4a018..8e97a0d 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -32,10 +32,10 @@ torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har til torlauncher.bridge_suffix.meek-amazon=(virker i Kina) torlauncher.bridge_suffix.meek-azure=(virker i Kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=Forespør en bro… +torlauncher.request_a_new_bridge=Forespør ny bro… torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. +torlauncher.captcha_prompt=Løs CAPTCHA-en for å forespørre en bro. torlauncher.bad_captcha_solution=The solution is not correct. Please try again. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 004f989..91effd7 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor is geblokkeerd in mijn land."> <!ENTITY torsettings.useBridges.default "Selecteer een ingebouwde bridge"> <!ENTITY torsettings.useBridges.default.placeholder "Kies een bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Vraag een bridge aan bij torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Voer de tekens van het plaatje in"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Krijg een nieuwe uitdaging"> <!ENTITY torsettings.useBridges.captchaSubmit "Verzenden"> <!ENTITY torsettings.useBridges.custom "Geef een bridge weer die ik ken"> <!ENTITY torsettings.useBridges.label "Voer bridge informatie van een vertrouwde bron in."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index e2d4b69..9b19476 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -34,9 +34,9 @@ torlauncher.bridge_suffix.meek-azure=(werkt in China) torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is verbroken. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met de proxy. diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 1b20ee1..21d0106 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou u torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. -torlauncher.error_bridgedb_bridges_missing=Por favor, peça uma bridge. +torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte. torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. torlauncher.bridge_suffix.meek-amazon=(funciona na China) torlauncher.bridge_suffix.meek-azure=(funciona na China) -torlauncher.request_a_bridge=Pedir uma bridge... -torlauncher.request_a_new_bridge=Pedir uma nova bridge... +torlauncher.request_a_bridge=Solicitar uma ponte... +torlauncher.request_a_new_bridge=Solicitar uma nova ponte torlauncher.contacting_bridgedb=Entrando em contato com BridgeDB. Por favor, aguarde. -torlauncher.captcha_prompt=Resolva o CAPTCHA para pedir uma bridge. -torlauncher.bad_captcha_solution=A solução está incorreta. Tente novamente. -torlauncher.unable_to_get_bridge=Não foi possível obter uma ponte a partir do BridgeDB.\n\n$S +torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte. +torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente. +torlauncher.unable_to_get_bridge=Não é possível obter uma ponte do BridgeDB.\n\n$S torlauncher.no_meek=Este navegador não está configurado para usar o 'meek', que é necessário para obter pontes. -torlauncher.no_bridges_available=Não existem bridges disponíveis no momento. Sentimos muito. +torlauncher.no_bridges_available=Nenhuma ponte está disponível neste momento. Desculpe. torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar o Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index a359691..f0576fd 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Clique em 'Ligar' para ligar ao Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para ajustar as definições de rede se estiver num país que censura o Tor (tal como China, Egito, Turquia) ou se estiver a ligar a partir de uma rede privada que requer um proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Ligar"> @@ -39,11 +39,11 @@ <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "Tor é censurado no meu país"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default "Selecionar um ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Solicitar uma ponte a partir de torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Insira os carateres da imagem"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obter um novo desafio"> <!ENTITY torsettings.useBridges.captchaSubmit "Submeter"> <!ENTITY torsettings.useBridges.custom "Fornecer uma ponte que eu conheça"> <!ENTITY torsettings.useBridges.label "Inserir a informação de ponte de uma fonte confiável"> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 85857f6..1c6f761 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -6,7 +6,7 @@ torlauncher.error_title=Lansator Tor torlauncher.tor_exited_during_startup=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni de hardware. Până nu vei fixa problema şi restartezi Tor,\nBrowserul Tor nu va porni. torlauncher.tor_exited=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni în hardware. Browserul Tor nu va putea accesa nici un site decât dacă reporniți Tor. Dacă problema persistă, vă rugăm să trimiteți o copie a Tor Log către echipa de suport. torlauncher.tor_exited2=Restartând Tor nu se vor închide ferestrele browserului dvs. -torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. +torlauncher.tor_controlconn_failed=Nu s-a putut conecta la portul de control Tor. torlauncher.tor_failed_to_start=Tor nu poate porni. torlauncher.tor_control_failed=Eșec să preiau controlul Tor. torlauncher.tor_bootstrap_failed=Tor nu a reușit să facă o conexiune la rețeaua Tor. @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor nu poate porni. torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fişierul torrc lipseşte şi nu s-a putut crea. torlauncher.datadir_missing=Directorul de date Tor nu există şi nu a putut fi creat. -torlauncher.password_hash_missing=Eșec parole hashed. +torlauncher.password_hash_missing=Eroare la obținerea hash-ului parolei. torlauncher.failed_to_get_settings=Nu pot obține Tor settings.\n\n%S torlauncher.failed_to_save_settings=Nu pot salva Tor settings.\n\n%S diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 57c5361..3ff6b62 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Вы должны указать IP-адр torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси. torlauncher.error_bridges_missing=Необходимо указать один или несколько мостов. torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Пожалуйста, запросите мост. torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. torlauncher.bridge_suffix.meek-amazon=(работает в Китае) torlauncher.bridge_suffix.meek-azure=(работает в Китае) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Запрос моста… +torlauncher.request_a_new_bridge=Запрос нового моста… +torlauncher.contacting_bridgedb=Обращение к BridgeDB. Пожалуйста, подождите. +torlauncher.captcha_prompt=Решите CAPTCHA для запроса моста. +torlauncher.bad_captcha_solution=Решение не является правильным. Попробуйте ещё раз. +torlauncher.unable_to_get_bridge=Не удалось получить мост из BridgeDB.\n\n%S +torlauncher.no_meek=Этот браузер не настроен должным образом, что необходимо для получения мостов. +torlauncher.no_bridges_available=В настоящее время мостов не имеется. Извините. torlauncher.connect=Соединиться torlauncher.restart_tor=Перезапустить Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=не указан путь к хосту torlauncher.bootstrapWarning.ioerror=ошибка чтения / записи torlauncher.bootstrapWarning.pt_missing=отсутствует подключаемый транспорт -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Соединение с сервером было потеряно. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не удалось подключиться к серверу. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не удалось подключиться к прокси. diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index ba160db..ce4cb7e 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nastavenia Tor Network"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "Pripojiť k Tor"> <!ENTITY torsettings.wizard.title.configure "Nastavenia Tor Network"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Vytváram spojenie">  <!ENTITY torlauncher.localePicker.title "Jazyk Tor Browser"> @@ -25,7 +25,7 @@ <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index cc952f1..b7adc24 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land"> <!ENTITY torsettings.useBridges.default "Välj en inbyggd brygga"> <!ENTITY torsettings.useBridges.default.placeholder "Välj en brygga"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Begär en brygga från torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Ange tecknen från bilden"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny utmaning"> <!ENTITY torsettings.useBridges.captchaSubmit "Skicka"> <!ENTITY torsettings.useBridges.custom "Använd en egen brygga"> <!ENTITY torsettings.useBridges.label "Ange brygg informationen från en betrodd källa"> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 7a8ddda..92800d7 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller vä torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Vänligen begär en brygga. torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. torlauncher.bridge_suffix.meek-amazon=(Fungerar i Kina) torlauncher.bridge_suffix.meek-azure=(Fungerar i Kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Begär en brygga... +torlauncher.request_a_new_bridge=Begär en ny brygga... +torlauncher.contacting_bridgedb=Kontaktar BridgeDB. Vänligen vänta. +torlauncher.captcha_prompt=Lös CAPTCHA:n för att begära en brygga. +torlauncher.bad_captcha_solution=Lösningen är inte korrekt. Vänligen försök igen. +torlauncher.unable_to_get_bridge=Kunde inte ta emot en brygga från BridgeDB.\n\n%S +torlauncher.no_meek=Den här webbläsaren är inte konfigurerad för meek, vilket krävs för att ta emot bryggor. +torlauncher.no_bridges_available=Inga bryggor finns tillgängliga för tillfället, tyvärr. torlauncher.connect=Anslut torlauncher.restart_tor=Starta om Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel torlauncher.bootstrapWarning.pt_missing=Pluggable Transport saknas -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Anslutningen till servern förlorades. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunde inte ansluta till servern. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunde inte ansluta till proxyn. diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index a4d097a..209ac60 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=పూర్తి torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 4615146..bdceb7b 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "ኣራኽብ">  @@ -44,7 +44,7 @@ <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "ኣረክብ"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index 28e2ff6..c438d31 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -41,7 +41,7 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Connect +torlauncher.connect=ኣራኽብ torlauncher.restart_tor=Restart Tor torlauncher.quit=ኣቋርጽ torlauncher.quit_win=ውጻእ diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index add4561..8a45e77 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor engelleniyor"> <!ENTITY torsettings.useBridges.default "Bir hazır köprü seçin"> <!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org'dan köprü iste"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Resimdeki karakterleri girin"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Gönder"> <!ENTITY torsettings.useBridges.custom "Bildiğim bir köprü sağla"> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 1586384..a40956d 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden ba torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Hazır köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Lütfen köprü talep edin. torlauncher.error_bridge_bad_default_type=Hazır köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. torlauncher.bridge_suffix.meek-amazon=(Çin'de çalışır) torlauncher.bridge_suffix.meek-azure=(Çin'de çalışır) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.request_a_bridge=Köprü talep edin... +torlauncher.request_a_new_bridge=Yeni Köprü talep edin... +torlauncher.contacting_bridgedb=Köprü veritabanına bağlanılıyor. Lütfen bekleyin. +torlauncher.captcha_prompt=Köprü talep etmek için lütfen güvenlik kodunu girin. +torlauncher.bad_captcha_solution=Çözümleme doğru değil. Lütfen yeniden deneyin. +torlauncher.unable_to_get_bridge=Köprü veritabanından köprü alınamıyor. torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=Şu anda hiçbir köprü müsait değil. Üzgünüz. torlauncher.connect=Bağlan torlauncher.restart_tor=Tor'u Yeniden Başlat @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sunucu yöneltmesi yok torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası torlauncher.bootstrapWarning.pt_missing=takılabilir aktarım bulunamadı -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Sunucuyla bağlantı kesildi +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Sunucuya bağlanılamadı. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Vekil sunucusuna bağlanılamadı.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 03 May '18

03 May '18

commit 2fb9a2965d240f222a716065a2279a6b71ed2930 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:21:27 2018 +0000 Translations update --- src/chrome/locale/es/aboutTor.dtd | 2 +- src/chrome/locale/fr/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/fr/aboutTor.dtd | 6 +++--- src/chrome/locale/fr/torbutton.dtd | 8 ++++---- src/chrome/locale/fr/torbutton.properties | 10 +++++----- src/chrome/locale/ja/aboutTor.properties | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 6354df7..73ce9ef 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÁS, este navegador tampoco está actualizado."> -<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y luego selecciona Comprobar actualizaciones del Navegador Tor."> +<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y selecciona Comprobar actualización del Navegador Tor."> <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor"> diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index fc83797..04912b6 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ -<!ENTITY aboutTBUpdate.title "Mise à jour du navigateur Tor"> -<!ENTITY aboutTBUpdate.updated "Le navigateur Tor a été mis à jour."> +<!ENTITY aboutTBUpdate.title "Mise à jour du Navigateur Tor"> +<!ENTITY aboutTBUpdate.updated "Le Navigateur Tor a été mis à jour."> <!ENTITY aboutTBUpdate.linkPrefix "Pour les toutes dernières informations sur cette version,"> <!ENTITY aboutTBUpdate.linkLabel "visitez notre site Web"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index fee49c8..6a551d9 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -8,11 +8,11 @@ <!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n’est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n’est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l’oignon, puis choisissez Vérifier les mises à jour du navigateur Tor."> +<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l’oignon, puis choisissez Vérifier les mises à jour du Navigateur Tor."> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> +<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer anonymement sur Internet."> <!ENTITY aboutTor.failure.label "Une erreur s’est produite !"> @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du navigateur Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du Navigateur Tor"> <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> <!ENTITY aboutTor.helpInfo3.label "Exploiter un nœud-relais Tor »"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index ac44ef5..895d922 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -6,12 +6,12 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> <!ENTITY torbutton.context_menu.networksettings.key "R"> -<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du navigateur Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "M"> <!ENTITY torbutton.context_menu.cookieProtections "Protections des fichiers témoins…"> <!ENTITY torbutton.context_menu.cookieProtections.key "T"> <!ENTITY torbutton.button.tooltip "Cliquer pour lancer BoutonTor"> -<!ENTITY torbutton.prefs.security_settings "Paramètres de sécurité du navigateur Tor"> +<!ENTITY torbutton.prefs.security_settings "Paramètres de sécurité du Navigateur Tor"> <!ENTITY torbutton.prefs.restore_defaults "Revenir aux paramètres par défaut"> <!ENTITY torbutton.prefs.custom_warning "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut."> <!ENTITY torbutton.cookiedialog.title "Gérer les protections des fichiers témoins"> @@ -28,13 +28,13 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de suivi à la trace"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L"> <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d’autres utilisateurs du navigateur Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d’autres utilisateurs du Navigateur Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant les performances de votre ordinateur, l’agencement du clavier, les paramètres de langue, l’emplacement des greffons installés, la liste des greffons installés, l’état de votre réseau, l’orientation de l’écran, la taille de l’écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL."> <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Le curseur de sécurité vous permet de désactiver certaines fonctions du navigateur qui pourraient le rendre plus vulnérable aux tentatives de piratage."> <!ENTITY torbutton.prefs.sec_standard_label "Normal"> -<!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du navigateur Tor et des sites Web sont activées."> +<!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du Navigateur Tor et des sites Web sont activées."> <!ENTITY torbutton.prefs.sec_safer_label "Plus sûr"> <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> <!ENTITY torbutton.prefs.sec_safer_list_label "Au réglage Plus sûr :"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 8df885b..f293385 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relayer torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu -torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne. +torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.label.disabled = Tor est désactivé @@ -21,20 +21,20 @@ torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue maternelle pourraient alors s’afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il n’a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l’offre groupée de navigation Tor ? torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor -torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n’est pas sécuritaire d’utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l’offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s’il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. +torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n’est pas sécuritaire d’utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l’offre groupée de navigation Tor. Les propriétés de confidentialité du Navigateur Tor sont aussi supérieures à celles de Firefox, même s’il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus d’informations. torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à vos anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÊtes-vous certain de vouloir activer les greffons ?\n\n torbutton.popup.never_ask_again = Ne plus me poser la question. -torbutton.popup.confirm_newnym = Le navigateur Tor fermera tous les fenêtres et onglets. Les sessions des sites Web seront toutes perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n +torbutton.popup.confirm_newnym = Le Navigateur Tor fermera tous les fenêtres et onglets. Les sessions des sites Web seront toutes perdues.\n\nRedémarrer le Navigateur Tor maintenant pour réinitialiser votre identité ?\n\n torbutton.slider_notification = Le menu de l’oignon vert propose maintenant un curseur de sécurité qui vous permet de régler votre niveau de sécurité. Découvrez-le ! torbutton.slider_notification_button = Ouvrir préférences de sécurité -torbutton.maximize_warning = Maximiser le navigateur Tor peut permettre aux sites Web de déterminer la taille de votre moniteur, ce qui peut être utilisé pour vous suivre à la trace. Nous vous recommandons de garder la taille d’origine des fenêtres du navigateur Tor. +torbutton.maximize_warning = Maximiser le Navigateur Tor peut permettre aux sites Web de déterminer la taille de votre moniteur, ce qui peut être utilisé pour vous suivre à la trace. Nous vous recommandons de garder la taille d’origine des fenêtres du Navigateur Tor. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ce site Web (%S) a essayé d’extraire des données d’image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d’extraire des données d’image de canevas HTML5 ? +canvas.siteprompt=Ce site Web (%S) a essayé d’extraire des données d’image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe Navigateur Tor devrait-il permettre à ce site Web d’extraire des données d’image de canevas HTML5 ? canvas.notNow=Pas maintenant canvas.notNowAccessKey=P canvas.allow=Autoriser à l’avenir diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 848d0dc..5e85397 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=今すぐ寄付願います！ -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: デジタル抵抗運動に力を与える。 +aboutTor.donationBanner.mozilla=今から寄付すると、Mozillaが一緒に同じ金額を寄付します！ -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline1=2006年以来、ジャーナリスト、内部告発者、そして活動家を守っています。 +aboutTor.donationBanner.tagline2=世界的ネットワーク自由 aboutTor.donationBanner.tagline3=フリーダムオンライン -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=世界的に自由な表現を促進します。 aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 25603 - Upgrade Orfox's https-everywhere add-on
by gk＠torproject.org 03 May '18

03 May '18

commit e3effb933616512282e0047d56ed0087cce702a6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 30 14:51:19 2018 +0000 Bug 25603 - Upgrade Orfox's https-everywhere add-on We bundle https-everywhere in-tree and add it using Fennec's distribution system. The newer webextensions versions of https-everywhere do not work with this version of Fennec, so we are using https-everywhere's last extension release (v5.2.21). Unfortunately, this version was released 18 July, 2017 so the ruleset is old. As a workaround, we compiled v5.2.21 and included the ruleset from the 2018.4.11 tag [0]. This created a byte-for-byte reproducible XPI [1]. [0] https://trac.torproject.org/projects/tor/ticket/25603#comment:10 [1] 7a33c13dbd80fd881b1508fca6dc10fca787f8eb4da754104321537240ffb866 --- .../extensions/https-everywhere-eff(a)eff.org.xpi | Bin 0 -> 3094089 bytes .../extensions/https-everywhere(a)eff.org.xpi | Bin 2975335 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere-eff(a)eff.org.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere-eff(a)eff.org.xpi new file mode 100644 index 000000000000..cd801d22b1e1 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere-eff(a)eff.org.xpi differ diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi deleted file mode 100644 index 3b1ed8ec1c02..000000000000 Binary files a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi and /dev/null differ

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 25980 - Define __libcpp_feof when we redefine feof
by gk＠torproject.org 03 May '18

03 May '18

commit d51742d0dd8364c20bb33a15cec5c2ae6d81f9b5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 30 19:02:54 2018 +0000 Bug 25980 - Define __libcpp_feof when we redefine feof On Android, NDK r11b declares __libcpp_feof(FILE*) as a wrapper around feof(FILE*). This is semanticly incorrect when feof is redefined and the function signature changes, therefore causing a type-incompatibility. In this case, within the hyphenation code feof(FILE*) is redefined as feof(hnjFile*), but |struct hnjFile| does not have a converting constructor for FILE. The easy solution is simply redefining __libcpp_feof, as well. Bugfix on 0e1e49d4971bb891152c93b8b62665f24bd8a0c2 --- intl/hyphenation/glue/hnjalloc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/intl/hyphenation/glue/hnjalloc.h b/intl/hyphenation/glue/hnjalloc.h index 5cee1be1b6d7..78e9d8cbee13 100644 --- a/intl/hyphenation/glue/hnjalloc.h +++ b/intl/hyphenation/glue/hnjalloc.h @@ -31,6 +31,11 @@ #define fopen(path,mode) hnjFopen(path,mode) #define fclose(file) hnjFclose(file) #define fgets(buf,count,file) hnjFgets(buf,count,file) +#ifdef __ANDROID__ +#ifdef feof +#define __libcpp_feof(file) hnjFeof(file) +#endif // feof +#endif // __ANDROID__ #define feof(file) hnjFeof(file) #define fgetc(file) hnjFgetc(file)

1 0

[tor-browser-build/master] Bug 26010: Change Snowflake rendezvous to use the Azure domain front
by gk＠torproject.org 03 May '18

03 May '18

commit c37d2bd67589190df77a5936fae2ef74dd0a8d7c Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 06:22:17 2018 +0000 Bug 26010: Change Snowflake rendezvous to use the Azure domain front https://bugs.torproject.org/22782#comment:7 This also uses the newer standalone broker on the backend (rather than the one based on App Engine), but that should be invisible to users. Patch by David Fifield I converted the mac file to a unix file format as well using `dos2unix` to get rid of the ^M characters that started to show up. --- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- .../Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 7fbf63c..12b8aad 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -8,4 +8,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/Plugg ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client ## snowflake configuration -ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 06dbec9..cf7cc2a 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -1,8 +1,8 @@ -## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy - -## meek configuration -ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client - -## snowflake configuration -ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302 +## obfs4proxy configuration +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy + +## meek configuration +ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client + +## snowflake configuration +ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5.4
by gk＠torproject.org 02 May '18

02 May '18

commit ad2095ad97cdb3b27f800561529578f3bac511f7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 2 07:52:50 2018 +0000 Release preparations for 7.5.4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ rbm.conf | 5 ++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 22c7a0b..886cfdc 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 38eb2be..cfa0a78 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.3.13 +version: 2018.4.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f9a328a..7f5a736 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.5.4 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 23439: Exempt .onion domains from mixed content warnings + * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable + * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25020: Add a tbb_version.json file + Tor Browser 7.5.3 -- March 26 2018 * All platforms * Update Firefox to 52.7.3esr diff --git a/rbm.conf b/rbm.conf index 1f7d0d4..ca427f9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5.3' + torbrowser_version: '7.5.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.1 - - 7.5.2 + - 7.5.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0