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

[tor-launcher/master] Bug #11699: Change & #160 to   in network-settings.dtd
by brade＠torproject.org 10 Jun '14

10 Jun '14

commit e9445a7eb437115e8956e4c95dd805aab8238c56 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 10 13:33:58 2014 -0400 Bug #11699: Change &#160 to   in network-settings.dtd Remove 'si' locale files (locale has been removed from Transifex). --- src/chrome/locale/si/network-settings.dtd | 64 --------------------------- src/chrome/locale/si/progress.dtd | 4 -- src/chrome/locale/si/torlauncher.properties | 57 ------------------------ 3 files changed, 125 deletions(-) diff --git a/src/chrome/locale/si/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/si/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!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, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "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 a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/si/progress.dtd b/src/chrome/locale/si/progress.dtd deleted file mode 100644 index ebd9cef..0000000 --- a/src/chrome/locale/si/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/si/torlauncher.properties b/src/chrome/locale/si/torlauncher.properties deleted file mode 100644 index a2550db..0000000 --- a/src/chrome/locale/si/torlauncher.properties +++ /dev/null @@ -1,57 +0,0 @@ -### Copyright (c) 2014, The Tor Project, Inc. -### See LICENSE for licensing information. - -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error

1 0

r26824: {website} get rid of the numcpus faq entry, since tor guesses it now b (website/trunk/docs/en)
by Roger Dingledine 10 Jun '14

10 Jun '14

Author: arma Date: 2014-06-10 16:25:19 +0000 (Tue, 10 Jun 2014) New Revision: 26824 Modified: website/trunk/docs/en/faq.wml Log: get rid of the numcpus faq entry, since tor guesses it now by default Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-06-10 16:12:20 UTC (rev 26823) +++ website/trunk/docs/en/faq.wml 2014-06-10 16:25:19 UTC (rev 26824) @@ -155,8 +155,6 @@ <li><a href="#IDontHaveAStaticIP">I don't have a static IP.</a></li> <li><a href="#PortscannedMore">Why do I get portscanned more often when I run a Tor relay?</a></li> - <li><a href="#MoreThanOneCPU">I have more than one CPU. Does this - help?</a></li> <li><a href="#HighCapacityConnection">How can I get Tor to fully make use of my high capacity connection?</a></li> <li><a href="#RelayFlexible">How stable does my relay need to @@ -2253,22 +2251,6 @@ <hr> - <a id="MoreThanOneCPU"></a> - <h3><a class="anchor" href="#MoreThanOneCPU">I have more than one CPU. - Does this help?</a></h3> - - <p> - Yes. You can set your NumCpus config option in torrc to the number of - CPUs you have, and Tor will spawn this many cpuworkers to deal with - public key operations in parallel. - </p> - - <p> - This option has no effect for clients. - </p> - - <hr> - <a id="HighCapacityConnection"></a> <h3><a class="anchor" href="#HighCapacityConnection">How can I get Tor to fully make use of my high capacity connection?</a></h3>

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit df35817c85c1397b4cd682187c3ec126d476969d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 16:15:24 2014 +0000 Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 16ed3fc..db82bfc 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-06-10 15:11+0000\n" +"PO-Revision-Date: 2014-06-10 15:47+0000\n" "Last-Translator: 辛海林 <hailin_xin(a)163.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit 97bf44bac5bd73c3058ad5c7f8c45fd525e30cb6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 16:15:21 2014 +0000 Update translations for tails-greeter --- zh_CN/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 16ed3fc..db82bfc 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-06-10 15:11+0000\n" +"PO-Revision-Date: 2014-06-10 15:47+0000\n" "Last-Translator: 辛海林 <hailin_xin(a)163.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

r26823: {website} raise the example bandwidths, and fix a now-broken link (website/trunk/docs/en)
by Roger Dingledine 10 Jun '14

10 Jun '14

Author: arma Date: 2014-06-10 16:12:20 +0000 (Tue, 10 Jun 2014) New Revision: 26823 Modified: website/trunk/docs/en/faq.wml Log: raise the example bandwidths, and fix a now-broken link Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-06-10 14:03:37 UTC (rev 26822) +++ website/trunk/docs/en/faq.wml 2014-06-10 16:12:20 UTC (rev 26823) @@ -2187,7 +2187,7 @@ run a relay?</a></h3> <p> We're looking for people with reasonably reliable Internet connections, - that have at least 20 kilobytes/second each way. If that's you, please + that have at least 100 kilobytes/second each way. If that's you, please consider <a href="https://www.torproject.org/docs/tor-relay-debian">helping out</a>. </p> @@ -2342,10 +2342,10 @@ <ul> <li> BandwidthRate is the maximum long-term bandwidth allowed (bytes per - second). For example, you might want to choose "BandwidthRate 2 MB" - for 2 megabytes per second (a fast connection), or "BandwidthRate 50 - KB" for 50 kilobytes per second (a medium-speed cable connection). - The minimum BandwidthRate is 20 kilobytes per second. + second). For example, you might want to choose "BandwidthRate 10 MBytes" + for 10 megabytes per second (a fast connection), or "BandwidthRate 500 + KBytes" for 500 kilobytes per second (a pretty good cable connection). + The minimum BandwidthRate setting is 20 kilobytes per second. </li> <li> BandwidthBurst is a pool of bytes used to fulfill requests during @@ -2353,9 +2353,9 @@ average over a long period to BandwidthRate. A low Rate but a high Burst enforces a long-term average while still allowing more traffic during peak times if the average hasn't been reached lately. For example, - if you choose "BandwidthBurst 50 KB" and also use that for your - BandwidthRate, then you will never use more than 50 kilobytes per second; - but if you choose a higher BandwidthBurst (like 1 MB), it will allow + if you choose "BandwidthBurst 500 KBytes" and also use that for your + BandwidthRate, then you will never use more than 500 kilobytes per second; + but if you choose a higher BandwidthBurst (like 5 MBytes), it will allow more bytes through until the pool is empty. </li> </ul> @@ -2371,7 +2371,7 @@ Linux-based Tor nodes have another option at their disposal: they can prioritize Tor traffic below other traffic on their machine, so that their own personal traffic is not impacted by Tor load. A <a - href="https://gitweb.torproject.org/tor.git/blob/HEAD:/contrib/linux-tor-prio.sh">script + href="https://gitweb.torproject.org/tor.git/blob/HEAD:/contrib/operator-tools/lin…">script to do this</a> can be found in the Tor source distribution's contrib directory. </p> @@ -2382,7 +2382,7 @@ href="#LimitTotalBandwidth">hibernation entry</a> below. </p> <p> - Note that BandwidthRate and BandwidthBurst are in <b>Bytes,</b>not Bits. + Note that BandwidthRate and BandwidthBurst are in <b>Bytes</b>, not Bits. </p> <hr> @@ -2433,12 +2433,18 @@ end up using your entire monthly quota in the first day. Just divide your monthly amount by 30. You might also consider rate limiting to spread your usefulness over more of the day: if you want to offer X GB - in each direction, you could set your BandwidthRate to 20*X KBytes. + in each direction, you could set your RelayBandwidthRate to 20*X KBytes. For example, - if you have 50 GB to offer each way, you might set your BandwidthRate to + if you have 50 GB to offer each way, you might set your RelayBandwidthRate to 1000 KBytes: this way your relay will always be useful for at least half of each day. </p> + <pre> + AccountingStart day 0:00 + AccountingMax 50 GBytes + RelayBandwidthRate 1000 KBytes + RelayBandwidthBurst 5000 KBytes # allow higher bursts but maintain average + </pre> <hr>

1 0

[metrics-db/master] Fix typo spotted by arma.
by karsten＠torproject.org 10 Jun '14

10 Jun '14

commit e4aa811ec31c55e3a5ebd1e4935471df9bf593f1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 10 18:09:26 2014 +0200 Fix typo spotted by arma. --- web/formats.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/formats.html b/web/formats.html index 9499235..92427c5 100644 --- a/web/formats.html +++ b/web/formats.html @@ -315,7 +315,7 @@ file to reduce the number of files. There was supposed to be a newer version of this document that indicates added <tt>ntor-onion-key</tt> lines, but due to a mistake only the version number of sanitized bridge extra-info descriptors was raised. -As a result, there may be sanitzed bridge server descriptors with and +As a result, there may be sanitized bridge server descriptors with and without those lines. </p>

1 0

[metrics-db/master] Clarify ntor-onion-key lines and @type versions.
by karsten＠torproject.org 10 Jun '14

10 Jun '14

commit 4f1711dca9aa119e7220f33b25f1ed3efa57003d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 10 17:41:30 2014 +0200 Clarify ntor-onion-key lines and @type versions. In b65f0a1, we included ntor-onion-key lines in sanitized bridge server descriptors but raised the @type version number of sanitized bridge extra-infos. Too late to fix that, but let's document this. Spotted by Isis. --- web/formats.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/web/formats.html b/web/formats.html index 68fddee..9499235 100644 --- a/web/formats.html +++ b/web/formats.html @@ -311,6 +311,14 @@ contain all descriptors collected in an hour concatenated into a single file to reduce the number of files. </p> +<p> +There was supposed to be a newer version of this document that indicates +added <tt>ntor-onion-key</tt> lines, but due to a mistake only the version +number of sanitized bridge extra-info descriptors was raised. +As a result, there may be sanitzed bridge server descriptors with and +without those lines. +</p> + <h3>Extra-info descriptors (<a href="archive/bridge-descriptors/">archive</a>, <a href="recent/bridge-descriptors/extra-infos/">recent</a>) @@ -318,7 +326,7 @@ file to reduce the number of files. </h3> <p> -Bridge server descriptors follow the same format as relay server +Bridge extra-info descriptors follow the same format as relay extra-info descriptors, except for the sanitizing steps described above. The format has changed over time to accomodate changes to the sanitizing process, with earlier versions being: @@ -329,8 +337,10 @@ process, with earlier versions being: version.</font></li> <li><font color="#666"><tt>@type bridge-extra-info 1.1</tt> added sanitized <tt>transport</tt> lines</font>.</li> -<li><tt>@type bridge-extra-info 1.2</tt> added <tt>ntor-onion-key</tt> -lines.</li> +<li><tt>@type bridge-extra-info 1.2</tt> was supposed to indicate added +<tt>ntor-onion-key</tt> lines, but those changes only affect bridge server +descriptors, not extra-info descriptors. +So, nothing has changed as compared to version 1.1.</li> </ul> <p>

1 0

[tor/master] Avoid illegal read off end of an array in prune_v2_cipher_list
by nickm＠torproject.org 10 Jun '14

10 Jun '14

commit cca6198c777dba463aeb4a8fba6a953cde9576a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 11:11:47 2014 -0400 Avoid illegal read off end of an array in prune_v2_cipher_list This function is supposed to construct a list of all the ciphers in the "v2 link protocol cipher list" that are supported by Tor's openssl. It does this by invoking ssl23_get_cipher_by_char on each two-byte ciphersuite ID to see which ones give a match. But when ssl23_get_cipher_by_char cannot find a match for a two-byte SSL3/TLS ciphersuite ID, it checks to see whether it has a match for a three-byte SSL2 ciphersuite ID. This was causing a read off the end of the 'cipherid' array. This was probably harmless in practice, but we shouldn't be having any uninitialized reads. (Using ssl23_get_cipher_by_char in this way is a kludge, but then again the entire existence of the v2 link protocol is kind of a kludge. Once Tor 0.2.2 clients are all gone, we can drop this code entirely.) Found by starlight. Fix on 0.2.4.8-alpha. Fixes bug 12227. --- changes/bug12227 | 5 +++++ src/common/tortls.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug12227 b/changes/bug12227 new file mode 100644 index 0000000..d8b5d08 --- /dev/null +++ b/changes/bug12227 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid an illegal read from stack when initializing the TLS + module using a version of OpenSSL without all of the ciphers + used by the v2 link handshake. Fixes bug 12227; bugfix on + 0.2.4.8-alpha. Found by "starlight". diff --git a/src/common/tortls.c b/src/common/tortls.c index 8f3f6a7..c13b12f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1489,10 +1489,13 @@ prune_v2_cipher_list(void) inp = outp = v2_cipher_list; while (*inp) { - unsigned char cipherid[2]; + unsigned char cipherid[3]; const SSL_CIPHER *cipher; /* Is there no better way to do this? */ set_uint16(cipherid, htons(*inp)); + cipherid[2] = 0; /* If ssl23_get_cipher_by_char finds no cipher starting + * with a two-byte 'cipherid', it may look for a v2 + * cipher with the appropriate 3 bytes. */ cipher = m->get_cipher_by_char(cipherid); if (cipher) { tor_assert((cipher->id & 0xffff) == *inp);

1 0

[tor/master] Merge remote-tracking branch 'public/bug12227_024'
by nickm＠torproject.org 10 Jun '14

10 Jun '14

commit 55c7a559df5f349de21ca37ecfe19b736085c317 Merge: 307aa7e cca6198 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 11:17:39 2014 -0400 Merge remote-tracking branch 'public/bug12227_024' changes/bug12227 | 5 +++++ src/common/tortls.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit ce5bd995a04f84fbd959d017c38457d8b995f0de Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 15:15:26 2014 +0000 Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 2f9938e..16ed3fc 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -4,21 +4,22 @@ # # Translators: # ihints <ihints(a)gmail.com>, 2014 -# simabull tsai, 2013 -# simabull tsai, 2013 +# Wu Ming Shi, 2013 +# Wu Ming Shi, 2013 # ln191810 <ln191810(a)gmail.com>, 2012 # ln191810 <ln191810(a)gmail.com>, 2012 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 # baoliandeng <nkzhangjg(a)gmail.com>, 2014 -# Y.F Yang <yfdyh000(a)gmail.com>, 2014 +# YF <yfdyh000(a)gmail.com>, 2014 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 +# 辛海林 <hailin_xin(a)163.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-14 13:14+0200\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: ihints <ihints(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-28 22:33+0200\n" +"PO-Revision-Date: 2014-06-10 15:11+0000\n" +"Last-Translator: 辛海林 <hailin_xin(a)163.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,13 +111,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\"> #: ../glade/optionswindow.glade.h:12 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "此选项使 Tails 看起来更象是 Microsoft Windows XP。为了避免在公共场所引起怀疑，这是十分有用的。" +msgstr "这个选项使得Tails看起来更像Microsoft Windows 8. 这在公共场所会有用以免引起怀疑。" #: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "激活 Microsoft Windows XP 伪装" +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "激活Microsoft Windows 8伪装。" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing"

1 0