tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

[webwml/master] Bug 24720: Update donation options page for BTC and stock transfers
by arma＠torproject.org 23 Dec '17

23 Dec '17

commit 2c4726a2da652e5fb29986aeae912e48c96db79f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 22 18:10:34 2017 -0500 Bug 24720: Update donation options page for BTC and stock transfers --- donate/en/donate-options.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 5c18976c..42d4a706 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -31,7 +31,7 @@ form#makeDonation { <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate Bitcoin</h3> -<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address.</p> +<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipperbot">@tipprbot</a> on Twitter!)</p> <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> @@ -42,7 +42,7 @@ form#makeDonation { </li> <li id="price" class="control-group"> <label class="control-label" style="width: 80px">Amount:</label> - <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" /> + <input name="price" type="number" class="noscroll" value="100.00" placeholder="Amount" maxlength="10" min="100" step="0.01" /> <select name="currency" value="" > <option value="USD" selected="selected">USD</option> <option value="BTC">BTC</option> @@ -176,7 +176,7 @@ form#makeDonation { E-mail: <a href="mailto:jeffrey.k.miller@ml.com">jeffrey.k.miller(a)ml.com</a><br> FAX: 206.388.4456<br> The Tor Project Account #: 335-03016<br> - DTC #: 5198<br> + DTC #: 8862<br> Tax ID #: 20-8096820<br> </p> </p>

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 23 Dec '17

23 Dec '17

commit dbc508b9659d7b418e14a6475a2a1d5bb4a06aff Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 23 02:20:32 2017 +0000 Update translations for tails-greeter-2 --- en_GB/en_GB.po | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 83c1d02d5..c23f5327e 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -60,15 +60,17 @@ msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." msgstr "" +"This option makes Tails look like Microsoft Windows 10. This can be useful " +"to avoid attracting suspicion in public places." #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "" +msgstr "Microsoft Windows 10 camouflage" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" -msgstr "" +msgstr "MAC Address Spoofing" #: ../data/greeter.ui.h:14 msgid "" @@ -77,28 +79,34 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" +"MAC address spoofing hides the serial number of your network interface (Wi-" +"Fi or wired) to the local network. Spoofing MAC addresses is generally safer" +" as it helps you hide your geographical location. But it might also create " +"connectivity problems or look suspicious." #: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Spoof all MAC addresses (default)" #: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "Don't spoof MAC addresses" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Cannot unlock encrypted storage with this passphrase." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" -msgstr "" +msgstr "Welcome to Tails!" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:21 @@ -106,10 +114,11 @@ msgctxt "" msgid "" "To get guided through Tails' settings, click on <b>Take a Tour</b> above" msgstr "" +"To get guided through Tails' settings, click on <b>Take a Tour</b> above" #: ../data/greeter.ui.h:22 msgid "Language & Region" -msgstr "" +msgstr "Language & Region" #: ../data/greeter.ui.h:23 msgid "Default Settings" @@ -121,48 +130,48 @@ msgstr "" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Language" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Keyboard Layout" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Formats" #: ../data/greeter.ui.h:28 msgid "_Time Zone" -msgstr "" +msgstr "_Time Zone" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "Encrypted _Persistent Storage" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Show Passphrase" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Configure Persistent Storage" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Enter your passphrase to unlock the persistent storage" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Unlock" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "" +msgstr "Relock Persistent Storage" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." -msgstr "" +msgstr "Your persistent storage is unlocked. Restart Tails to lock it again." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" @@ -170,11 +179,11 @@ msgstr "" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" -msgstr "" +msgstr "Save Additional Settings" #: ../data/greeter.ui.h:38 msgid "Add an additional setting" -msgstr "" +msgstr "Add an additional setting" #: ../data/greeter.ui.h:39 msgid "Network Configuration"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 23 Dec '17

23 Dec '17

commit 666620f90e619285326a199d60d7c399c76ceea6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 23 01:50:47 2017 +0000 Update translations for tor-browser-manual --- en_GB/en_GB.po | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 220 insertions(+), 28 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index e6cba9b08..6baf7c828 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -73,6 +73,9 @@ msgid "" " valid for a single session (until Tor Browser is exited or a <link xref" "=\"managing-identities#new-identity\">New Identity</link> is requested)." msgstr "" +"By default, Tor Browser does not keep any browsing history. Cookies are only" +" valid for a single session (until Tor Browser is exited or a <link xref" +"=\"managing-identities#new-identity\">New Identity</link> is requested)." #: about-tor-browser.page:50 msgid "How Tor works" @@ -86,6 +89,11 @@ msgid "" " last relay in the circuit (the “exit relay”) then sends the traffic out " "onto the public Internet." msgstr "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as <em>relays</em>) in the Tor network. The" +" last relay in the circuit (the “exit relay”) then sends the traffic out " +"onto the public Internet." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -97,6 +105,8 @@ msgid "" "external ref='media/how-tor-works.png' " "md5='6fe4151a88b7a518466f0582e40ccc8c'" msgstr "" +"external ref='media/how-tor-works.png' " +"md5='6fe4151a88b7a518466f0582e40ccc8c'" #: about-tor-browser.page:60 msgid "" @@ -105,14 +115,18 @@ msgid "" "three keys represent the layers of encryption between the user and each " "relay." msgstr "" +"The image above illustrates a user browsing to different websites over Tor. " +"The green middle computers represent relays in the Tor network, while the " +"three keys represent the layers of encryption between the user and each " +"relay." #: bridges.page:6 msgid "Learn what bridges are and how to get them" -msgstr "" +msgstr "Learn what bridges are and how to get them" #: bridges.page:10 msgid "Bridges" -msgstr "" +msgstr "Bridges" #: bridges.page:12 msgid "" @@ -123,6 +137,12 @@ msgid "" " in combination with pluggable transports helps to disguise the fact that " "you are using Tor." msgstr "" +"Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 " +"and obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, " +"bridges are run by volunteers; unlike ordinary relays, however, they are not" +" listed publicly, so an adversary cannot identify them easily. Using bridges" +" in combination with pluggable transports helps to disguise the fact that " +"you are using Tor." #: bridges.page:21 msgid "" @@ -130,16 +150,21 @@ msgid "" "techniques that do not rely on bridges. You do not need to obtain bridge " "addresses in order to use these transports." msgstr "" +"Other pluggable transports, like meek, use different anti-censorship " +"techniques that do not rely on bridges. You do not need to obtain bridge " +"addresses in order to use these transports." #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "Getting bridge addresses" #: bridges.page:29 msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" +"Because bridge addresses are not public, you will need to request them " +"yourself. You have two options:" #: bridges.page:36 msgid "" @@ -147,22 +172,29 @@ msgid "" "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" " and follow the instructions, or" msgstr "" +"Visit <link " +"href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" +" and follow the instructions, or" #: bridges.page:42 msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" +"Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " +"or" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "" +msgstr "Entering bridge addresses" #: bridges.page:52 msgid "" "Once you have obtained some bridge addresses, you will need to enter them " "into Tor Launcher." msgstr "" +"Once you have obtained some bridge addresses, you will need to enter them " +"into Tor Launcher." #: bridges.page:57 msgid "" @@ -170,6 +202,9 @@ msgid "" " to the Tor network. Select “Use custom bridges” and enter each bridge " "address on a separate line." msgstr "" +"Choose “yes” when asked if your Internet Service Provider blocks connections" +" to the Tor network. Select “Use custom bridges” and enter each bridge " +"address on a separate line." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -181,6 +216,8 @@ msgid "" "external ref='media/tor-launcher-custom-bridges_en-US.png' " "md5='93365c2aa3fb4d627497e83f28a39b7e'" msgstr "" +"external ref='media/tor-launcher-custom-bridges_en-US.png' " +"md5='93365c2aa3fb4d627497e83f28a39b7e'" #: bridges.page:65 msgid "" @@ -189,14 +226,18 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" +"Click “Connect”. Using bridges may slow down the connection compared to " +"using ordinary Tor relays. If the connection fails, the bridges you received" +" may be down. Please use one of the above methods to obtain more bridge " +"addresses, and try again." #: circumvention.page:6 msgid "What to do if the Tor network is blocked" -msgstr "" +msgstr "What to do if the Tor network is blocked" #: circumvention.page:10 msgid "Circumvention" -msgstr "" +msgstr "Circumvention" #: circumvention.page:12 msgid "" @@ -207,10 +248,16 @@ msgid "" "page for more information on the types of transport that are currently " "available." msgstr "" +"Direct access to the Tor network may sometimes be blocked by your Internet " +"Service Provider or by a government. Tor Browser includes some circumvention" +" tools for getting around these blocks. These tools are called “pluggable " +"transports”. See the <link xref=\"transports\">Pluggable Transports</link> " +"page for more information on the types of transport that are currently " +"available." #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "" +msgstr "Using pluggable transports" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -222,12 +269,16 @@ msgid "" "external ref='media/circumvention/configure.png' " "md5='519d888303eadfe4cb03f178aedd90f5'" msgstr "" +"external ref='media/circumvention/configure.png' " +"md5='519d888303eadfe4cb03f178aedd90f5'" #: circumvention.page:28 msgid "" "To use pluggable transports, click \"Configure\" in the Tor Launcher window " "that appears when you first run Tor Browser." msgstr "" +"To use pluggable transports, click \"Configure\" in the Tor Launcher window " +"that appears when you first run Tor Browser." #: circumvention.page:33 msgid "" @@ -235,12 +286,17 @@ msgid "" " clicking on the green onion near your address bar and selecting “Tor " "Network Settings”." msgstr "" +"You can also configure pluggable transports while Tor Browser is running, by" +" clicking on the green onion near your address bar and selecting “Tor " +"Network Settings”." #: circumvention.page:41 msgid "" "Select “yes” when asked if your Internet Service Provider blocks connections" " to the Tor network." msgstr "" +"Select “yes” when asked if your Internet Service Provider blocks connections" +" to the Tor network." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -252,16 +308,20 @@ msgid "" "external ref='media/circumvention/bridges.png' " "md5='910cdd5e45860b81a1ad4739c589a195'" msgstr "" +"external ref='media/circumvention/bridges.png' " +"md5='910cdd5e45860b81a1ad4739c589a195'" #: circumvention.page:51 msgid "" "Select “Connect with provided bridges”. Tor Browser currently has six " "pluggable transport options to choose from." msgstr "" +"Select “Connect with provided bridges”. Tor Browser currently has six " +"pluggable transport options to choose from." #: circumvention.page:60 msgid "Which transport should I use?" -msgstr "" +msgstr "Which transport should I use?" #: circumvention.page:61 msgid "" @@ -270,6 +330,10 @@ msgid "" "Transports</link> page), and their effectiveness depends on your individual " "circumstances." msgstr "" +"Each of the transports listed in Tor Launcher’s menu works in a different " +"way (for more details, see the <link xref=\"transports\">Pluggable " +"Transports</link> page), and their effectiveness depends on your individual " +"circumstances." #: circumvention.page:67 msgid "" @@ -277,6 +341,9 @@ msgid "" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" "azure, meek-amazon." msgstr "" +"If you are trying to circumvent a blocked connection for the first time, you" +" should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" +"azure, meek-amazon." #: circumvention.page:72 msgid "" @@ -285,10 +352,14 @@ msgid "" "xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" " obtain them." msgstr "" +"If you try all of these options, and none of them gets you online, you will " +"need to enter bridge addresses manually. Read the <link " +"xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" +" obtain them." #: downloading.page:7 msgid "How to download Tor Browser" -msgstr "" +msgstr "How to download Tor Browser" #: downloading.page:10 msgid "Downloading" @@ -301,6 +372,10 @@ msgid "" "will be secured using <link xref=\"secure-connections\">HTTPS</link>, which " "makes it much harder for somebody to tamper with." msgstr "" +"The safest and simplest way to download Tor Browser is from the official Tor" +" Project website at https://www.torproject.org. Your connection to the site " +"will be secured using <link xref=\"secure-connections\">HTTPS</link>, which " +"makes it much harder for somebody to tamper with." #: downloading.page:19 msgid "" @@ -308,10 +383,13 @@ msgid "" "for example, it could be blocked on your network. If this happens, you can " "use one of the alternative download methods listed below." msgstr "" +"However, there may be times when you cannot access the Tor Project website: " +"for example, it could be blocked on your network. If this happens, you can " +"use one of the alternative download methods listed below." #: downloading.page:27 msgid "GetTor" -msgstr "" +msgstr "GetTor" #: downloading.page:28 msgid "" @@ -319,10 +397,13 @@ msgid "" "the latest version of Tor Browser, hosted at a variety of locations, such as" " Dropbox, Google Drive and Github.." msgstr "" +"GetTor is a service that automatically responds to messages with links to " +"the latest version of Tor Browser, hosted at a variety of locations, such as" +" Dropbox, Google Drive and Github.." #: downloading.page:34 msgid "To use GetTor via email:" -msgstr "" +msgstr "To use GetTor via email:" #: downloading.page:39 msgid "" @@ -330,6 +411,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Send an email to gettor(a)torproject.org, and in the body of the message " +"simply write “windows”, “osx”, or “linux”, (without quotation marks) " +"depending on your operating system." #: downloading.page:46 msgid "" @@ -340,10 +424,16 @@ msgid "" "“32-bit” or “64-bit” software: this depends on the model of the computer you" " are using." msgstr "" +"GetTor will respond with an email containing links from which you can " +"download the Tor Browser package, the cryptographic signature (needed for " +"verifying the download), the fingerprint of the key used to make the " +"signature, and the package’s checksum. You may be offered a choice of " +"“32-bit” or “64-bit” software: this depends on the model of the computer you" +" are using." #: downloading.page:57 msgid "To use GetTor via Twitter:" -msgstr "" +msgstr "To use GetTor via Twitter:" #: downloading.page:62 msgid "" @@ -351,38 +441,45 @@ msgid "" "Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"To get links for downloading Tor Browser in English for OS X, send a Direct " +"Message to @get_tor with the words \"osx en\" in it (you don't need to " +"follow the account)." #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" -msgstr "" +msgstr "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" #: downloading.page:75 msgid "" "To get links for downloading Tor Browser in Chinese for Linux, send a " "message to gettor(a)torproject.org with the words \"linux zh\" in it." msgstr "" +"To get links for downloading Tor Browser in Chinese for Linux, send a " +"message to gettor(a)torproject.org with the words \"linux zh\" in it." #: downloading.page:84 msgid "Satori" -msgstr "" +msgstr "Satori" #: downloading.page:85 msgid "" "Satori is an add-on for the Chrome or Chromium browsers that allows you to " "download several security and privacy programs from different sources." msgstr "" +"Satori is an add-on for the Chrome or Chromium browsers that allows you to " +"download several security and privacy programs from different sources." #: downloading.page:90 msgid "To download Tor Browser using Satori:" -msgstr "" +msgstr "To download Tor Browser using Satori:" #: downloading.page:95 msgid "Install Satori from the Chrome App Store." -msgstr "" +msgstr "Install Satori from the Chrome App Store." #: downloading.page:100 msgid "Select Satori from your browser’s Apps menu." -msgstr "" +msgstr "Select Satori from your browser’s Apps menu." #: downloading.page:105 msgid "" @@ -392,12 +489,19 @@ msgid "" "after the name of the program — each one represents a different source from " "which to get the software. Your download will then begin." msgstr "" +"When Satori opens, click on your preferred language. A menu will open " +"listing the available downloads for that language. Find the entry for Tor " +"Browser under the name of your operating system. Select either “A” or “B” " +"after the name of the program — each one represents a different source from " +"which to get the software. Your download will then begin." #: downloading.page:115 msgid "" "Wait for your download to finish, then find the “Generate Hash” section in " "Satori’s menu and click “Select Files”." msgstr "" +"Wait for your download to finish, then find the “Generate Hash” section in " +"Satori’s menu and click “Select Files”." #: downloading.page:121 msgid "" @@ -409,14 +513,21 @@ msgid "" "Browser</link>. If they do not match, you may need to try downloading again," " or from a different source." msgstr "" +"Select the downloaded Tor Browser file. Satori will display the checksum of " +"the file, which you should compare with the software’s original checksum: " +"you can find this by clicking the word “checksum” after the link you clicked" +" on to start the download. If the checksums match, your download was " +"successful, and you can <link xref=\"first-time\">begin using Tor " +"Browser</link>. If they do not match, you may need to try downloading again," +" or from a different source." #: first-time.page:7 msgid "Learn how to use Tor Browser for the first time" -msgstr "" +msgstr "Learn how to use Tor Browser for the first time" #: first-time.page:10 msgid "Running Tor Browser for the first time" -msgstr "" +msgstr "Running Tor Browser for the first time" #: first-time.page:12 msgid "" @@ -424,6 +535,9 @@ msgid "" "Settings window. This offers you the option to connect directly to the Tor " "network, or to configure Tor Browser for your connection." msgstr "" +"When you run Tor Browser for the first time, you will see the Tor Network " +"Settings window. This offers you the option to connect directly to the Tor " +"network, or to configure Tor Browser for your connection." #: first-time.page:19 msgid "Connect" @@ -439,6 +553,8 @@ msgid "" "external ref='media/first-time/connect.png' " "md5='9d07068f751a3bfd274365a4ba8d90ca'" msgstr "" +"external ref='media/first-time/connect.png' " +"md5='9d07068f751a3bfd274365a4ba8d90ca'" #: first-time.page:23 msgid "" @@ -460,6 +576,9 @@ msgid "" "select this option. Tor Browser will take you through a series of " "configuration options." msgstr "" +"If you know that your connection is censored, or uses a proxy, you should " +"select this option. Tor Browser will take you through a series of " +"configuration options." #: first-time.page:44 msgid "" @@ -471,6 +590,13 @@ msgid "" "xref=\"circumvention\">Circumvention</link> screen to configure a pluggable " "transport." msgstr "" +"The first screen asks if access to the Tor network is blocked or censored on" +" your connection. If you do not believe this is the case, select “No”. If " +"you know your connection is censored, or you have tried and failed to " +"connect to the Tor network and no other solutions have worked, select “Yes”." +" You will then be taken to the <link " +"xref=\"circumvention\">Circumvention</link> screen to configure a pluggable " +"transport." #: first-time.page:55 msgid "" @@ -480,6 +606,11 @@ msgid "" "ask your network administrator for guidance. If your connection does not use" " a proxy, click “Continue”." msgstr "" +"The next screen asks if your connection uses a proxy. In most cases, this is" +" not necessary. You will usually know if you need to answer “Yes”, as the " +"same settings will be used for other browsers on your system. If possible, " +"ask your network administrator for guidance. If your connection does not use" +" a proxy, click “Continue”." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -491,6 +622,8 @@ msgid "" "external ref='media/first-time/proxy_question.png' " "md5='30853b3e86cfd386bbc32e5b8b45a378'" msgstr "" +"external ref='media/first-time/proxy_question.png' " +"md5='30853b3e86cfd386bbc32e5b8b45a378'" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -502,6 +635,8 @@ msgid "" "external ref='media/first-time/proxy.png' " "md5='13f21a351cd0aa1cf11aada690f3dc90'" msgstr "" +"external ref='media/first-time/proxy.png' " +"md5='13f21a351cd0aa1cf11aada690f3dc90'" #: index.page:6 msgid "Tor Browser User Manual" @@ -509,30 +644,33 @@ msgstr "Tor Browser User Manual" #: known-issues.page:6 msgid "A list of known issues." -msgstr "" +msgstr "A list of known issues." #: known-issues.page:10 msgid "Known Issues" -msgstr "" +msgstr "Known Issues" #: known-issues.page:14 msgid "" "Tor needs your system clock (and your time zone) set to the correct time." msgstr "" +"Tor needs your system clock (and your time zone) set to the correct time." #: known-issues.page:19 msgid "" "The following firewall software have been known to interfere with Tor and " "may need to be temporarily disabled:" msgstr "" +"The following firewall software have been known to interfere with Tor and " +"may need to be temporarily disabled:" #: known-issues.page:23 msgid "Webroot SecureAnywhere" -msgstr "" +msgstr "Webroot SecureAnywhere" #: known-issues.page:26 msgid "Kaspersky Internet Security 2012" -msgstr "" +msgstr "Kaspersky Internet Security 2012" #: known-issues.page:29 msgid "Sophos Antivirus for Mac" @@ -547,16 +685,20 @@ msgid "" "Videos that require Adobe Flash are unavailable. Flash is disabled for " "security reasons." msgstr "" +"Videos that require Adobe Flash are unavailable. Flash is disabled for " +"security reasons." #: known-issues.page:43 msgid "Tor can not use a bridge if a proxy is set." -msgstr "" +msgstr "Tor can not use a bridge if a proxy is set." #: known-issues.page:48 msgid "" "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to " "ensure that each software build is exactly reproducible." msgstr "" +"The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to " +"ensure that each software build is exactly reproducible." #: known-issues.page:54 msgid "" @@ -571,6 +713,8 @@ msgid "" "Tor Browser can also be started from the command line by running the " "following command from inside the Tor Browser directory:" msgstr "" +"Tor Browser can also be started from the command line by running the " +"following command from inside the Tor Browser directory:" #: known-issues.page:66 #, no-wrap @@ -579,14 +723,18 @@ msgid "" " ./start-tor-browser.desktop\n" " " msgstr "" +"\n" +" ./start-tor-browser.desktop\n" +" " #: managing-identities.page:6 msgid "Learn how to control personally-identifying information in Tor Browser" msgstr "" +"Learn how to control personally-identifying information in Tor Browser" #: managing-identities.page:10 msgid "Managing identities" -msgstr "" +msgstr "Managing identities" #: managing-identities.page:12 msgid "" @@ -596,6 +744,11 @@ msgid "" "trackers, and advertising beacons, all of which can link your activity " "across different sites." msgstr "" +"When you connect to a website, it is not only the operators of that website " +"who can record information about your visit. Most websites now use numerous " +"third-party services, including social networking “Like” buttons, analytics " +"trackers, and advertising beacons, all of which can link your activity " +"across different sites." #: managing-identities.page:20 msgid "" @@ -605,10 +758,15 @@ msgid "" " Browser includes some additional features that help you control what " "information can be tied to your identity." msgstr "" +"Using the Tor network stops observers from being able to discover your exact" +" location and IP address, but even without this information they might be " +"able to link different areas of your activity together. For this reason, Tor" +" Browser includes some additional features that help you control what " +"information can be tied to your identity." #: managing-identities.page:29 msgid "The URL bar" -msgstr "" +msgstr "The URL bar" #: managing-identities.page:30 msgid "" @@ -618,6 +776,11 @@ msgid "" " be served over two different Tor circuits, so the tracker will not know " "that both connections originate from your browser." msgstr "" +"Tor Browser centres your web experience around your relationship with the " +"website in the URL bar. Even if you connect to two different sites that use " +"the same third-party tracking service, Tor Browser will force the content to" +" be served over two different Tor circuits, so the tracker will not know " +"that both connections originate from your browser." #: managing-identities.page:38 msgid "" @@ -626,6 +789,10 @@ msgid "" "single website in separate tabs or windows, without any loss of " "functionality." msgstr "" +"On the other hand, all connections to a single website address will be made " +"over the same Tor circuit, meaning you can browse different pages of a " +"single website in separate tabs or windows, without any loss of " +"functionality." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -637,16 +804,20 @@ msgid "" "external ref='media/managing-identities/circuit_full.png' " "md5='bd46d22de952fee42643be46d3f95928'" msgstr "" +"external ref='media/managing-identities/circuit_full.png' " +"md5='bd46d22de952fee42643be46d3f95928'" #: managing-identities.page:48 msgid "" "You can see a diagram of the circuit that Tor Browser is using for the " "current tab in the onion menu." msgstr "" +"You can see a diagram of the circuit that Tor Browser is using for the " +"current tab in the onion menu." #: managing-identities.page:55 msgid "Logging in over Tor" -msgstr "" +msgstr "Logging in over Tor" #: managing-identities.page:56 msgid "" @@ -654,6 +825,9 @@ msgid "" "there may be situations in which it makes sense to use Tor with websites " "that require usernames, passwords, or other identifying information." msgstr "" +"Although Tor Browser is designed to enable total user anonymity on the web, " +"there may be situations in which it makes sense to use Tor with websites " +"that require usernames, passwords, or other identifying information." #: managing-identities.page:62 msgid "" @@ -664,18 +838,28 @@ msgid "" "you reveal to the websites you browse. Logging in using Tor Browser is also " "useful if the website you are trying to reach is censored on your network." msgstr "" +"If you log into a website using a regular browser, you also reveal your IP " +"address and geographical location in the process. The same is often true " +"when you send an email. Logging into your social networking or email " +"accounts using Tor Browser allows you to choose exactly which information " +"you reveal to the websites you browse. Logging in using Tor Browser is also " +"useful if the website you are trying to reach is censored on your network." #: managing-identities.page:72 msgid "" "When you log in to a website over Tor, there are several points you should " "bear in mind:" msgstr "" +"When you log in to a website over Tor, there are several points you should " +"bear in mind:" #: managing-identities.page:79 msgid "" "See the <link xref=\"secure-connections\">Secure Connections</link> page for" " important information on how to secure your connection when logging in." msgstr "" +"See the <link xref=\"secure-connections\">Secure Connections</link> page for" +" important information on how to secure your connection when logging in." #: managing-identities.page:87 msgid "" @@ -686,10 +870,16 @@ msgid "" "following the site’s recommended procedure for account recovery, or " "contacting the operators and explaining the situation." msgstr "" +"Tor Browser often makes your connection appear as though it is coming from " +"an entirely different part of the world. Some websites, such as banks or " +"email providers, might interpret this as a sign that your account has been " +"hacked or compromised, and lock you out. The only way to resolve this is by " +"following the site’s recommended procedure for account recovery, or " +"contacting the operators and explaining the situation." #: managing-identities.page:101 msgid "Changing identities and circuits" -msgstr "" +msgstr "Changing identities and circuits" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -701,6 +891,8 @@ msgid "" "external ref='media/managing-identities/new_identity.png' " "md5='15b01e35fa83185d94b57bf0ccf09d76'" msgstr "" +"external ref='media/managing-identities/new_identity.png' " +"md5='15b01e35fa83185d94b57bf0ccf09d76'" #: managing-identities.page:105 msgid ""

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 23 Dec '17

23 Dec '17

commit 967723c08be942809008011feff911efb02637ae Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 23 01:48:46 2017 +0000 Update translations for torbutton-abouttorproperties_completed --- en_GB/abouttor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/en_GB/abouttor.properties b/en_GB/abouttor.properties index f9723bf25..d0d3a64b8 100644 --- a/en_GB/abouttor.properties +++ b/en_GB/abouttor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 23 Dec '17

23 Dec '17

commit a38827638daba879f309f7ef77d787715b9135b9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 23 01:47:05 2017 +0000 Update translations for tor-launcher-network-settings_completed --- en_GB/network-settings.dtd | 61 +++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd index 0d2e9dc6c..85645d7b9 100644 --- a/en_GB/network-settings.dtd +++ b/en_GB/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!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.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> - -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> -  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -54,22 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!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.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!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)"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> + <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 23 Dec '17

23 Dec '17

commit 076216c2db240a1101e26c7506ebd2f7e295dfb9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 23 01:46:01 2017 +0000 Update translations for liveusb-creator_completed --- en_GB/en_GB.po | 797 +++++++++++++++++++++++++-------------------------------- 1 file changed, 347 insertions(+), 450 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 11f4f3450..5063822fd 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -3,9 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Andi Chandler <andi(a)gowling.com>, 2014-2015 +# Andi Chandler <andi(a)gowling.com>, 2014-2015,2017 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 -# Foorack <maxfaxalv(a)gmail.com>, 2015 +# Foorack, 2015 # Isabell Long <isabell(a)issyl0.co.uk>, 2015 # eire123 <jonnydennis10(a)gmail.com>, 2013 # Richard Shaylor <rshaylor(a)me.com>, 2014 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" +"POT-Creation-Date: 2017-11-10 15:57+0100\n" +"PO-Revision-Date: 2017-12-23 01:41+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -24,591 +24,488 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../liveusb/gui.py:451 -msgid "\"Clone & Install\"" -msgstr "\"Clone & Install\"" +#: ../tails_installer/creator.py:101 +msgid "You must run this application as root" +msgstr "You must run this application as root" -#: ../liveusb/gui.py:453 -msgid "\"Install from ISO\"" -msgstr "\"Install from ISO\"" +#: ../tails_installer/creator.py:147 +msgid "Extracting live image to the target device..." +msgstr "Extracting live image to the target device..." -#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 +#: ../tails_installer/creator.py:154 #, python-format -msgid "%(distribution)s Installer" -msgstr "%(distribution)s Installer" +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "Wrote to device at %(speed)d MB/sec" -#: ../liveusb/gui.py:804 -#, python-format -msgid "%(filename)s selected" -msgstr "%(filename)s selected" +#: ../tails_installer/creator.py:184 +msgid "Setting up OLPC boot file..." +msgstr "Setting up OLPC boot file..." -#: ../liveusb/gui.py:424 +#: ../tails_installer/creator.py:315 #, python-format -msgid "%(size)s %(label)s" -msgstr "%(size)s %(label)s" +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "There was a problem executing the following command: `%(command)s`.\nA more detailed error log has been written to '%(filename)s'." -#: ../liveusb/gui.py:430 -#, python-format -msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" +#: ../tails_installer/creator.py:334 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "Verifying SHA1 checksum of LiveCD image..." -#: ../liveusb/creator.py:1097 -#, python-format -msgid "%s already bootable" -msgstr "%s already bootable" +#: ../tails_installer/creator.py:338 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "Verifying SHA256 checksum of LiveCD image..." -#: ../liveusb/launcher_ui.py:160 +#: ../tails_installer/creator.py:354 msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" - -#: ../liveusb/launcher_ui.py:155 -msgid "" -"<ul>\n" -"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" -"\n" -"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" -"\n" -"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" -"\n" -"</ul>" -msgstr "<ul>\n<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n\n<li>The USB stick that you install on is formatted and all data is lost.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n\n</ul>" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "Error: The SHA1 of your Live CD is invalid. You can run this program with the --noverify argument to bypass this verification check." -#: ../liveusb/launcher_ui.py:157 -msgid "" -"<ul>\n" -"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" -"\n" -"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" -"\n" -"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" -"\n" -"\n" -"</ul>" -msgstr "<ul>\n<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n\n\n</ul>" +#: ../tails_installer/creator.py:360 +msgid "Unknown ISO, skipping checksum verification" +msgstr "Unknown ISO, skipping checksum verification" -#: ../liveusb/launcher_ui.py:159 +#: ../tails_installer/creator.py:371 +#, python-format msgid "" -"<ul>\n" -"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" -"\n" -"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" -"\n" -"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" -"\n" -"</ul>" -msgstr "<ul>\n<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n\n<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n\n</ul>" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Not enough free space on device.\n%dMB ISO + %dMB overlay > %dMB free space" -#: ../liveusb/dialog.py:161 -msgid "Alt+B" -msgstr "Alt+B" +#: ../tails_installer/creator.py:378 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "Creating %sMB persistent overlay" -#: ../liveusb/dialog.py:160 -msgid "Browse" -msgstr "Browse" +#: ../tails_installer/creator.py:439 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "Unable to copy %(infile)s to %(outfile)s: %(message)s" -#: ../liveusb/dialog.py:167 -msgid "" -"By allocating extra space on your USB stick for a persistent overlay, you " -"will be able to store data and make permanent modifications to your live " -"operating system. Without it, you will not be able to save data that will " -"persist after a reboot." -msgstr "By allocating extra space on your USB stick for a persistent overlay, you will be able to store data and make permanent modifications to your live operating system. Without it, you will not be able to save data that will persist after a reboot." +#: ../tails_installer/creator.py:453 +msgid "Removing existing Live OS" +msgstr "Remove existing Live OS" -#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 +#: ../tails_installer/creator.py:462 ../tails_installer/creator.py:473 #, python-format -msgid "Calculating the SHA1 of %s" -msgstr "Calculating the SHA1 of %s" +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "Unable to chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:1407 -msgid "Cannot find" -msgstr "Cannot find" +#: ../tails_installer/creator.py:466 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "Unable to remove file from previous LiveOS: %(message)s" -#: ../liveusb/creator.py:560 +#: ../tails_installer/creator.py:478 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "Unable to remove directory from previous LiveOS: %(message)s" + +#: ../tails_installer/creator.py:526 #, python-format msgid "Cannot find device %s" msgstr "Cannot find device %s" -#: ../liveusb/creator.py:417 +#: ../tails_installer/creator.py:695 #, python-format -msgid "Creating %sMB persistent overlay" -msgstr "Creating %sMB persistent overlay" +msgid "Unable to write on %(device)s, skipping." +msgstr "Unable to write on %(device)s, skipping." -#: ../liveusb/gui.py:582 +#: ../tails_installer/creator.py:719 +#, python-format msgid "" -"Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "Device is not yet mounted, so we cannot determine the amount of free space." +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Some partitions of the target device %(device)s are mounted. They will be unmounted before starting the installation process." -#: ../liveusb/dialog.py:164 -#, python-format -msgid "Download %(distribution)s" -msgstr "Download %(distribution)s" +#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:974 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "Unknown filesystem. Your device may need to be reformatted." -#: ../liveusb/gui.py:778 -msgid "Download complete!" -msgstr "Download complete!" +#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:977 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "Unsupported filesystem: %s" -#: ../liveusb/gui.py:782 -msgid "Download failed: " -msgstr "Download failed: " +#: ../tails_installer/creator.py:782 +#, python-format +msgid "Unknown GLib exception while trying to mount device: %(message)s" +msgstr "Unknown GLib exception while trying to mount device: %(message)s" -#: ../liveusb/gui.py:89 +#: ../tails_installer/creator.py:786 #, python-format -msgid "Downloading %s..." -msgstr "Downloading %s..." +msgid "Unable to mount device: %(message)s" +msgstr "Unable to mount device: %(message)s" -#: ../liveusb/creator.py:1192 -msgid "Drive is a loopback, skipping MBR reset" -msgstr "Drive is a loopback, skipping MBR reset" +#: ../tails_installer/creator.py:791 +msgid "No mount points found" +msgstr "No mount points found" -#: ../liveusb/creator.py:837 +#: ../tails_installer/creator.py:802 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Entering unmount_device for '%(device)s'" -#: ../liveusb/creator.py:1272 -msgid "Error probing device" -msgstr "Error probing device" - -#: ../liveusb/gui.py:213 -msgid "" -"Error: Cannot set the label or obtain the UUID of your device. Unable to " -"continue." -msgstr "Error: Cannot set the label or obtain the UUID of your device. Unable to continue." - -#: ../liveusb/creator.py:393 -msgid "" -"Error: The SHA1 of your Live CD is invalid. You can run this program with " -"the --noverify argument to bypass this verification check." -msgstr "Error: The SHA1 of your Live CD is invalid. You can run this program with the --noverify argument to bypass this verification check." - -#: ../liveusb/creator.py:155 -msgid "Extracting live image to the target device..." -msgstr "Extracting live image to the target device..." - -#: ../liveusb/creator.py:1140 +#: ../tails_installer/creator.py:812 #, python-format -msgid "Formatting %(device)s as FAT32" -msgstr "Formatting %(device)s as FAT32" +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Unmounting mounted filesystems on '%(device)s'" -#: ../liveusb/creator.py:150 -msgid "ISO MD5 checksum passed" -msgstr "ISO MD5 checksum passed" +#: ../tails_installer/creator.py:816 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Unmounting '%(udi)s' on '%(device)s'" -#: ../liveusb/creator.py:148 -msgid "ISO MD5 checksum verification failed" -msgstr "ISO MD5 checksum verification failed" +#: ../tails_installer/creator.py:826 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "Mount %s exists after unmounting" -#: ../liveusb/dialog.py:163 -msgid "" -"If you do not select an existing Live ISO, the selected release will be " -"downloaded for you." -msgstr "If you do not select an existing Live ISO, the selected release will be downloaded for you." +#: ../tails_installer/creator.py:839 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Partitioning device %(device)s" -#: ../liveusb/launcher_ui.py:154 -msgid "" -"Install\n" -"by cloning" -msgstr "Install\nby cloning" +#: ../tails_installer/creator.py:959 +#, python-format +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "Unsupported device '%(device)s', please report a bug." -#: ../liveusb/dialog.py:172 -msgid "Install Tails" -msgstr "Install Tails" +#: ../tails_installer/creator.py:962 +msgid "Trying to continue anyway." +msgstr "Trying to continue anyway." -#: ../liveusb/gui.py:645 -msgid "Installation complete!" -msgstr "Installation complete!" +#: ../tails_installer/creator.py:971 ../tails_installer/creator.py:1364 +msgid "Verifying filesystem..." +msgstr "Verifying filesystem..." -#: ../liveusb/gui.py:265 +#: ../tails_installer/creator.py:995 #, python-format -msgid "Installation complete! (%s)" -msgstr "Installation complete! (%s)" - -#: ../liveusb/gui.py:646 -msgid "Installation was completed. Press OK to close this program." -msgstr "Installation was completed. Press OK to close this program." +msgid "Unable to change volume label: %(message)s" +msgstr "Unable to change volume label: %(message)s" -#: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 +#: ../tails_installer/creator.py:1000 ../tails_installer/creator.py:1397 msgid "Installing bootloader..." msgstr "Installing bootloader..." -#: ../liveusb/gui.py:454 +#: ../tails_installer/creator.py:1026 #, python-format -msgid "" -"It is impossible to upgrade the device %(pretty_name)s because it was not " -"created using Tails Installer. You should instead use %(action)s to upgrade " -"Tails on this device." -msgstr "It is impossible to upgrade the device %(pretty_name)s because it was not created using Tails Installer. You should instead use %(action)s to upgrade Tails on this device." - -#: ../liveusb/gui.py:270 -msgid "LiveUSB creation failed!" -msgstr "LiveUSB creation failed!" - -#: ../liveusb/creator.py:1408 -msgid "" -"Make sure to extract the entire liveusb-creator zip file before running this" -" program." -msgstr "Make sure to extract the entire liveusb-creator zip file before running this program." - -#: ../liveusb/creator.py:1284 -msgid "" -"Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgid "Could not find the '%s' COM32 module" +msgstr "Could not find the '%s' COM32 module" -#: ../liveusb/creator.py:859 +#: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1415 #, python-format -msgid "Mount %s exists after unmounting" -msgstr "Mount %s exists after unmounting" +msgid "Removing %(file)s" +msgstr "Removing %(file)s" -#: ../liveusb/gui.py:588 +#: ../tails_installer/creator.py:1146 #, python-format -msgid "No free space on device %(device)s" -msgstr "No free space on device %(device)s" +msgid "%s already bootable" +msgstr "%s already bootable" -#: ../liveusb/creator.py:826 -msgid "No mount points found" -msgstr "No mount points found" +#: ../tails_installer/creator.py:1166 +msgid "Unable to find partition" +msgstr "Unable to find partition" -#: ../liveusb/creator.py:410 +#: ../tails_installer/creator.py:1189 #, python-format -msgid "" -"Not enough free space on device.\n" -"%dMB ISO + %dMB overlay > %dMB free space" -msgstr "Not enough free space on device.\n%dMB ISO + %dMB overlay > %dMB free space" - -#: ../liveusb/gui.py:569 -msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "Partition is FAT16; Restricting overlay size to 2G" +msgid "Formatting %(device)s as FAT32" +msgstr "Formatting %(device)s as FAT32" -#: ../liveusb/gui.py:565 -msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Partition is FAT32; Restricting overlay size to 4G" +#: ../tails_installer/creator.py:1249 +msgid "Could not find syslinux' gptmbr.bin" +msgstr "Could not find syslinux' gptmbr.bin" -#: ../liveusb/creator.py:236 ../liveusb/creator.py:866 +#: ../tails_installer/creator.py:1262 #, python-format -msgid "Partitioning device %(device)s" -msgstr "Partitioning device %(device)s" - -#: ../liveusb/gui.py:636 -msgid "Persistent Storage" -msgstr "Persistent Storage" +msgid "Reading extracted MBR from %s" +msgstr "Reading extracted MBR from %s" -#: ../liveusb/dialog.py:168 -msgid "Persistent Storage (0 MB)" -msgstr "Persistent Storage (0 MB)" - -#: ../liveusb/gui.py:698 ../liveusb/gui.py:727 -msgid "Please confirm your device selection" -msgstr "Please confirm your device selection" - -#: ../liveusb/gui.py:481 -msgid "Refreshing releases..." -msgstr "Refreshing releases..." - -#: ../liveusb/gui.py:486 -msgid "Releases updated!" -msgstr "Releases updated!" - -#: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 +#: ../tails_installer/creator.py:1266 #, python-format -msgid "Removing %(file)s" -msgstr "Removing %(file)s" - -#: ../liveusb/creator.py:492 -msgid "Removing existing Live OS" -msgstr "Remove existing Live OS" +msgid "Could not read the extracted MBR from %(path)s" +msgstr "Could not read the extracted MBR from %(path)s" -#: ../liveusb/creator.py:1186 +#: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1280 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Resetting Master Boot Record of %s" -#: ../liveusb/gui.py:789 -msgid "Select Live ISO" -msgstr "Select Live ISO" - -#: ../liveusb/creator.py:192 -msgid "Setting up OLPC boot file..." -msgstr "Setting up OLPC boot file..." +#: ../tails_installer/creator.py:1285 +msgid "Drive is a loopback, skipping MBR reset" +msgstr "Drive is a loopback, skipping MBR reset" -#: ../liveusb/creator.py:742 +#: ../tails_installer/creator.py:1289 ../tails_installer/creator.py:1543 #, python-format -msgid "" -"Some partitions of the target device %(device)s are mounted. They will be " -"unmounted before starting the installation process." -msgstr "Some partitions of the target device %(device)s are mounted. They will be unmounted before starting the installation process." - -#: ../liveusb/creator.py:141 -msgid "" -"Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "Source type does not support verification of ISO MD5 checksum, skipping" +msgid "Calculating the SHA1 of %s" +msgstr "Calculating the SHA1 of %s" -#: ../liveusb/creator.py:1220 +#: ../tails_installer/creator.py:1314 msgid "Synchronizing data on disk..." msgstr "Synchronizing data on disk..." -#: ../liveusb/dialog.py:166 -msgid "Target Device" -msgstr "Target Device" +#: ../tails_installer/creator.py:1356 +msgid "Error probing device" +msgstr "Error probing device" -#: ../liveusb/gui.py:438 -#, python-format -msgid "" -"The device \"%(pretty_name)s\" is too small to install Tails (at least " -"%(size)s GB is required)." -msgstr "The device \"%(pretty_name)s\" is too small to install Tails (at least %(size)s GB is required)." +#: ../tails_installer/creator.py:1358 +msgid "Unable to find any supported device" +msgstr "Unable to find any supported device" -#: ../liveusb/gui.py:792 +#: ../tails_installer/creator.py:1368 msgid "" -"The selected file is unreadable. Please fix its permissions or select " -"another file." -msgstr "The selected file is unreadable. Please fix its permissions or select another file." +"Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgstr "Make sure your USB key is plugged in and formatted with the FAT filesystem" -#: ../liveusb/creator.py:354 +#: ../tails_installer/creator.py:1371 #, python-format msgid "" -"There was a problem executing the following command: `%(command)s`.\n" -"A more detailed error log has been written to '%(filename)s'." -msgstr "There was a problem executing the following command: `%(command)s`.\nA more detailed error log has been written to '%(filename)s'." - -#: ../liveusb/dialog.py:158 -msgid "" -"This button allows you to browse for an existing Live system ISO that you " -"have previously downloaded. If you do not select one, a release will be " -"downloaded for you automatically." -msgstr "This button allows you to browse for an existing Live system ISO that you have previously downloaded. If you do not select one, a release will be downloaded for you automatically." +"Unsupported filesystem: %s\n" +"Please backup and format your USB key with the FAT filesystem." +msgstr "Unsupported filesystem: %s\nPlease backup and format your USB key with the FAT filesystem." -#: ../liveusb/dialog.py:171 +#: ../tails_installer/creator.py:1438 msgid "" -"This button will begin the LiveUSB creation process. This entails " -"optionally downloading a release (if an existing one wasn't selected), " -"extracting the ISO to the USB device, creating the persistent overlay, and " -"installing the bootloader." -msgstr "This button will begin the LiveUSB creation process. This entails optionally downloading a release (if an existing one wasn't selected), extracting the ISO to the USB device, creating the persistent overlay, and installing the bootloader." +"Unable to get Win32_LogicalDisk; win32com query did not return any results" +msgstr "Unable to get Win32_LogicalDisk; win32com query did not return any results" -#: ../liveusb/dialog.py:165 -msgid "" -"This is the USB stick that you want to install your Live system on. This " -"device must be formatted with the FAT filesystem." -msgstr "This is the USB stick that you want to install your Live system on. This device must be formatted with the FAT filesystem." +#: ../tails_installer/creator.py:1491 +msgid "Cannot find" +msgstr "Cannot find" -#: ../liveusb/dialog.py:170 +#: ../tails_installer/creator.py:1492 msgid "" -"This is the progress bar that will indicate how far along in the LiveUSB " -"creation process you are" -msgstr "This is the progress bar that will indicate how far along in the LiveUSB creation process you are" - -#: ../liveusb/dialog.py:169 -msgid "This is the status console, where all messages get written to." -msgstr "This is the status console, where all messages get written to." - -#: ../liveusb/creator.py:952 -msgid "Trying to continue anyway." -msgstr "Trying to continue anyway." - -#: ../liveusb/gui.py:464 -msgid "USB drive found" -msgstr "USB drive found" +"Make sure to extract the entire tails-installer zip file before running this" +" program." +msgstr "Make sure to extract the entire tails-installer zip file before running this program." -#: ../liveusb/creator.py:985 +#: ../tails_installer/gui.py:69 #, python-format -msgid "Unable to change volume label: %(message)s" -msgstr "Unable to change volume label: %(message)s" +msgid "Unknown release: %s" +msgstr "Unknown release: %s" -#: ../liveusb/creator.py:501 ../liveusb/creator.py:512 +#: ../tails_installer/gui.py:73 #, python-format -msgid "Unable to chmod %(file)s: %(message)s" -msgstr "Unable to chmod %(file)s: %(message)s" +msgid "Downloading %s..." +msgstr "Downloading %s..." -#: ../liveusb/creator.py:478 +#: ../tails_installer/gui.py:211 +msgid "" +"Error: Cannot set the label or obtain the UUID of your device. Unable to " +"continue." +msgstr "Error: Cannot set the label or obtain the UUID of your device. Unable to continue." + +#: ../tails_installer/gui.py:258 #, python-format -msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgid "Installation complete! (%s)" +msgstr "Installation complete! (%s)" -#: ../liveusb/gui.py:403 -msgid "Unable to find any USB drive" -msgstr "Unable to find any USB drive" +#: ../tails_installer/gui.py:263 +msgid "Tails installation failed!" +msgstr "Tails installation failed!" -#: ../liveusb/creator.py:1274 -msgid "Unable to find any supported device" -msgstr "Unable to find any supported device" +#: ../tails_installer/gui.py:363 +msgid "" +"Warning: This tool needs to be run as an Administrator. To do this, right " +"click on the icon and open the Properties. Under the Compatibility tab, " +"check the \"Run this program as an administrator\" box." +msgstr "Warning: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the \"Run this program as an administrator\" box." -#: ../liveusb/creator.py:1117 -msgid "Unable to find partition" -msgstr "Unable to find partition" +#: ../tails_installer/gui.py:375 +msgid "Tails Installer" +msgstr "Tails Installer" -#: ../liveusb/creator.py:1354 -msgid "" -"Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "Unable to get Win32_LogicalDisk; win32com query did not return any results" +#: ../tails_installer/gui.py:456 +msgid "Upgrade" +msgstr "Upgrade" -#: ../liveusb/gui.py:691 -msgid "Unable to mount device" -msgstr "Unable to mount device" +#: ../tails_installer/gui.py:462 ../data/tails-installer.ui.h:7 +msgid "Install" +msgstr "Install" -#: ../liveusb/creator.py:814 +#: ../tails_installer/gui.py:469 #, python-format -msgid "Unable to mount device: %(message)s" -msgstr "Unable to mount device: %(message)s" +msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" +msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)" -#: ../liveusb/creator.py:517 -#, python-format -msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "Unable to remove directory from previous LiveOS: %(message)s" +#: ../tails_installer/gui.py:481 +msgid "No ISO image selected" +msgstr "No ISO image selected" -#: ../liveusb/creator.py:505 +#: ../tails_installer/gui.py:482 +msgid "Please select a Tails ISO image." +msgstr "Please select a Tails ISO image." + +#: ../tails_installer/gui.py:521 +msgid "No device suitable to install Tails could be found" +msgstr "No device suitable to install Tails could be found" + +#: ../tails_installer/gui.py:523 #, python-format -msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "Unable to remove file from previous LiveOS: %(message)s" +msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." +msgstr "Please plug a USB flash drive or SD card of at least %0.1f GB." -#: ../liveusb/creator.py:1189 +#: ../tails_installer/gui.py:557 +#, python-format msgid "" -"Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "Unable to reset MBR. You may not have the `syslinux` package installed." +"The USB stick \"%(pretty_name)s\" is configured as non-removable by its " +"manufacturer and Tails will fail to start on it. Please try installing on a " +"different model." +msgstr "The USB stick \"%(pretty_name)s\" is configured as non-removable by its manufacturer and Tails will fail to start on it. Please try installing on a different model." -#: ../liveusb/gui.py:798 +#: ../tails_installer/gui.py:567 +#, python-format msgid "" -"Unable to use the selected file. You may have better luck if you move your " -"ISO to the root of your drive (ie: C:\\)" -msgstr "Unable to use the selected file. You may have better luck if you move your ISO to the root of your drive (ie: C:\\)" +"The device \"%(pretty_name)s\" is too small to install Tails (at least " +"%(size)s GB is required)." +msgstr "The device \"%(pretty_name)s\" is too small to install Tails (at least %(size)s GB is required)." -#: ../liveusb/creator.py:723 -#, python-format -msgid "Unable to write on %(device)s, skipping." -msgstr "Unable to write on %(device)s, skipping." +#: ../tails_installer/gui.py:589 +msgid "An error happened while installing Tails" +msgstr "An error happened while installing Tails" -#: ../liveusb/creator.py:399 -msgid "Unknown ISO, skipping checksum verification" -msgstr "Unknown ISO, skipping checksum verification" +#: ../tails_installer/gui.py:601 +msgid "Refreshing releases..." +msgstr "Refreshing releases..." -#: ../liveusb/creator.py:810 -#, python-format -msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "Unknown dbus exception while trying to mount device: %(message)s" +#: ../tails_installer/gui.py:606 +msgid "Releases updated!" +msgstr "Releases updated!" -#: ../liveusb/creator.py:791 ../liveusb/creator.py:964 -msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "Unknown filesystem. Your device may need to be reformatted." +#: ../tails_installer/gui.py:648 +msgid "Installation complete!" +msgstr "Installation complete!" -#: ../liveusb/gui.py:85 -#, python-format -msgid "Unknown release: %s" -msgstr "Unknown release: %s" +#: ../tails_installer/gui.py:649 +msgid "Installation was completed." +msgstr "Installation was completed." -#: ../liveusb/creator.py:851 -#, python-format -msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "Unmounting '%(udi)s' on '%(device)s'" +#: ../tails_installer/gui.py:698 +msgid "Unable to mount device" +msgstr "Unable to mount device" -#: ../liveusb/creator.py:847 -#, python-format -msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "Unmounting mounted filesystems on '%(device)s'" +#: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735 +msgid "Confirm the target USB stick" +msgstr "Confirm the target USB stick" -#: ../liveusb/creator.py:949 +#: ../tails_installer/gui.py:706 #, python-format -msgid "Unsupported device '%(device)s', please report a bug." -msgstr "Unsupported device '%(device)s', please report a bug." +msgid "" +"%(size)s %(vendor)s %(model)s device (%(device)s)\n" +"\n" +"All data on this USB stick will be lost." +msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)\n\nAll data on this USB stick will be lost." -#: ../liveusb/creator.py:794 ../liveusb/creator.py:967 +#: ../tails_installer/gui.py:722 #, python-format -msgid "Unsupported filesystem: %s" -msgstr "Unsupported filesystem: %s" +msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" +msgstr "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -#: ../liveusb/creator.py:1287 -#, python-format +#: ../tails_installer/gui.py:730 msgid "" -"Unsupported filesystem: %s\n" -"Please backup and format your USB key with the FAT filesystem." -msgstr "Unsupported filesystem: %s\nPlease backup and format your USB key with the FAT filesystem." +"\n" +"\n" +"The persistent storage on this USB stick will be preserved." +msgstr "\n\nThe persistent storage on this USB stick will be preserved." -#: ../liveusb/creator.py:892 +#: ../tails_installer/gui.py:731 #, python-format -msgid "Updating properties of system partition %(system_partition)s" -msgstr "Updating properties of system partition %(system_partition)s" +msgid "%(description)s%(persistence_message)s" +msgstr "%(description)s%(persistence_message)s" -#: ../liveusb/launcher_ui.py:156 -msgid "" -"Upgrade\n" -"by cloning" -msgstr "Upgrade\nby cloning" +#: ../tails_installer/gui.py:781 +msgid "Download complete!" +msgstr "Download complete!" -#: ../liveusb/launcher_ui.py:158 -msgid "" -"Upgrade\n" -"from ISO" -msgstr "Upgrade\nfrom ISO" +#: ../tails_installer/gui.py:785 +msgid "Download failed: " +msgstr "Download failed: " -#: ../liveusb/dialog.py:159 -msgid "Use existing Live system ISO" -msgstr "Use existing Live system ISO" +#: ../tails_installer/gui.py:786 +msgid "You can try again to resume your download" +msgstr "You can try again to resume your download" -#: ../liveusb/creator.py:143 -msgid "Verifying ISO MD5 checksum" -msgstr "Verifying ISO MD5 checksum" +#: ../tails_installer/gui.py:794 +msgid "" +"The selected file is unreadable. Please fix its permissions or select " +"another file." +msgstr "The selected file is unreadable. Please fix its permissions or select another file." -#: ../liveusb/creator.py:373 -msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "Verifying SHA1 checksum of LiveCD image..." +#: ../tails_installer/gui.py:800 +msgid "" +"Unable to use the selected file. You may have better luck if you move your " +"ISO to the root of your drive (ie: C:\\)" +msgstr "Unable to use the selected file. You may have better luck if you move your ISO to the root of your drive (ie: C:\\)" -#: ../liveusb/creator.py:377 -msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "Verifying SHA256 checksum of LiveCD image..." +#: ../tails_installer/gui.py:806 +#, python-format +msgid "%(filename)s selected" +msgstr "%(filename)s selected" -#: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 -msgid "Verifying filesystem..." -msgstr "Verifying filesystem..." +#: ../tails_installer/source.py:28 +msgid "Unable to find LiveOS on ISO" +msgstr "Unable to find LiveOS on ISO" -#: ../liveusb/gui.py:725 -msgid "" -"Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Warning: Creating a new persistent overlay will delete your existing one." +#: ../tails_installer/source.py:34 +#, python-format +msgid "Could not guess underlying block device: %s" +msgstr "Could not guess underlying block device: %s" -#: ../liveusb/gui.py:377 +#: ../tails_installer/source.py:49 +#, python-format msgid "" -"Warning: This tool needs to be run as an Administrator. To do this, right " -"click on the icon and open the Properties. Under the Compatibility tab, " -"check the \"Run this program as an administrator\" box." -msgstr "Warning: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the \"Run this program as an administrator\" box." +"There was a problem executing `%s`.\n" +"%s\n" +"%s" +msgstr "There was a problem executing `%s`.\n%s\n%s" -#: ../liveusb/creator.py:162 +#: ../tails_installer/source.py:63 #, python-format -msgid "Wrote to device at %(speed)d MB/sec" -msgstr "Wrote to device at %(speed)d MB/sec" +msgid "'%s' does not exist" +msgstr "'%s' does not exist" -#: ../liveusb/gui.py:699 +#: ../tails_installer/source.py:65 #, python-format -msgid "" -"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " -"(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "You are going to install Tails on the %(size)s %(vendor)s %(model)s device (%(device)s). All data on the selected device will be lost. Continue?" +msgid "'%s' is not a directory" +msgstr "'%s' is not a directory" -#: ../liveusb/gui.py:715 +#: ../tails_installer/source.py:75 #, python-format -msgid "" -"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " -"device (%(device)s). Any persistent volume on this device will remain " -"unchanged. Continue?" -msgstr "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s device (%(device)s). Any persistent volume on this device will remain unchanged. Continue?" +msgid "Skipping '%(filename)s'" +msgstr "Skipping '%(filename)s'" -#: ../liveusb/creator.py:622 +#: ../tails_installer/utils.py:44 +#, python-format msgid "" -"You are using an old version of syslinux-extlinux that does not support the " -"ext4 filesystem" -msgstr "You are using an old version of syslinux-extlinux that does not support the ext4 filesystem" +"There was a problem executing `%s`.%s\n" +"%s" +msgstr "There was a problem executing `%s`.%s\n%s" -#: ../liveusb/gui.py:783 -msgid "You can try again to resume your download" -msgstr "You can try again to resume your download" +#: ../tails_installer/utils.py:124 +msgid "Could not open device for writing." +msgstr "Could not open device for writing." -#: ../liveusb/creator.py:95 -msgid "You must run this application as root" -msgstr "You must run this application as root" +#: ../data/tails-installer.ui.h:1 +msgid "Installation Instructions" +msgstr "Installation Instructions" + +#: ../data/tails-installer.ui.h:2 +msgid "Clone the current Tails" +msgstr "Clone the current Tails" + +#: ../data/tails-installer.ui.h:3 +msgid "Use a downloaded Tails ISO image" +msgstr "Use a downloaded Tails ISO image" + +#: ../data/tails-installer.ui.h:4 +msgid "Select a distribution to download:" +msgstr "Select a distribution to download:" + +#: ../data/tails-installer.ui.h:5 +msgid "Target USB stick:" +msgstr "Target USB stick:" -#: ../liveusb/dialog.py:162 -msgid "or" -msgstr "or" +#: ../data/tails-installer.ui.h:6 +msgid "Reinstall (delete all data)" +msgstr "Reinstall (delete all data)"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Dec '17

23 Dec '17

commit 286c0e117771a08eeda20c5d6fc5efa25f7ca1f9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 23 01:45:54 2017 +0000 Update translations for liveusb-creator --- en_GB/en_GB.po | 80 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index c67234176..5063822fd 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Andi Chandler <andi(a)gowling.com>, 2014-2015 +# Andi Chandler <andi(a)gowling.com>, 2014-2015,2017 # Bruce Cowan <bcowan(a)fastmail.co.uk>, 2010 # Foorack, 2015 # Isabell Long <isabell(a)issyl0.co.uk>, 2015 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2017-11-11 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-12-23 01:41+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -131,7 +131,7 @@ msgstr "Unsupported filesystem: %s" #: ../tails_installer/creator.py:782 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Unknown GLib exception while trying to mount device: %(message)s" #: ../tails_installer/creator.py:786 #, python-format @@ -192,7 +192,7 @@ msgstr "Installing bootloader..." #: ../tails_installer/creator.py:1026 #, python-format msgid "Could not find the '%s' COM32 module" -msgstr "" +msgstr "Could not find the '%s' COM32 module" #: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1415 #, python-format @@ -215,17 +215,17 @@ msgstr "Formatting %(device)s as FAT32" #: ../tails_installer/creator.py:1249 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "Could not find syslinux' gptmbr.bin" #: ../tails_installer/creator.py:1262 #, python-format msgid "Reading extracted MBR from %s" -msgstr "" +msgstr "Reading extracted MBR from %s" #: ../tails_installer/creator.py:1266 #, python-format msgid "Could not read the extracted MBR from %(path)s" -msgstr "" +msgstr "Could not read the extracted MBR from %(path)s" #: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1280 #, python-format @@ -278,7 +278,7 @@ msgstr "Cannot find" msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "" +msgstr "Make sure to extract the entire tails-installer zip file before running this program." #: ../tails_installer/gui.py:69 #, python-format @@ -303,7 +303,7 @@ msgstr "Installation complete! (%s)" #: ../tails_installer/gui.py:263 msgid "Tails installation failed!" -msgstr "" +msgstr "Tails installation failed!" #: ../tails_installer/gui.py:363 msgid "" @@ -314,37 +314,37 @@ msgstr "Warning: This tool needs to be run as an Administrator. To do this, righ #: ../tails_installer/gui.py:375 msgid "Tails Installer" -msgstr "" +msgstr "Tails Installer" #: ../tails_installer/gui.py:456 msgid "Upgrade" -msgstr "" +msgstr "Upgrade" #: ../tails_installer/gui.py:462 ../data/tails-installer.ui.h:7 msgid "Install" -msgstr "" +msgstr "Install" #: ../tails_installer/gui.py:469 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)" #: ../tails_installer/gui.py:481 msgid "No ISO image selected" -msgstr "" +msgstr "No ISO image selected" #: ../tails_installer/gui.py:482 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Please select a Tails ISO image." #: ../tails_installer/gui.py:521 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "No device suitable to install Tails could be found" #: ../tails_installer/gui.py:523 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "" +msgstr "Please plug a USB flash drive or SD card of at least %0.1f GB." #: ../tails_installer/gui.py:557 #, python-format @@ -352,7 +352,7 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "" +msgstr "The USB stick \"%(pretty_name)s\" is configured as non-removable by its manufacturer and Tails will fail to start on it. Please try installing on a different model." #: ../tails_installer/gui.py:567 #, python-format @@ -363,7 +363,7 @@ msgstr "The device \"%(pretty_name)s\" is too small to install Tails (at least % #: ../tails_installer/gui.py:589 msgid "An error happened while installing Tails" -msgstr "" +msgstr "An error happened while installing Tails" #: ../tails_installer/gui.py:601 msgid "Refreshing releases..." @@ -379,7 +379,7 @@ msgstr "Installation complete!" #: ../tails_installer/gui.py:649 msgid "Installation was completed." -msgstr "" +msgstr "Installation was completed." #: ../tails_installer/gui.py:698 msgid "Unable to mount device" @@ -387,7 +387,7 @@ msgstr "Unable to mount device" #: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735 msgid "Confirm the target USB stick" -msgstr "" +msgstr "Confirm the target USB stick" #: ../tails_installer/gui.py:706 #, python-format @@ -395,24 +395,24 @@ msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" "\n" "All data on this USB stick will be lost." -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s device (%(device)s)\n\nAll data on this USB stick will be lost." #: ../tails_installer/gui.py:722 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" #: ../tails_installer/gui.py:730 msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "" +msgstr "\n\nThe persistent storage on this USB stick will be preserved." #: ../tails_installer/gui.py:731 #, python-format msgid "%(description)s%(persistence_message)s" -msgstr "" +msgstr "%(description)s%(persistence_message)s" #: ../tails_installer/gui.py:781 msgid "Download complete!" @@ -445,12 +445,12 @@ msgstr "%(filename)s selected" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" -msgstr "" +msgstr "Unable to find LiveOS on ISO" #: ../tails_installer/source.py:34 #, python-format msgid "Could not guess underlying block device: %s" -msgstr "" +msgstr "Could not guess underlying block device: %s" #: ../tails_installer/source.py:49 #, python-format @@ -458,54 +458,54 @@ msgid "" "There was a problem executing `%s`.\n" "%s\n" "%s" -msgstr "" +msgstr "There was a problem executing `%s`.\n%s\n%s" #: ../tails_installer/source.py:63 #, python-format msgid "'%s' does not exist" -msgstr "" +msgstr "'%s' does not exist" #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "" +msgstr "'%s' is not a directory" #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "" +msgstr "Skipping '%(filename)s'" #: ../tails_installer/utils.py:44 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" -msgstr "" +msgstr "There was a problem executing `%s`.%s\n%s" #: ../tails_installer/utils.py:124 msgid "Could not open device for writing." -msgstr "" +msgstr "Could not open device for writing." #: ../data/tails-installer.ui.h:1 msgid "Installation Instructions" -msgstr "" +msgstr "Installation Instructions" #: ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" -msgstr "" +msgstr "Clone the current Tails" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "Use a downloaded Tails ISO image" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:" -msgstr "" +msgstr "Select a distribution to download:" #: ../data/tails-installer.ui.h:5 msgid "Target USB stick:" -msgstr "" +msgstr "Target USB stick:" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" -msgstr "" +msgstr "Reinstall (delete all data)"

1 0

[stem/master] Fix exit port counts
by atagar＠torproject.org 22 Dec '17

22 Dec '17

commit db311d101d9c07e081bafcb756c868f7e0b3cbf4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 22 14:07:21 2017 -0800 Fix exit port counts Grrr, I made a mistake similar to this earlier. Caught thanks to toralf. --- docs/_static/example/relay_connections.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_static/example/relay_connections.py b/docs/_static/example/relay_connections.py index 42c22fa5..5b80caf8 100755 --- a/docs/_static/example/relay_connections.py +++ b/docs/_static/example/relay_connections.py @@ -110,7 +110,7 @@ def main(): total_ipv4, total_ipv6 = 0, 0 for port in sorted(exit_connections): - ipv4_count = len([conn for conn in connections if is_valid_ipv4_address(conn.remote_address)]) + ipv4_count = len([conn for conn in exit_connections if is_valid_ipv4_address(conn.remote_address)]) ipv6_count = len(exit_connections) - ipv4_count total_ipv4, total_ipv6 = total_ipv4 + ipv4_count, total_ipv6 + ipv6_count

1 0

[stem/master] Add demo for getting a relay conneciton summary
by atagar＠torproject.org 22 Dec '17

22 Dec '17

commit 843facd89a35658a750dddfba86d0dfcddd6fe69 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 22 12:21:35 2017 -0800 Add demo for getting a relay conneciton summary Revising a neat stem script by toralf that provides a summary of your relay's connections. --- docs/_static/example/load_test.py | 25 +++++ docs/_static/example/relay_connections.py | 129 ++++++++++++++++++++++ docs/change_log.rst | 6 + docs/contents.rst | 1 + docs/tutorials/double_double_toil_and_trouble.rst | 8 ++ docs/tutorials/examples/relay_connections.rst | 48 ++++++++ 6 files changed, 217 insertions(+) diff --git a/docs/_static/example/load_test.py b/docs/_static/example/load_test.py new file mode 100644 index 00000000..e98e4c00 --- /dev/null +++ b/docs/_static/example/load_test.py @@ -0,0 +1,25 @@ +import os +import time + +import stem.control +import stem.util.proc +import stem.util.str_tools + +start_time = time.time() +samplings = [] +last_sample = None + +with stem.control.Controller.from_port() as controller: + controller.authenticate() + controller.add_event_listener(lambda *args: None, 'DEBUG') + + while True: + utime, stime = stem.util.proc.stats(os.getpid(), stem.util.proc.Stat.CPU_UTIME, stem.util.proc.Stat.CPU_STIME) + total_cpu_time = float(utime) + float(stime) + + if last_sample: + samplings.append(total_cpu_time - last_sample) + print '%0.1f%% (%s)' % (sum(samplings) / len(samplings) * 100, stem.util.str_tools.time_label(time.time() - start_time)) + + last_sample = total_cpu_time + time.sleep(1) diff --git a/docs/_static/example/relay_connections.py b/docs/_static/example/relay_connections.py new file mode 100755 index 00000000..42c22fa5 --- /dev/null +++ b/docs/_static/example/relay_connections.py @@ -0,0 +1,129 @@ +import argparse +import collections +import time + +import stem.connection +import stem.util.system +import stem.util.str_tools + +from stem.control import Listener +from stem.util.connection import get_connections, port_usage, is_valid_ipv4_address + +HEADER_LINE = " {version} uptime: {uptime} flags: {flags}\n" + +DIV = '+%s+%s+%s+' % ('-' * 30, '-' * 6, '-' * 6) +COLUMN = '| %-28s | %4s | %4s |' + +INBOUND_ORPORT = 'Inbound to our ORPort' +INBOUND_DIRPORT = 'Inbound to our DirPort' +INBOUND_CONTROLPORT = 'Inbound to our ControlPort' + +OUTBOUND_ORPORT = 'Outbound to a relay' +OUTBOUND_EXIT = 'Outbound exit traffic' +OUTBOUND_UNKNOWN = 'Outbound uncategorized' + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("--ctrlport", help="default: 9051 or 9151") + parser.add_argument("--resolver", help="default: autodetected") + args = parser.parse_args() + + control_port = int(args.ctrlport) if args.ctrlport else 'default' + controller = stem.connection.connect(control_port = ('127.0.0.1', control_port)) + + if not controller: + return + + desc = controller.get_network_status(default = None) + pid = controller.get_pid() + + print(HEADER_LINE.format( + version = str(controller.get_version()).split()[0], + uptime = stem.util.str_tools.short_time_label(time.time() - stem.util.system.start_time(pid)), + flags = ', '.join(desc.flags if desc else ['none']), + )) + + policy = controller.get_exit_policy() + relays = {} # address => [orports...] + + for desc in controller.get_network_statuses(): + relays.setdefault(desc.address, []).append(desc.or_port) + + # categorize our connections + + connections = collections.OrderedDict(( + (INBOUND_ORPORT, []), + (INBOUND_DIRPORT, []), + (INBOUND_CONTROLPORT, []), + (OUTBOUND_ORPORT, []), + (OUTBOUND_EXIT, []), + (OUTBOUND_UNKNOWN, []), + )) + + exit_connections = {} # port => [connections] + + for conn in get_connections(resolver = args.resolver, process_pid = pid): + if conn.protocol == 'udp': + continue + + if conn.local_port in controller.get_ports(Listener.OR, []): + connections[INBOUND_ORPORT].append(conn) + elif conn.local_port in controller.get_ports(Listener.DIR, []): + connections[INBOUND_DIRPORT].append(conn) + elif conn.local_port in controller.get_ports(Listener.CONTROL, []): + connections[INBOUND_CONTROLPORT].append(conn) + elif conn.remote_port in relays.get(conn.remote_address, []): + connections[OUTBOUND_ORPORT].append(conn) + elif policy.can_exit_to(conn.remote_address, conn.remote_port): + connections[OUTBOUND_EXIT].append(conn) + exit_connections.setdefault(conn.remote_port, []).append(conn) + else: + connections[OUTBOUND_UNKNOWN].append(conn) + + print(DIV) + print(COLUMN % ('Type', 'IPv4', 'IPv6')) + print(DIV) + + total_ipv4, total_ipv6 = 0, 0 + + for label, connections in connections.items(): + if len(connections) == 0: + continue + + ipv4_count = len([conn for conn in connections if is_valid_ipv4_address(conn.remote_address)]) + ipv6_count = len(connections) - ipv4_count + + total_ipv4, total_ipv6 = total_ipv4 + ipv4_count, total_ipv6 + ipv6_count + print(COLUMN % (label, ipv4_count, ipv6_count)) + + print(DIV) + print(COLUMN % ('Total', total_ipv4, total_ipv6)) + print(DIV) + print('') + + if exit_connections: + print(DIV) + print(COLUMN % ('Exit Port', 'IPv4', 'IPv6')) + print(DIV) + + total_ipv4, total_ipv6 = 0, 0 + + for port in sorted(exit_connections): + ipv4_count = len([conn for conn in connections if is_valid_ipv4_address(conn.remote_address)]) + ipv6_count = len(exit_connections) - ipv4_count + total_ipv4, total_ipv6 = total_ipv4 + ipv4_count, total_ipv6 + ipv6_count + + usage = port_usage(port) + label = '%s (%s)' % (port, usage) if usage else port + + print(COLUMN % (label, ipv4_count, ipv6_count)) + + print(DIV) + print(COLUMN % ('Total', total_ipv4, total_ipv6)) + print(DIV) + print('') + + +if __name__ == '__main__': + main() diff --git a/docs/change_log.rst b/docs/change_log.rst index 13597155..3985dfcb 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -49,6 +49,12 @@ The following are only available within Stem's `git repository * Added support for limiting the maximum number of streams to :func:`~stem.control.Controller.create_ephemeral_hidden_service` (:spec:`2fcb1c2`) * Stacktrace if :func:`stem.connection.connect` had a string port argument + * **Website** + + * Added `terminal styling <tutorials/east_of_the_sun.html#terminal-styling>`_ to our utilities tutorial + * Added `multiprocessing <tutorials/east_of_the_sun.html#multiprocessing>`_ to our utilities tutorial + * Added a `relay connection summary example <tutorials/examples/relay_connections.html>`_ + .. _version_1.6: Version 1.6 (November 5th, 2017) diff --git a/docs/contents.rst b/docs/contents.rst index 5cbd5bf2..c9c38ebf 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -17,6 +17,7 @@ Contents tutorials/examples/compare_flags tutorials/examples/exit_used tutorials/examples/list_circuits + tutorials/examples/relay_connections tutorials/examples/outdated_relays tutorials/examples/persisting_a_consensus tutorials/examples/votes_by_bandwidth_authorities diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 111952c6..48d665aa 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -99,6 +99,14 @@ Client Usage Tells you the exit used for each Tor connection. +Relays +------ + +* `Connection Summary <examples/relay_connections.html>`_ + + Provides a summary of your inbound and outbound connections and exiting + usage. + Descriptors ----------- diff --git a/docs/tutorials/examples/relay_connections.rst b/docs/tutorials/examples/relay_connections.rst new file mode 100644 index 00000000..c389f9aa --- /dev/null +++ b/docs/tutorials/examples/relay_connections.rst @@ -0,0 +1,48 @@ +Connection Summary +================== + +.. image:: /_static/buttons/back.png + :target: ../double_double_toil_and_trouble.html + +The following provides a summary of your relay's inbound and outbound +connections. Couple important notes... + + * To use this you must set **DisableDebuggerAttachment 0** in your torrc. + Otherwise connection information will be unavailable. + + * **Be careful about the data you look at.** Inspection of client and exit + traffic especially is wiretapping and not only unethical but likely + illegal. + + That said, a general overview like this should be fine. + +.. literalinclude:: /_static/example/relay_connections.py + :language: python + +:: + + % relay_connections.py --ctrlport 29051 + + 0.3.2.0-alpha-dev uptime: 01:20:44 flags: none + + +------------------------------+------+------+ + | Type | IPv4 | IPv6 | + +------------------------------+------+------+ + | Inbound to our ORPort | 2400 | 3 | + | Inbound to our DirPort | 12 | 0 | + | Inbound to our ControlPort | 2 | 0 | + | Outbound to a relay | 324 | 0 | + | Outbound exit traffic | 3 | 0 | + +------------------------------+------+------+ + | Total | 2741 | 3 | + +------------------------------+------+------+ + + +------------------------------+------+------+ + | Exit Port | IPv4 | IPv6 | + +------------------------------+------+------+ + | 443 (HTTPS) | 1 | 0 | + | 8443 (PCsync HTTPS) | 1 | 0 | + | 54682 | 1 | 0 | + +------------------------------+------+------+ + | Total | 3 | 0 | + +------------------------------+------+------+

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit 9636537ce92eba41e4206dc3357495ebba9f729a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 19:47:47 2017 +0000 Update translations for torbutton-torbuttondtd --- sv/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd index 79368236a..adebeee3c 100644 --- a/sv/torbutton.dtd +++ b/sv/torbutton.dtd @@ -35,13 +35,13 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "Säkerhetsreglaget låter dig stänga av vissa webbläsarfunktioner som kan göra din webbläsare mer sårbar mot intrångsförsök."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> <!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> +<!ENTITY torbutton.prefs.sec_safer_label "Säkrare"> <!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> <!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> +<!ENTITY torbutton.prefs.sec_safest_label "Säkrast"> <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Läs mer"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2017