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

[tor/master] get rid of already-merged bug12227 changes file
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 472696e8e517609d34db4818af7bb4ff6f68a158 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 19:49:01 2014 -0400 get rid of already-merged bug12227 changes file --- changes/bug12227 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changes/bug12227 b/changes/bug12227 deleted file mode 100644 index d8b5d08..0000000 --- a/changes/bug12227 +++ /dev/null @@ -1,5 +0,0 @@ - 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".

1 0

[tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 1ed77ff724444dec9bd2493d7d28fdd21869bcff Merge: a3d8ffe 1b55182 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 19:48:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug12227 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/maint-0.2.5] get rid of already-merged bug12227 changes file
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 472696e8e517609d34db4818af7bb4ff6f68a158 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 19:49:01 2014 -0400 get rid of already-merged bug12227 changes file --- changes/bug12227 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changes/bug12227 b/changes/bug12227 deleted file mode 100644 index d8b5d08..0000000 --- a/changes/bug12227 +++ /dev/null @@ -1,5 +0,0 @@ - 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".

1 0

[tor/maint-0.2.5] Avoid illegal read off end of an array in prune_v2_cipher_list
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 1b551823de6e6c03cf86bcbb7ca1b687c5f16ea6 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/maint-0.2.4] Avoid illegal read off end of an array in prune_v2_cipher_list
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 1b551823de6e6c03cf86bcbb7ca1b687c5f16ea6 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/maint-0.2.5] fix typo that crept in to 0.2.4.4-alpha
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit a3d8ffe010d860b65b697767b867c3c37f186e36 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 17:07:39 2014 -0400 fix typo that crept in to 0.2.4.4-alpha --- src/or/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/channel.c b/src/or/channel.c index 964b3fc..3072eff 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3352,7 +3352,7 @@ channel_dump_statistics(channel_t *chan, int severity) U64_PRINTF_ARG(chan->timestamp_recv), U64_PRINTF_ARG(now - chan->timestamp_recv)); tor_log(severity, LD_GENERAL, - " * Channel " U64_FORMAT " last trasmitted a cell " + " * Channel " U64_FORMAT " last transmitted a cell " "at " U64_FORMAT " (" U64_FORMAT " seconds ago)", U64_PRINTF_ARG(chan->global_identifier), U64_PRINTF_ARG(chan->timestamp_xmit),

1 0

[tor/release-0.2.5] fold in changes for 0.2.5.6-alpha so far
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 2be259fabf0849c5ef16261bf98321021318e88f Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 17:05:53 2014 -0400 fold in changes for 0.2.5.6-alpha so far --- ChangeLog | 52 +++++++++++++++++++++++++++++++++++++- changes/bufferevent_compilation | 6 ----- changes/bug12602 | 5 ---- changes/bug8387 | 11 -------- changes/curve25519-donna32-bug | 12 --------- changes/further-12184-diagnostic | 2 -- changes/geoip-july2014 | 3 --- changes/geoip6-july2014 | 2 -- changes/ticket12688 | 6 ----- changes/ticket12690 | 9 ------- 10 files changed, 51 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5450f6a..b3787b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,54 @@ -Changes in version 0.2.5.6-?? - 2014-0?-?? +Changes in version 0.2.5.6-alpha - 2014-07-2? + Tor 0.2.5.6-alpha fixes [...] + + o Major features (also in 0.2.4.23): + - Make the number of entry guards configurable via a new + NumEntryGuards consensus parameter, and the number of directory + guards configurable via a new NumDirectoryGuards consensus + parameter. Implements ticket 12688. + + o Major bugfixes (also in 0.2.4.23): + - Fix a bug in the bounds-checking in the 32-bit curve25519-donna + implementation that caused incorrect results on 32-bit + implementations when certain malformed inputs were used along with + a small class of private ntor keys. This bug does not currently + appear to allow an attacker to learn private keys or impersonate a + Tor server, but it could provide a means to distinguish 32-bit Tor + implementations from 64-bit Tor implementations. Fixes bug 12694; + bugfix on 0.2.4.8-alpha. Bug found by Robert Ransom; fix from + Adam Langley. + + o Major bugfixes: + - Perform circuit cleanup operations even when circuit + construction operations are disabled (because the network is + disabled, or because there isn't enough directory information). + Previously, when we were not building predictive circuits, we + were not closing expired circuits either. Fixes bug 8387; bugfix on + 0.1.1.11-alpha. This bug became visible in 0.2.4.10-alpha when we + became more strict about when we have "enough directory information + to build circuits". + + o Minor features: + - Authorities now assign the Guard flag to the fastest 25% of the + network (it used to be the fastest 50%). Also raise the consensus + weight that guarantees the Guard flag from 250 to 2000. For the + current network, this results in about 1100 guards, down from 2500. + This step paves the way for moving the number of entry guards + down to 1 (proposal 236) while still providing reasonable expected + performance for most users. Implements ticket 12690. + - Update geoip and geoip6 to the July 10 2014 Maxmind GeoLite2 + Country database. + - Slightly enhance the diagnostic message for bug 12184. + + o Minor bugfixes: + - Fix compilation when building with bufferevents enabled. (This + configuration is still not expected to work, however.) + Fixes bugs 12438, 12474, 11578; bugfixes on 0.2.5.1-alpha and + 0.2.5.3-alpha. Patches from Anthony G. Basile and Sathyanarayanan + Gunasekaran. + - Compile correctly with builds and forks of OpenSSL (such as + LibreSSL) that disable compression. Fixes bug 12602; bugfix on + 0.2.1.1-alpha. Patch from "dhill". Changes in version 0.2.5.5-alpha - 2014-06-18 diff --git a/changes/bufferevent_compilation b/changes/bufferevent_compilation deleted file mode 100644 index 3a32873..0000000 --- a/changes/bufferevent_compilation +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Fix compilation when building with bufferevents enabled. (This - configuration is still not expected to work, however.) - Fixes bugs 12438, 12474, 11578; bugfixes on 0.2.5.1-alpha and - 0.2.5.3-alpha. Patches from Anthony G. Basile and Sathyanarayanan - Gunasekaran. diff --git a/changes/bug12602 b/changes/bug12602 deleted file mode 100644 index 29fa49a..0000000 --- a/changes/bug12602 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (portability): - - Compile correctly with builds and forks of OpenSSL (such as - LibreSSL) that disable compression. Fixes bug 12602; bugfix on - 0.2.1.1-alpha. Patch from "dhill". - diff --git a/changes/bug8387 b/changes/bug8387 deleted file mode 100644 index 2ec0487..0000000 --- a/changes/bug8387 +++ /dev/null @@ -1,11 +0,0 @@ - o Major bugfixes (client): - - - Perform circuit cleanup operations even when circuit - construction operations are disabled (because the network is - disabled, or because there isn't enough directory information). - Previously, when we were not building predictive circuits, we - were not closing expired circuits either. - - Fixes bug 8387; bugfix on 0.1.1.11-alpha. This bug became visible - in 0.2.4.10-alpha when we became more strict about when we have - "enough directory information to build circuits". diff --git a/changes/curve25519-donna32-bug b/changes/curve25519-donna32-bug deleted file mode 100644 index 7fccab1..0000000 --- a/changes/curve25519-donna32-bug +++ /dev/null @@ -1,12 +0,0 @@ - o Major bugfixes: - - - Fix a bug in the bounds-checking in the 32-bit curve25519-donna - implementation that caused incorrect results on 32-bit - implementations when certain malformed inputs were used along with - a small class of private ntor keys. This bug does not currently - appear to allow an attacker to learn private keys or impersonate a - Tor server, but it could provide a means to distinguish 32-bit Tor - implementations from 64-bit Tor implementations. Fixes bug 12694; - bugfix on 0.2.4.8-alpha. Bug found by Robert Ransom; fix from - Adam Langley. - diff --git a/changes/further-12184-diagnostic b/changes/further-12184-diagnostic deleted file mode 100644 index 89e9f46..0000000 --- a/changes/further-12184-diagnostic +++ /dev/null @@ -1,2 +0,0 @@ - o Minor features (diagnostic): - - Slightly enhance the diagnostic message for bug 12184. diff --git a/changes/geoip-july2014 b/changes/geoip-july2014 deleted file mode 100644 index a0523ec..0000000 --- a/changes/geoip-july2014 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-july2014 b/changes/geoip6-july2014 deleted file mode 100644 index 155788e..0000000 --- a/changes/geoip6-july2014 +++ /dev/null @@ -1,2 +0,0 @@ - o Minor features: - - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database. diff --git a/changes/ticket12688 b/changes/ticket12688 deleted file mode 100644 index 88228e5..0000000 --- a/changes/ticket12688 +++ /dev/null @@ -1,6 +0,0 @@ - Major features: - - Make the number of entry guards configurable via a new - NumEntryGuards consensus parameter, and the number of directory - guards configurable via a new NumDirectoryGuards consensus - parameter. Implements ticket 12688. - diff --git a/changes/ticket12690 b/changes/ticket12690 deleted file mode 100644 index 5091883..0000000 --- a/changes/ticket12690 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor features: - - Authorities now assign the Guard flag to the fastest 25% of the - network (it used to be the fastest 50%). Also raise the consensus - weight that guarantees the Guard flag from 250 to 2000. For the - current network, this results in about 1100 guards, down from 2500. - This step paves the way for moving the number of entry guards - down to 1 (proposal 236) while still providing reasonable expected - performance for most users. Implements ticket 12690. -

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 24 Jul '14

24 Jul '14

commit b10d48f5004e234c3bffb536cf1826171c020940 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 24 20:45:49 2014 +0000 Update translations for tails-misc_completed --- de.po | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/de.po b/de.po index 55e3194..3dd894f 100644 --- a/de.po +++ b/de.po @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# redplanet, 2014 +# Andreas Demmelbauer, 2014 # trantor <clucko3(a)gmail.com>, 2014 -# ivl1705 <listmember(a)rinnberger.de>, 2013 -# skps <lmaerz(a)emailn.de>, 2013 -# MarioBaier26 <mario.baier26(a)gmx.de>, 2013 -# malexmave <max(a)velcommuta.de>, 2014 -# to_ba, 2014 -# rike <u(a)451f.org>, 2014 +# gerhard <listmember(a)rinnberger.de>, 2013 +# Larson März <lmaerz(a)emailn.de>, 2013 +# Mario Baier <mario.baier26(a)gmx.de>, 2013 +# malexmave <inactive+malexmave(a)transifex.com>, 2014 +# sycamoreone <sycamoreone(a)riseup.net>, 2014 +# Tobias Bannert, 2014 +# rike, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 21:01+0000\n" -"Last-Translator: trantor <clucko3(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-21 01:59+0200\n" +"PO-Revision-Date: 2014-07-24 20:41+0000\n" +"Last-Translator: sycamoreone <sycamoreone(a)riseup.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -295,7 +296,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "Es scheint so, als wären Sie vom Netzwerk blockiert. Das könnte an der MAC-Manipulationsfunktion liegen. Für weitere Informationen, bitte die <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">Dokumentation zur MAC-Manipulation</a> ansehen." +msgstr "Es scheint so, als wären Sie vom Netzwerk blockiert. Das könnte an der MAC-Manipulationsfunktion liegen. Für weitere Informationen, bitte die <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.de.html#blocked\\\">Dokumentation zur MAC-Manipulation</a> ansehen." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -311,7 +312,7 @@ msgstr "Netzwerkkarte ${nic} deaktiviert" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "Bei folgender Netzwerkkarte schlug die MAC-Manipulation fehl: ${nic_name} (${nic}). Deshalb ist es jetzt temporär deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>Dokumentation</a> ansehen." +msgstr "Bei folgender Netzwerkkarte schlug die MAC-Manipulation fehl: ${nic_name} (${nic}). Deshalb ist es jetzt temporär deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.de.html'>Dokumentation</a> ansehen." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" @@ -322,7 +323,7 @@ msgstr "Alle Netzwerke deaktiviert" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC-Manipulation schlug bei folgender Netzwerkkarte fehl: ${nic_name} (${nic}). Die Fehlerbehebung schlug ebenfalls fehl. Deshalb sind jetzt alle Verbindungen deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>Dokumentation</a> ansehen." +msgstr "MAC-Manipulation schlug bei folgender Netzwerkkarte fehl: ${nic_name} (${nic}). Die Fehlerbehebung schlug ebenfalls fehl. Deshalb sind jetzt alle Verbindungen deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.de.html'>Dokumentation</a> ansehen." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -420,32 +421,32 @@ msgstr "Dies könnte eine Weile dauern, bitte haben Sie etwas Geduld." msgid "Failed to setup chroot." msgstr "Konnte chroot nicht einrichten." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsicherer Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "Unsicherer Browser wird beendet …" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Dies könnte eine weile dauern und bevor der unsichere Browser geschlossen ist, können Sie ihn nicht noch einmal starten." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "Tor konnte nicht neu gestartet werden." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Ein anderer unsicherer Browser ist derzeit offen oder wird gerade beendet. Bitte probieren Sie es später noch einmal." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 24 Jul '14

24 Jul '14

commit 2ebeee4ef415882df619315de9684704cdc4483d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 24 20:45:46 2014 +0000 Update translations for tails-misc --- de.po | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/de.po b/de.po index 55e3194..3dd894f 100644 --- a/de.po +++ b/de.po @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# redplanet, 2014 +# Andreas Demmelbauer, 2014 # trantor <clucko3(a)gmail.com>, 2014 -# ivl1705 <listmember(a)rinnberger.de>, 2013 -# skps <lmaerz(a)emailn.de>, 2013 -# MarioBaier26 <mario.baier26(a)gmx.de>, 2013 -# malexmave <max(a)velcommuta.de>, 2014 -# to_ba, 2014 -# rike <u(a)451f.org>, 2014 +# gerhard <listmember(a)rinnberger.de>, 2013 +# Larson März <lmaerz(a)emailn.de>, 2013 +# Mario Baier <mario.baier26(a)gmx.de>, 2013 +# malexmave <inactive+malexmave(a)transifex.com>, 2014 +# sycamoreone <sycamoreone(a)riseup.net>, 2014 +# Tobias Bannert, 2014 +# rike, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 21:01+0000\n" -"Last-Translator: trantor <clucko3(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-21 01:59+0200\n" +"PO-Revision-Date: 2014-07-24 20:41+0000\n" +"Last-Translator: sycamoreone <sycamoreone(a)riseup.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -295,7 +296,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "Es scheint so, als wären Sie vom Netzwerk blockiert. Das könnte an der MAC-Manipulationsfunktion liegen. Für weitere Informationen, bitte die <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">Dokumentation zur MAC-Manipulation</a> ansehen." +msgstr "Es scheint so, als wären Sie vom Netzwerk blockiert. Das könnte an der MAC-Manipulationsfunktion liegen. Für weitere Informationen, bitte die <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.de.html#blocked\\\">Dokumentation zur MAC-Manipulation</a> ansehen." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -311,7 +312,7 @@ msgstr "Netzwerkkarte ${nic} deaktiviert" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "Bei folgender Netzwerkkarte schlug die MAC-Manipulation fehl: ${nic_name} (${nic}). Deshalb ist es jetzt temporär deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>Dokumentation</a> ansehen." +msgstr "Bei folgender Netzwerkkarte schlug die MAC-Manipulation fehl: ${nic_name} (${nic}). Deshalb ist es jetzt temporär deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.de.html'>Dokumentation</a> ansehen." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" @@ -322,7 +323,7 @@ msgstr "Alle Netzwerke deaktiviert" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC-Manipulation schlug bei folgender Netzwerkkarte fehl: ${nic_name} (${nic}). Die Fehlerbehebung schlug ebenfalls fehl. Deshalb sind jetzt alle Verbindungen deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>Dokumentation</a> ansehen." +msgstr "MAC-Manipulation schlug bei folgender Netzwerkkarte fehl: ${nic_name} (${nic}). Die Fehlerbehebung schlug ebenfalls fehl. Deshalb sind jetzt alle Verbindungen deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.de.html'>Dokumentation</a> ansehen." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -420,32 +421,32 @@ msgstr "Dies könnte eine Weile dauern, bitte haben Sie etwas Geduld." msgid "Failed to setup chroot." msgstr "Konnte chroot nicht einrichten." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsicherer Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "Unsicherer Browser wird beendet …" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Dies könnte eine weile dauern und bevor der unsichere Browser geschlossen ist, können Sie ihn nicht noch einmal starten." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "Tor konnte nicht neu gestartet werden." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Ein anderer unsicherer Browser ist derzeit offen oder wird gerade beendet. Bitte probieren Sie es später noch einmal." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

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

24 Jul '14

commit 112c0a1e0cc2dc371d441eef2e769f31b3272141 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 24 20:45:32 2014 +0000 Update translations for tails-greeter_completed --- de/de.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/de/de.po b/de/de.po index 2932f86..0008f81 100644 --- a/de/de.po +++ b/de/de.po @@ -10,6 +10,7 @@ # Oliver Baumann <baumanno(a)cip.ifi.lmu.de>, 2013 # Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 +# sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert, 2013 # Tobias Bannert, 2014 # tom_fate <tomoffate(a)gmail.com>, 2014 @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:07+0200\n" -"PO-Revision-Date: 2014-07-02 14:21+0000\n" -"Last-Translator: Tobias Bannert\n" +"POT-Creation-Date: 2014-07-20 18:36+0200\n" +"PO-Revision-Date: 2014-07-24 20:20+0000\n" +"Last-Translator: sycamoreone <sycamoreone(a)riseup.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +49,7 @@ msgstr "Persistenz benutzen?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.de.html\">Dokumentation</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -82,7 +83,7 @@ msgstr "Administrationspasswort" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.de.html\">Dokumentation</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -110,7 +111,7 @@ msgstr "Windows-Tarnmodus" msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.de.html\">Dokumentation</a>" #: ../glade/optionswindow.glade.h:12 msgid ""

1 0