April 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Update documentation and TODO file.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit e4d79c85701de21e6b15d6a0aba39b4931b4ba71 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 15:40:23 2014 +0200 Update documentation and TODO file. Some of the TODO file may still be out of date. I think we have fixed most of the hardening issues, for example, but we should double check that. --- gitian/README.build | 75 +++++++++++++++++++++++++++++---------------------- gitian/TODO | 7 ----- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index ece4cb6..47a8f57 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -48,18 +48,18 @@ Detailed Explanation of Scripts: 0. Makefile: The main Makefile. It has six main commands: - prep: Check OS prerequisites and download source dependency inputs - build: Build localized bundles for Linux, Windows, and Mac - - clean: Remove prior partial build stages (Tor and Firefox) + - clean: Remove prior partial build stages (see 'Partial Rebuilds' below) - vmclean: Remove VM base images - distclean: Remove source dependency inputs, and run clean and vmclean - all: The default. It calls clean, prep, and then build. - - sign: Signs your build output and uplodas it to people.torproject.org + - sign: Signs your build output and uploads it to people.torproject.org - match: Checks your build output against public signed hashes - To build alpha bundles, alternate targets are provided: - - alpha: The equivalent to the 'all' rule for alpha packages - - build-alpha: The equivalent to the 'build' rule for alpha packages - - prep-alpha: The equivalent to the 'prep' rule for alpha packages - - sign-alpha: Signs your build output and uplodas it to people.torproject.org - - match-alpha: Checks your build output against public signed hashes + To build beta/alpha/nightly bundles, alternate targets are provided: + - beta: The equivalent to the 'all' rule for beta packages + - build-beta: The equivalent to the 'build' rule for beta packages + - prep-beta: The equivalent to the 'prep' rule for beta packages + - sign-beta: Signs your build output and uploads it to people.torproject.org + - match-beta: Checks your build output against public signed hashes 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. @@ -95,31 +95,47 @@ Detailed Explanation of Scripts: call the appropriate descriptors to build a 32bit Mac bundle. It also will create build VM images for you if you haven't done that before. + 9. record-inputs.sh: This script records all of the hashes and bundle + inputs for inclusion in the 'Docs/sources' subdirectory of the bundles + themselves. + + 10. hash-bundles.sh: This script generates a 'sha256sums.txt' file in sorted, + reproducible order. -Partial Rebuilds: + 11. check-match.sh: This script checks your 'sha256sums.txt' file against + any signed, published builds. - The mkbundle shell scripts each have three Gitian stages. + 12. upload-signature.sh: This script signs and uploads your 'sha256sums.txt' + file (for use if you are an official builder). - First, using their platform's gitian-tor.yml Gitian descriptor, they build - tor and the tor dependencies (libevent, zlib, and openssl). Second, using - the gitian-firefox.yml descriptor, they build Firefox with the Tor Browser - patches and preferences applied. Third, in gitian-bundle.yml, they assemble - the bundles using the addons and localization packs. - The Tor and Firefox stages end up as a *gbuilt*.zip files in - ../../gitian-builder/inputs/, and those zip files are used as inputs into - the final bundling and localization stage. If those files exist in that - directory, the corresponding bundle will *not* be built. +Partial Rebuilds: + + The mkbundle shell scripts each have five Gitian stages: + 1. Build support utilities (gitian-utils.yml) + 2. Tor (gitian-tor.yml) + 3. Tor Browser (gitian-firefox.yml) + 4. Pluggable Transports (gitian-pluggable-transports.yml) + 5. Addon and bundle package assembly (gitian-bundle.yml) + + Each stage leaves build artifacts in ../../gitian-builder/inputs/ for use + in later stages. If the artifact files for a given stage are present, that + stage is skipped by a 'make build'. No other dependency checking on build stages is performed. - This means that if any of the source inputs, or the Ubuntu buildchain tools, - or the build tools' dependencies upgrade, your Tor and Firefox inputs will - no longer match those produced by someone else's build from a fresher VM - that downloaded those newer toolchain packages. + If you wish to rebuild only a given stage, there are several 'make clean-' + targets to remove the artifacts for that stage. Running a subsequent + 'make build' after that will rebuild only those targets that have been + cleaned, and then re-package everything again as well. + + Note that if any of the source inputs, or the Ubuntu buildchain tools, or + the build tools' dependencies upgrade, your Tor and Firefox inputs will + no longer match those produced by someone else's build from a fresh build + that downloaded those newer input, dependency, and toolchain packages. - This means for official builds, you should always run 'make clean' (which - is called by the default Makefile target). + This means for official builds, it is a good idea to always run a full + 'make clean' first, or just run 'make'. Known Issues and Quirks: @@ -138,7 +154,8 @@ Known Issues and Quirks: VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before - rebuilding the VMs or starting a new build, too. + rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is + your friend. Once you get a working set of base VMs (in ../../gitian-builder/base-*), you should probably copy them somewhere safe if you want to avoid VM @@ -166,12 +183,6 @@ Known Issues and Quirks: SSH keys of the previous instances' VM, and VM startup will either hang or prompt you for an SSH password). - 6. The number of cpus in the VM images is currently hardcoded at 4. If you - need a different number, please let me know and I will write a patch to - support configuring the number of CPUs easily. - - 7. LXC-built bundles are still not deterministic and may run into other issues. - See TODO file for details. Diagnosing Problems: diff --git a/gitian/TODO b/gitian/TODO index cda7f32..47a1b6f 100644 --- a/gitian/TODO +++ b/gitian/TODO @@ -20,7 +20,6 @@ Short Term: - Refuse to build if `git diff --raw` is non-zero? - Detect arch on Linux - https://trac.torproject.org/projects/tor/ticket/3841 - - Too many libevent libs are included.. Only need a couple Mid Term: - Write a VM test+rebuild script @@ -36,8 +35,6 @@ Mid Term: - Clean up old paths (requires Tor Launcher commits) - Remove FirefoxPortable paths for Windows - Relocate torrc to Library/Tor for MacOS - - DMGs for Mac - https://trac.torproject.org/projects/tor/ticket/4261 - Universal binaries for Mac? - Usability win, but gettor loss (we're at 23M right now) - https://developer.mozilla.org/en-US/docs/Mac_OS_X_Universal_Binaries @@ -48,10 +45,6 @@ Mid Term: - Fix windows issues: - Link to DirectX via Wine (for WebGL) - Weird C++ stdext namespace issues remain :/ - - Accesibility still fails :/ - - https://bugzilla.mozilla.org/show_bug.cgi?id=815581 - - Has conflicts with FF17-ESR :/ - - Can we just pull the whole accessibility dir? - If Tor Launcher fails to load, the browser still can launch - Add browser code to detect missing addons? - Missing/Partial Localization strings can cause this..

1 0

[tor-browser-bundle/master] Fix broken nightly due to patch for bug 11200.
by gk＠torproject.org 25 Apr '14

25 Apr '14

commit 6da5650703e7c10f7592232df379963a44fee079 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 25 15:13:32 2014 +0000 Fix broken nightly due to patch for bug 11200. It seems the patch for bug 11200 does not apply cleanly to the latest tor master anymore. Make sure it gets only applied when 0.2.4 is used. --- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 5c4ae00..826d355 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -78,8 +78,8 @@ script: | git am ~/build/bug11069.patch git am ~/build/bug11156.patch git am ~/build/bug9665.patch + git am ~/build/bug11200.patch fi - git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 98668ac..c3ae8d8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -109,8 +109,8 @@ script: | git am ~/build/bug11069.patch git am ~/build/bug11156.patch git am ~/build/bug9665.patch + git am ~/build/bug11200.patch fi - git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ffac916..5e452b9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -105,8 +105,8 @@ script: | git am ~/build/bug11069.patch git am ~/build/bug11156.patch git am ~/build/bug9665.patch + git am ~/build/bug11200.patch fi - git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 114a2ecd706b99cab9003931db85056b0c60cc4a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 13:15:45 2014 +0000 Update translations for torbutton-brandproperties_completed --- bg/brand.properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bg/brand.properties b/bg/brand.properties new file mode 100644 index 0000000..8f4fb88 --- /dev/null +++ b/bg/brand.properties @@ -0,0 +1,15 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShortName=Tor браузър +brandFullName=Tor браузър +vendorShortName=Проекта Tor + +homePageSingleStartMain=Firefox Start,една бърза начална страница с вградена търсачка +homePageImport=Импортирай началната страница от %S + +homePageMigrationPageTitle=Избор на начална страница +homePageMigrationDescription=Моля изберете началната страница която искате да използвате: + +syncBrandShortName=Синхронизирай

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit cf16f720e8af01f8caf0781c616b3a5909fe6986 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 13:15:41 2014 +0000 Update translations for torbutton-brandproperties --- bg/brand.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bg/brand.properties b/bg/brand.properties index 0e1c27b..8f4fb88 100644 --- a/bg/brand.properties +++ b/bg/brand.properties @@ -6,10 +6,10 @@ brandShortName=Tor браузър brandFullName=Tor браузър vendorShortName=Проекта Tor -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start,една бърза начална страница с вградена търсачка +homePageImport=Импортирай началната страница от %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Избор на начална страница +homePageMigrationDescription=Моля изберете началната страница която искате да използвате: -syncBrandShortName=Sync +syncBrandShortName=Синхронизирай

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit f12f0a31c8f426ab41dcb23736238d63fc1e16b9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 10:15:47 2014 +0000 Update translations for torbutton-torbuttonproperties --- id/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id/torbutton.properties b/id/torbutton.properties index 35d5c33..aee8133 100644 --- a/id/torbutton.properties +++ b/id/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Pengujian proxy Tor otomatis gagal menggunaka torbutton.prefs.recommended = (disarankan) torbutton.prefs.optional = (opsional) torbutton.prefs.crucial = (krusial) -torbutton.popup.external.title = Download an external file type? -torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.external.title = Unduh sebuah tipe file eksternal? +torbutton.popup.external.app = Browser Tor tidak dapat menampilkan file ini. Anda butuh aplikasi lain untuk membukanya\n +torbutton.popup.external.note = Beberapa tipe file dapat menyebabkan aplikasi terkoneksi ke internet tanpa menggunakan Tor\n\n +torbutton.popup.external.suggest = Agar aman, sebaiknya anda hanya membuka file selagi offline, atau gunakan Tor Live CD seperti Tails.\n +torbutton.popup.launch = Unduh file torbutton.popup.cancel = Batal -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Secara otomatis file-file akan di unduh mulai sekarang torbutton.popup.test.no_http_proxy = Pengujian proxy Tor: Proxy HTTP lokal tidak dapat dijangkau. Apakah Polipo berjalan sebagaimana mestinya? torbutton.popup.captcha.title = Hindari Captcha Google? torbutton.popup.captcha.ask = Torbutton mendeteksi sebuah Captcha Google. Apakah Anda ingin beralih pada mesin pencari lainnya untuk pencarian kali ini?

1 0

[tor-browser-bundle/master] Fix broken nightly due to patch for bug 9229.
by gk＠torproject.org 25 Apr '14

25 Apr '14

commit d984aa174e42c1a1919ed8a763ab33b095067278 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 25 11:46:35 2014 +0000 Fix broken nightly due to patch for bug 9229. It seems the patch for bug 9229 does not apply cleanly to the latest tor master anymore. Make sure it gets only applied when 0.2.4 is used. --- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 60a5015..5c4ae00 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -71,9 +71,9 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 3304f76..98668ac 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -102,9 +102,9 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ce4ef63..ffac916 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -98,9 +98,9 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit e70fd2f67ace02fd9519d991639b4cb5d847ae05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 09:45:36 2014 +0000 Update translations for tor-launcher-network-settings --- bg/network-settings.dtd | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index a38b198..2ad9e78 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -2,27 +2,27 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Преди да се свържете към Tor мрежата,вие трябва да предоставите информация относно интернет връзката на този компютър"> <!ENTITY torSettings.yes "Да"> <!ENTITY torSettings.no "Не"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> +<!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана,филтрирана или преминава през прокси."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.configure "Конфигурирай"> +<!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> +<!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Нуждае ли се този компютър от прокси за свързване към Интернет?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> +<!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> +<!ENTITY torSettings.firewallQuestion "Интернет връзката на този компютър преминава ли през firewall,който позволява връзки към определени портове?"> +<!ENTITY torSettings.firewallHelp "Ако не сте сигурни как да отговорите на въпроса,изберете Не.Ако срещнете проблеми при свързване към Tor мрежата променете тези настройки."> +<!ENTITY torSettings.enterFirewall "Въведете списък с портове разделени със запетая,които са позволени от firewall."> +<!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -33,8 +33,8 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Този компютър се нуждае от прокси за да се свърже към Интернет."> +<!ENTITY torsettings.useProxy.type "Прокси Тип:"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -43,21 +43,21 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Този компютър се свързва през firewall,който позволява връзки само към определени портове."> <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "въведете адрес:порт"> <!ENTITY torsettings.copyLog "Копирай Tor лога в клипборда"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2Heading "През Web"> +<!ENTITY torsettings.bridgeHelp2 "Използвайте уеб браузър за да посетите https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 7dbc23c92cb7e465a51db14246cf2c83a6b90f77 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 09:15:49 2014 +0000 Update translations for torbutton-torbuttondtd --- bg/torbutton.dtd | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd index 89d1566..e8f3687 100644 --- a/bg/torbutton.dtd +++ b/bg/torbutton.dtd @@ -30,28 +30,28 @@ <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Относно Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "Отвори Мрежови Настройки…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Свали ъпдейт на Tor Браузър Пакет..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie Защита"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> +<!ENTITY torbutton.context_menu.copyTor "Копирай Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab"> +<!ENTITY torbutton.context_menu.openTorTab "Отвори Tor URL в нов Подпрозорец"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window"> +<!ENTITY torbutton.context_menu.openTorWindow "Отвори Tor URL в нов Прозорец"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Security Settings"> +<!ENTITY torbutton.button.tooltip "Натисни за инициализиране на Torbutton"> +<!ENTITY torbutton.prefs.sec_settings "Настройки по Сигурноста"> <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> <!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> <!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> -<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> +<!ENTITY torbutton.prefs.block_cache "Блокирай достъпа до кеша на диска и паметта при използване на Tor"> <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> <!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose"> <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> @@ -59,17 +59,17 @@ <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> <!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> -<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage"> +<!ENTITY torbutton.prefs.no_updates "Изключи обновявания по време на използване на Tor"> <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> -<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> -<!ENTITY torbutton.prefs.cookies "Cookies"> -<!ENTITY torbutton.prefs.cache "Cache"> -<!ENTITY torbutton.prefs.history "History"> +<!ENTITY torbutton.prefs.dynamic "Динамично Съдържание"> +<!ENTITY torbutton.prefs.cookies "Бисквитки"> +<!ENTITY torbutton.prefs.cache "Кеш"> +<!ENTITY torbutton.prefs.history "История"> <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> -<!ENTITY torbutton.prefs.shutdown "Shutdown"> +<!ENTITY torbutton.prefs.shutdown "Изключване"> <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> <!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> -<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> +<!ENTITY torbutton.prefs.no_shutdown "Не изчиствай бисквитките при изключване"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> @@ -102,17 +102,17 @@ <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> <!ENTITY torbutton.prefs.restore_defaults "Възстанови стандартните"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> +<!ENTITY torbutton.prefs.test_settings "Тествай Настройките"> <!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk"> +<!ENTITY torbutton.prefs.tor_memory_jar "Не записвай бисквитките на Tor в диска"> <!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk"> <!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:"> <!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor"> <!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor"> <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> +<!ENTITY torbutton.prefs.no_proxies_on "Без приксита за: "> <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> <!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options"> @@ -121,12 +121,12 @@ <!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> +<!ENTITY torbutton.cookiedialog.lockCol "Защитен"> +<!ENTITY torbutton.cookiedialog.domainCol "Хост"> <!ENTITY torbutton.cookiedialog.nameCol "Име"> <!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> +<!ENTITY torbutton.cookiedialog.protectCookie "Защити Бисквитки"> +<!ENTITY torbutton.cookiedialog.removeCookie "Изтрий Бисквитки"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 25 Apr '14

25 Apr '14

commit 14679b3a739980916383c1e0aaf513ded5f8f1fb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 25 09:15:09 2014 +0000 Update translations for torcheck --- bg/torcheck.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/bg/torcheck.po b/bg/torcheck.po index e358b02..4986ae8 100644 --- a/bg/torcheck.po +++ b/bg/torcheck.po @@ -3,12 +3,13 @@ # # Translators: # sandstorm <ivanov.aleksandar.m(a)gmail.com>, 2013 +# Bavarian <mr.cyberpower(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 08:22+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-25 09:10+0000\n" +"Last-Translator: Bavarian <mr.cyberpower(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "" +msgstr "Поздравления.Вашият браузър е настроен да използва Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -27,7 +28,7 @@ msgid "" msgstr "Моля, посетете <a href=\"https://www.torproject.org/\">Страницата на Tor</a> за повече информация относно използването на Tor безопасно. Сега можете да сърфирате из интернет Анонимно." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Налично е обновяване по сигурността за Tor Браузър Пакет" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -56,10 +57,10 @@ msgid "Your IP address appears to be: " msgstr "Вашия IP адрес изглежда е :" msgid "Are you using Tor?" -msgstr "" +msgstr "Използвате ли Tor?" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "Тези страници са достъпни и на следните езици:" msgid "For more information about this exit relay, see:" msgstr "" @@ -70,25 +71,25 @@ msgid "" msgstr "" msgid "Learn More »" -msgstr "" +msgstr "Научете повече »" msgid "Go" -msgstr "" +msgstr "Давай" msgid "Short User Manual" -msgstr "" +msgstr "Кратко ръководство на потребителя" msgid "Donate to Support Tor" -msgstr "" +msgstr "Дарете за Поддръжка на Tor" msgid "Tor Q&A Site" -msgstr "" +msgstr "Tor Q&A Сайт" msgid "Volunteer" -msgstr "" +msgstr "Доброволец" msgid "JavaScript is enabled." -msgstr "" +msgstr "JavaScript е позволен." msgid "JavaScript is disabled." -msgstr "" +msgstr "JavaScript е изключен."

1 0

[onionoo/master] Fix parsing of JSON files.
by karsten＠torproject.org 25 Apr '14

25 Apr '14

commit 915e871a397d4c965e7425f27c0a8c6bacd06507 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 24 10:36:27 2014 +0200 Fix parsing of JSON files. When parsing JSON documents into objects, we shouldn't store the parsed JSON string. Two reasons: first, there's no need to store everything twice; second, we won't know later whether we should write that string to disk or generate a new one. --- src/org/torproject/onionoo/DocumentStore.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/org/torproject/onionoo/DocumentStore.java b/src/org/torproject/onionoo/DocumentStore.java index 0bc2970..e98fb4e 100644 --- a/src/org/torproject/onionoo/DocumentStore.java +++ b/src/org/torproject/onionoo/DocumentStore.java @@ -413,7 +413,6 @@ public class DocumentStore { Gson gson = new Gson(); try { result = gson.fromJson(documentString, documentType); - result.setDocumentString(documentString); } catch (JsonParseException e) { /* Handle below. */ e.printStackTrace();

1 0