March 2015 - tor-commits - lists.torproject.org

[ooni-probe/master] 13581: Avoid hacking sys.path in bin/* scripts as that is a security risk.
by art＠torproject.org 05 Mar '15

05 Mar '15

commit 3bad9401e657507abea23bb4d650423bad3d3845 Author: Ximin Luo <infinity0(a)pwned.gg> Date: Sat Jan 3 03:36:02 2015 +0100 13581: Avoid hacking sys.path in bin/* scripts as that is a security risk. We want to run these scripts with extra capabilities, using setcap. However, if the end user can set PYTHONPATH, then they can feed arbitrary code into these scripts and give extra capabilities to that code, which we should not allow. Includes a ooniprobe-dev wrapper shell script to make things easier for developers running directly from the repository. The important thing is that this script is developer-only and *not* installed on end users' machines. --- bin/oonideckgen | 5 ----- bin/ooniprobe | 5 ----- bin/oonireport | 7 ------- bin/ooniresources | 6 ------ data/inputs/README | 12 ++++++------ docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/tcpconnect.rst | 4 ++-- docs/source/tests/template.rst | 4 ++-- docs/source/tests/traceroute.rst | 4 ++-- ooni/nettests/experimental/chinatrigger.py | 2 +- ooniprobe-dev | 6 ++++++ scripts/before_i_commit.sh | 2 +- 15 files changed, 28 insertions(+), 45 deletions(-) diff --git a/bin/oonideckgen b/bin/oonideckgen index 017a5d8..a761349 100755 --- a/bin/oonideckgen +++ b/bin/oonideckgen @@ -1,11 +1,6 @@ #!/usr/bin/env python -import os -import sys import exceptions -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - from twisted.internet import defer, reactor from ooni.utils import log diff --git a/bin/ooniprobe b/bin/ooniprobe index 5e277e8..31da086 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -1,12 +1,7 @@ #!/usr/bin/env python -import os, sys import copy_reg from twisted.internet import reactor -# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - # This is a hack to overcome a bug in python from ooni.utils.hacks import patched_reduce_ex copy_reg._reduce_ex = patched_reduce_ex diff --git a/bin/oonireport b/bin/oonireport index 84fc80d..ee9a214 100755 --- a/bin/oonireport +++ b/bin/oonireport @@ -1,11 +1,4 @@ #!/usr/bin/env python -import os -import sys -import exceptions - -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - from twisted.internet import defer, reactor from ooni.utils import log diff --git a/bin/ooniresources b/bin/ooniresources index e0123ac..1960a1d 100755 --- a/bin/ooniresources +++ b/bin/ooniresources @@ -1,10 +1,4 @@ #!/usr/bin/env python -import os -import sys - -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - from twisted.internet import defer, reactor from ooni.utils import log diff --git a/data/inputs/README b/data/inputs/README index 13657b1..9a55f67 100644 --- a/data/inputs/README +++ b/data/inputs/README @@ -3,38 +3,38 @@ the correct functionality of the various OONIProbe tests. # DNS Consistency -./bin/ooniprobe -o dns_tamper_test.yamloo data/nettests/blocking/dns_consistency.py -t +./ooniprobe-dev -o dns_tamper_test.yamloo data/nettests/blocking/dns_consistency.py -t example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo # Captive Portal -./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py +./ooniprobe-dev -o captive_portal_test.yamloo data/nettests/core/captiveportal.py less captive_portal_test.yamloo # HTTP Host -./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt +./ooniprobe-dev -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt less http_host.yamloo # Keyword filtering -./bin/ooniprobe -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt +./ooniprobe-dev -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt less keyword_filtering.yamloo # URL List -./bin/ooniprobe -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt +./ooniprobe-dev -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt less url_lists.yamloo # Squid transparent proxy -./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py +./ooniprobe-dev -o squid.yamloo data/nettests/core/squid.py less squid.yamloo diff --git a/docs/source/tests/dnsspoof.rst b/docs/source/tests/dnsspoof.rst index 21c9cb4..44f372b 100644 --- a/docs/source/tests/dnsspoof.rst +++ b/docs/source/tests/dnsspoof.rst @@ -21,7 +21,7 @@ This test performs A queries to a test resolver and a known good control resolve How to run the test =================== -`./bin/ooniprobe nettests/manipulation/dns_spoof.py [-s] [-k] [-i] -r <test resolver> -h <hostname> -b IP:PORT` +`ooniprobe nettests/manipulation/dns_spoof.py [-s] [-k] [-i] -r <test resolver> -h <hostname> -b IP:PORT` *test resolver* is a single test resolver (IP address). *hostname* is the hostname to query. @@ -35,7 +35,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/manipulation/dns_spoof.py -h torproject.org -r 4.2.2.2:53` +`ooniprobe nettests/manipulation/dns_spoof.py -h torproject.org -r 4.2.2.2:53` :: diff --git a/docs/source/tests/http_header_field_manipulation.rst b/docs/source/tests/http_header_field_manipulation.rst index f51b609..b6a0a8c 100644 --- a/docs/source/tests/http_header_field_manipulation.rst +++ b/docs/source/tests/http_header_field_manipulation.rst @@ -23,14 +23,14 @@ detected tampering. How to run the test =================== -`./bin/ooniprobe nettests/manipulation/http_header_field_manipulation.py -b <address of backend> [-h <headers>]` +`ooniprobe nettests/manipulation/http_header_field_manipulation.py -b <address of backend> [-h <headers>]` `address of backend` is the IP:PORT of the SimpleHTTPChannel backend. Sample report ============= From running: -`./bin/ooniprobe nettests/manipulation/http_header_field_manipulation.py` +`ooniprobe nettests/manipulation/http_header_field_manipulation.py` If no backend is specified, the default backend is 127.0.0.1:57001, where you will need to have oonib listening. :: diff --git a/docs/source/tests/http_host.rst b/docs/source/tests/http_host.rst index 7843344..bc78dda 100644 --- a/docs/source/tests/http_host.rst +++ b/docs/source/tests/http_host.rst @@ -39,7 +39,7 @@ test. How to run the test =================== -`./bin/ooniprobe nettest/core/http_host.py -f <input file> -b <backend url> -c <content>` +`ooniprobe nettest/core/http_host.py -f <input file> -b <backend url> -c <content>` *input_file* is a file containing the hostnames to check for censorship one per line. @@ -55,7 +55,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/core/http_host.py` +`ooniprobe nettests/core/http_host.py` :: diff --git a/docs/source/tests/http_invalid_request_line.rst b/docs/source/tests/http_invalid_request_line.rst index f1246c4..939b0cf 100644 --- a/docs/source/tests/http_invalid_request_line.rst +++ b/docs/source/tests/http_invalid_request_line.rst @@ -81,7 +81,7 @@ is usually being split on the `.`. How to run the test =================== -`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b <address of backend>` +`ooniprobe nettests/manipulation/http_invalid_request_line.py -b <address of backend>` *address of the backend* is the hostname or IP address of a backend that runs a TCP echo server on port 80. @@ -91,7 +91,7 @@ Sample report From running: -`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b 127.0.0.1 -p 57002` +`ooniprobe nettests/manipulation/http_invalid_request_line.py -b 127.0.0.1 -p 57002` :: diff --git a/docs/source/tests/tcpconnect.rst b/docs/source/tests/tcpconnect.rst index 2eadc11..1f1e082 100644 --- a/docs/source/tests/tcpconnect.rst +++ b/docs/source/tests/tcpconnect.rst @@ -28,7 +28,7 @@ If the connection succeeds the test will report "success". How to run the test =================== -`./bin/ooniprobe nettests/core/tcpconnect.py -f <input file>` +`ooniprobe nettests/core/tcpconnect.py -f <input file>` *input file* a list of IP:PORT pairs to perform TCP connections to. @@ -36,7 +36,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/core/tcpconnect.py -f <input file>` +`ooniprobe nettests/core/tcpconnect.py -f <input file>` :: diff --git a/docs/source/tests/template.rst b/docs/source/tests/template.rst index 62b3895..02b365d 100644 --- a/docs/source/tests/template.rst +++ b/docs/source/tests/template.rst @@ -20,13 +20,13 @@ Description How to run the test =================== -`./bin/ooniprobe nettests/core/my_test_name.py` +`ooniprobe nettests/core/my_test_name.py` Sample report ============= From running: -`./bin/ooniprobe nettests/core/my_test_name.py` +`ooniprobe nettests/core/my_test_name.py` :: diff --git a/docs/source/tests/traceroute.rst b/docs/source/tests/traceroute.rst index 8532890..021bf2b 100644 --- a/docs/source/tests/traceroute.rst +++ b/docs/source/tests/traceroute.rst @@ -47,7 +47,7 @@ received a TTL expired from a router in a certain network range. How to run the test =================== -`./bin/ooniprobe nettests/manipulation/traceroute.py -b <backend ip>`` +`ooniprobe nettests/manipulation/traceroute.py -b <backend ip>`` *backend ip* is the IP address of the backend to traceroute to @@ -56,7 +56,7 @@ Sample report From running: -`./bin/ooniprobe nettests/core/traceroute.py -b 8.8.8.8` +`ooniprobe nettests/core/traceroute.py -b 8.8.8.8` :: diff --git a/ooni/nettests/experimental/chinatrigger.py b/ooni/nettests/experimental/chinatrigger.py index de1f64d..dfc2f73 100644 --- a/ooni/nettests/experimental/chinatrigger.py +++ b/ooni/nettests/experimental/chinatrigger.py @@ -17,7 +17,7 @@ class ChinaTriggerTest(BaseScapyTest): by Philipp Winter to engage chinese probes in active scanning. Example of running it: - ./bin/ooniprobe chinatrigger -d 127.0.0.1 -p 8080 + ooniprobe chinatrigger -d 127.0.0.1 -p 8080 """ name = "chinatrigger" diff --git a/ooniprobe-dev b/ooniprobe-dev new file mode 100755 index 0000000..e0d5abb --- /dev/null +++ b/ooniprobe-dev @@ -0,0 +1,6 @@ +#!/bin/sh +# Developer script for running ooniprobe directly from the repository. +# We don't automatically add "$PWD" to PYTHONPATH as that is a security risk +# when run as /usr/bin/ooniprobe on an end user's computer. +cd "$(realpath "$(dirname "$0")")" +PYTHONPATH="$PWD" exec ./bin/ooniprobe diff --git a/scripts/before_i_commit.sh b/scripts/before_i_commit.sh index 918b137..8aca1fa 100755 --- a/scripts/before_i_commit.sh +++ b/scripts/before_i_commit.sh @@ -28,7 +28,7 @@ else echo "Assuming that your virtual environment is pre-configured..."; fi -./bin/ooniprobe -i decks/before_i_commit.testdeck +./ooniprobe-dev -i decks/before_i_commit.testdeck echo "Below you should not see anything" echo "---------------------------------"

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 05 Mar '15

05 Mar '15

commit 90df873decaf035a5e3ac0b734d5d926a065b209 Merge: 3bad940 ae8debc Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 27 15:41:55 2015 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Fix typo. Fix typo. ooni/nettests/manipulation/daphne.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Add a not on a known bug
by art＠torproject.org 05 Mar '15

05 Mar '15

commit 32d5e277a91d35865ad95d7b244804e5e0794a41 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 5 15:04:08 2015 +0100 Add a not on a known bug --- README.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.rst b/README.rst index 4566993..c2dec0a 100644 --- a/README.rst +++ b/README.rst @@ -70,6 +70,15 @@ Then run:: sudo ooniresources --update-inputs --update-geoip oonideckgen -o my_decks/ +**BUG** Note: +ooniprobe version 1.2.2 when installed from the debian repository will not +properly create the ooni home folder and if you run into an error in accessing +`~/.ooni/` run:: + + ooniprobe -n blocking/http_requests -u http://google.com/ + +This should generate the home and allow you to run oonideckgen. + The output from the last command will tell you how to run ooniprobe to perform the measurement.

1 0

[webwml/master] Bug 13407: Finish updating signature verification
by boklm＠torproject.org 05 Mar '15

05 Mar '15

commit 5d6192e86d8ed588acf51fae455a0a4955369347 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 5 14:46:13 2015 +0100 Bug 13407: Finish updating signature verification A part of the page was not updated: https://lists.torproject.org/pipermail/tor-dev/2015-March/008375.html --- docs/en/verifying-signatures.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index a489703..ef916b4 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -112,8 +112,8 @@ </p> <p>The next step is to use GnuPG to import the key that signed - your package. Erinn Clark signs the Tor Browsers. Import her - key (0x416F061063FEE659) by starting the terminal (under "Applications" + your package. The Tor Browser team signs the Tor Browsers. Import its + key (0x4E2C6E8793298290) by starting the terminal (under "Applications" in Mac OS X) and typing:</p> <pre>gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit 049486b6a0fb46f273c093ab8e2d36a7b51e9016 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 09:16:47 2015 +0000 Update translations for torbutton-torbuttondtd --- id/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/torbutton.dtd b/id/torbutton.dtd index 9aa3a01..47f1aa1 100644 --- a/id/torbutton.dtd +++ b/id/torbutton.dtd @@ -36,7 +36,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Periksa untuk Pemutakhiran Peramban Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Perlindungan Cookie.."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "P"> @@ -157,4 +157,4 @@ <!ENTITY torbutton.prefs.sec_med_high "Menengah-Tinggi"> <!ENTITY torbutton.prefs.sec_high "Tinggi"> <!ENTITY torbutton.prefs.sec_custom "Nilai Kustom"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Sirkuit Tor untuk website ini">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit a3d70da0eea0f7010d3ff35178a05ad38a16e5e8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 09:16:36 2015 +0000 Update translations for torbutton-branddtd --- id/brand.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/id/brand.dtd b/id/brand.dtd index 84dfa3e..d240014 100644 --- a/id/brand.dtd +++ b/id/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "Firefox dan logo Firefox merupakan merek dagang dari Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> +<!ENTITY plugins.installed.find "Tekan untuk membuka pengaya sistem yang terpasang"> +<!ENTITY plugins.installed.enable "Aktifkan pengaya"> +<!ENTITY plugins.installed.disable "Matikan pengaya"> <!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit 40ae541a7c78308019575c849823b87b68855cdd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 09:16:24 2015 +0000 Update translations for abouttor-homepage --- nb/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index 5ac815b..fd93eab 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "MEN, denne nettleseren er utdatert."> <!ENTITY aboutTor.outOfDateTorOff.label "OGSÅ, denne nettleseren er utdatert."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Klikk på løken og velg 'Se etter oppdatering for TOR nettleser...'"> <!ENTITY aboutTor.check.label "Test Tors nettverksinnstillinger">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit d100daff1553f2e506083a722215f6da7dd2e468 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 09:16:18 2015 +0000 Update translations for tails-misc_completed --- nb.po | 143 +++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 87 insertions(+), 56 deletions(-) diff --git a/nb.po b/nb.po index 1310b9a..d190c50 100644 --- a/nb.po +++ b/nb.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Allan Nordhøy <comradekingu(a)gmail.com>, 2014 +# Allan Nordhøy <comradekingu(a)gmail.com>, 2014-2015 # David Gutierrez <david.gutierrez.abreu(a)gmail.com>, 2014 # Jan-Erik Ek <jan.erik.ek(a)gmail.com>, 2013 # lateralus, 2014 +# Per Thorsheim <transifex(a)thorsheim.net>, 2015 # pr0xity, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-04 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 16:25+0100\n" +"PO-Revision-Date: 2015-03-04 22:01+0000\n" +"Last-Translator: Allan Nordhøy <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,15 +39,39 @@ msgid "" "<p><strong>Do not include more personal information than\n" "needed!</strong></p>\n" "<h2>About giving us an email address</h2>\n" -"<p>If you don't mind disclosing some bits of your identity\n" -"to Tails developers, you can provide an email address to\n" -"let us ask more details about the bug. Additionally entering\n" -"a public PGP key enables us to encrypt such future\n" -"communication.</p>\n" -"<p>Anyone who can see this reply will probably infer you are\n" -"a Tails user. Time to wonder how much you trust your\n" -"Internet and mailbox providers?</p>\n" -msgstr "<h1>Hjelp oss å fikse eventuelle feil!</h1>\n<p>Les <a href=\"%s\">våre instruksjoner for rapportering av feil</a>.</p>\n<p><strong>Ikke inkluder mer personlig informasjon enn hva som\n kreves!</strong></p>\n<h2>Om å gi en e-postadresse</h2>\n<p>Hvis du ikke har noe imot å avsløre deler av din identitet\ntil utviklerne av Tails, så kan du oppgi en e-postadresse som\nlar oss stille spørsmål rundt feilen. I tillegg kan du oppgi \nen offentlig PGP-nøkkel som lar oss kryptere slik fremtidig\nkommunikasjon.</p>\n<p>Alle som kan se dette svaret kan trolig dra slutningen om at du\ner en Tails bruker. På tide å tenke over hvor mye du kan stole på din\ninternett- og e-post leverandør?</p>\n" +"<p>\n" +"Giving us an email address allows us to contact you to clarify the problem. This\n" +"is needed for the vast majority of the reports we receive as most reports\n" +"without any contact information are useless. On the other hand it also provides\n" +"an opportunity for eavesdroppers, like your email or Internet provider, to\n" +"confirm that you are using Tails.\n" +"</p>\n" +msgstr "<h1>Hjelp oss med å ordne feilen du har funnet!</h1>\n<p>Les <a href=\"%s\">vår instruks om rapportering av feil</a>.</p>\n<p><strong>Ikke inkluder flere personvernsdetaljer enn nødvendig!</strong></p>\n<h2>Om det å gi oss en e-post -adresse</h2>\n<p>\nDet å gi oss en e-post -adresse tillater oss å kontakte deg for å få klarhet i problemet.\nDette er som oftest nødvendig siden de fleste feilrettingsrapportene \ntrenger ytterligere detaljer for å være brukbare.\nDog gir det også en mulighet for \novervåkningsinstanser til å bekrefte at du bruker Tails\n</p>\n" + +#: config/chroot_local-includes/usr/local/bin/electrum:14 +msgid "Persistence is disabled for Electrum" +msgstr "Vedvaring avskrudd for Electrum (Bitcoin-klient)" + +#: config/chroot_local-includes/usr/local/bin/electrum:16 +msgid "" +"When you reboot Tails, all of Electrum's data will be lost, including your " +"Bitcoin wallet. It is strongly recommended to only run Electrum when its " +"persistence feature is activated." +msgstr "Ved omstart av Tails vil alle data i Electrum gå tapt, inkludert din Bitkoin-lommebok. Det er anbefalt på det sterkeste at du bare kjører Electrum når vedvaringsvalget er aktivert." + +#: config/chroot_local-includes/usr/local/bin/electrum:18 +msgid "Do you want to start Electrum anyway?" +msgstr "Vil du starte Electrum uansett?" + +#: config/chroot_local-includes/usr/local/bin/electrum:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +msgid "_Launch" +msgstr "_Start" + +#: config/chroot_local-includes/usr/local/bin/electrum:21 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +msgid "_Exit" +msgstr "_Avslutt" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -278,27 +303,27 @@ msgid "" " spoofing documentation</a>." msgstr "Det ser ut til at du er blokkert fra nettverket. Dette kan være relatert til MAC-parodieringsfunksjonen. For mer informasjon se <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC-parodierings dokumentasjon</a>." -#: config/chroot_local-includes/usr/local/bin/tails-security-check:145 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:151 msgid "This version of Tails has known security issues:" msgstr "Denne versjonen av Tails har kjente sikkerhetsproblem:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 #, sh-format msgid "Network card ${nic} disabled" msgstr "Nettverkskort ${nic} deaktivert" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "MAC-parodiering feilet for nettverkskort ${nic_name} (${nic}) så det er midlertidig deaktivert.\nDet anbefales å starte Tails på nytt og deaktivere MAC-parodiering. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasjonen</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 msgid "All networking disabled" msgstr "Alt nettverk deaktivert" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -306,12 +331,12 @@ msgid "" msgstr "MAC-parodiering feilet for nettverkskort ${nic_name} (${nic}). Feilgjenopprettingen feilet også, så alt nettverk er deaktivert. \nDet anbefales å starte Tails på nytt og deaktivere MAC-parodiering. Se <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasjonen</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 msgid "error:" msgstr "feil:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 msgid "Error" msgstr "Feil" @@ -341,9 +366,9 @@ msgstr "Både vertssystemet og virtualiseringsprogramvaren kan overvåke alt du #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" +"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Lær mer...</a>" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Lær mer...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" @@ -361,102 +386,108 @@ msgstr "Start Tor Browser" msgid "Cancel" msgstr "Avbryt" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Vil du virkelig starte den usikre nettleseren?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "Nettverkstrafikken i den usikre nettleseren er <b>ikke anonym</b>. Bruk kun den usikre nettleseren om absolutt nødvendig, for eksempel når du må logge inn eller registrere deg for å aktivere internettforbindelsen din." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 -msgid "_Launch" -msgstr "_Start" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 -msgid "_Exit" -msgstr "_Avslutt" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 msgid "Starting the Unsafe Browser..." msgstr "Starter den usikre nettleseren..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 msgid "This may take a while, so please be patient." msgstr "Dette kan ta litt tid, så vennligst vær tålmodig." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121 -msgid "Failed to setup chroot." -msgstr "Feilet i å opprette et chroot-miljø." - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:195 -#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 -msgid "Unsafe Browser" -msgstr "Usikker Nettleser" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:251 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "Shutting down the Unsafe Browser..." msgstr "Avslutter den Usikre Nettleseren..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:252 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Dette kan ta en stund, og den usikre nettleseren kan ikke startes på nytt før den forrige er helt avsluttet. " -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:264 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 msgid "Failed to restart Tor." msgstr "Kunne ikke starte om Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:272 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 +msgid "Unsafe Browser" +msgstr "Usikker Nettleser" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "En annen Usikker Nettleser kjører for øyeblikket, eller blir renset. Vennligst prøv på nytt om en stund." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:285 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105 +msgid "" +"NetworkManager passed us garbage data when trying to deduce the clearnet DNS" +" server." +msgstr "NetworkManager har gitt oss søppeldata ved forsøk på å utrede hava som er den clearnet DNS-tjeneren." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "Ingen DNS server ble tildelt gjennom DHCP eller manuell konfigurasjon i NetworkManager." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 +msgid "Failed to setup chroot." +msgstr "Feilet i å opprette et chroot-miljø." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 +msgid "Failed to configure browser." +msgstr "Kunne ikke konfigurere nettleser." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 +msgid "Failed to run browser." +msgstr "Kunne ikke starte nettleser." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "I2P failed to start" msgstr "Start av I2P feilet" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Noe gikk galt når IP2 var i ferd med å starte. Sjekk loggene i /var/log/i2p for mer informasjon." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "I2P's router console is ready" msgstr "I2P's ruter console er klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console on http://127.0.0.1:7657." msgstr "Du kan nå få tilgang til I2P router konsollen på http://127.0.0.1:7657." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" msgstr "I2P er ikke klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" "Eepsite tunnel not built within six minutes. Check the router console at " "http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." " Reconnect to the network to try again." msgstr "Eepsite tunnelen ble ikke fullført innen seks minutter. Sjekk router konsollen på http://127.0.0.1:7657/logs eller loggene i /var/log/i2p for mer informasjon. Koble på nytt til nettverket og forsøk igjen." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" msgstr "I2P er klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 msgid "You can now access services on I2P." msgstr "Du kan nå få tilgang til tjenester på I2P."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit af1deba76fe5ede835d79aa2afc22fddc3f5ee1f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 09:16:14 2015 +0000 Update translations for tails-misc --- nb.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nb.po b/nb.po index ef6be81..d190c50 100644 --- a/nb.po +++ b/nb.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Allan Nordhøy <comradekingu(a)gmail.com>, 2014 +# Allan Nordhøy <comradekingu(a)gmail.com>, 2014-2015 # David Gutierrez <david.gutierrez.abreu(a)gmail.com>, 2014 # Jan-Erik Ek <jan.erik.ek(a)gmail.com>, 2013 # lateralus, 2014 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-04 22:01+0000\n" +"Last-Translator: Allan Nordhøy <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,22 +46,22 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "" +msgstr "<h1>Hjelp oss med å ordne feilen du har funnet!</h1>\n<p>Les <a href=\"%s\">vår instruks om rapportering av feil</a>.</p>\n<p><strong>Ikke inkluder flere personvernsdetaljer enn nødvendig!</strong></p>\n<h2>Om det å gi oss en e-post -adresse</h2>\n<p>\nDet å gi oss en e-post -adresse tillater oss å kontakte deg for å få klarhet i problemet.\nDette er som oftest nødvendig siden de fleste feilrettingsrapportene \ntrenger ytterligere detaljer for å være brukbare.\nDog gir det også en mulighet for \novervåkningsinstanser til å bekrefte at du bruker Tails\n</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" -msgstr "" +msgstr "Vedvaring avskrudd for Electrum (Bitcoin-klient)" #: config/chroot_local-includes/usr/local/bin/electrum:16 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "" +msgstr "Ved omstart av Tails vil alle data i Electrum gå tapt, inkludert din Bitkoin-lommebok. Det er anbefalt på det sterkeste at du bare kjører Electrum når vedvaringsvalget er aktivert." #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "Vil du starte Electrum uansett?" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 @@ -368,7 +368,7 @@ msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Lær mer...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" @@ -434,7 +434,7 @@ msgstr "En annen Usikker Nettleser kjører for øyeblikket, eller blir renset. V msgid "" "NetworkManager passed us garbage data when trying to deduce the clearnet DNS" " server." -msgstr "" +msgstr "NetworkManager har gitt oss søppeldata ved forsøk på å utrede hava som er den clearnet DNS-tjeneren." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 msgid ""

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit 8a7c3b106b2bfa0cb1c76c75588d9c74d88f24b8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 09:16:07 2015 +0000 Update translations for tor-launcher-network-settings --- id/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index 1acf78d..428626b 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Yang mana dari di bawah ini cocok dengan situasi anda?"> <!ENTITY torSettings.configurePrompt1 "Koneksi internet komputer ini disensor atau terproksi."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Saya membutuhkan konfigurasi jembatan atau seting proksi lokal"> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt2 "Saya ingin menghubungkan secara langsung ke jaringan Tor."> <!ENTITY torSettings.connectPrompt3 "Hal ini akan bekerja dalam kebanyakan situasi."> <!ENTITY torSettings.connect "Hubungi"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Apakah komputer ini membutuhkan proksi lokal untuk dapat mengakses internet ?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Jika anda tidak yakin untuk menjawab pertanyaan ini, llihatlah pada setelan jaringan di browser lain apakah terkonfigurasi dengan proksi lokal."> <!ENTITY torSettings.enterProxy "Masukkan pengaturan proxy."> <!ENTITY torSettings.bridgeQuestion "Apakah Internet Service Provider (ISP) blok atau sensor koneksi lain ke Tor Jaringan?"> <!ENTITY torSettings.bridgeHelp "Jika Anda tidak yakin bagaimana untuk menjawab pertanyaan ini, pilih No.  Jika Anda memilih Ya, Anda akan diminta untuk mengkonfigurasi Tor Bridges, yang relai terdaftar yang membuat lebih sulit untuk memblokir koneksi ke jaringan Tor."> @@ -53,7 +53,7 @@ <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> <!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir."> <!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2Heading "Lewat web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):">

1 0