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

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit fe616922026488185ecf3d3ee1e191e7a33c22c7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 24 20:45:26 2014 +0000 Update translations for tails-persistence-setup_completed --- de/de.po | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/de/de.po b/de/de.po index 63196be..1549163 100644 --- a/de/de.po +++ b/de/de.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# ivl1705 <listmember(a)rinnberger.de>, 2013 -# MarioBaier26 <mario.baier26(a)gmx.de>, 2013 +# gerhard <listmember(a)rinnberger.de>, 2013 +# Mario Baier <mario.baier26(a)gmx.de>, 2013 # mo <moritz(a)torservers.net>, 2013 -# Cooligan <ppt23(a)lkj.hopto.org>, 2012 +# Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 -# to_ba, 2014 +# sycamoreone <sycamoreone(a)riseup.net>, 2014 +# Tobias Bannert, 2014 # LH458 <wagnerbastian1(a)t-online.de>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-23 13:10+0000\n" -"Last-Translator: to_ba\n" +"POT-Creation-Date: 2014-07-01 22:15+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" @@ -125,67 +126,67 @@ msgstr "Alle Dateien und Verzeichnisse, die sich im Verzeichnis mit den Punktdat msgid "Setup Tails persistent volume" msgstr "Tails permanenten Datenspeicher erstellen" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Fehler" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Gerät %s hat bereits einen permanenten Datenspeicher." -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Gerät %s hat nicht genug freien Speicher" -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "Gerät %s hat keinen permanenten Datenspeicher." -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Der permanente Datenspeicher kann nicht während der Benutzung gelöscht werden. Sie sollten Tails ohne permanenten Datenspeicher neu starten." -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "Permanente Datenspeicher ist nicht freigegeben." -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "Permanenter Datenspeicher ist nicht eingehangen." -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Permanenter Datenspeicher ist nicht lesbar. Berechtigungs- oder Besitzerprobleme?" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Permanenter Datenspeicher ist nicht beschreibbar. Vielleicht wurde es als nur-lesbar eingehangen?" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails wird vom Nicht-USB/Nicht-SDIO-Gerät %s ausgeführt." -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "Gerät %s ist optisch." -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Das Gerät %s wurde nicht mit dem Tails-Installationsprogramm erstellt." -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "Fehler" - -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "Permanentassistent - Abgeschlossen" -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -218,7 +219,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "Vorsicht! Der Einsatz des permanenten Datenspeichers hat Konsequenzen, die gut verstanden werden müssen. Tails kann Ihnen nicht helfen, wenn Sie es falsch benutzen! Schauen Sie sich die <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails-Dokumentation über Persistenz</a> an, um mehr zu erfahren." +msgstr "Vorsicht! Der Einsatz des permanenten Datenspeichers hat Konsequenzen, die gut verstanden werden müssen. Tails kann Ihnen nicht helfen, wenn Sie es falsch benutzen! Schauen Sie sich die <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.de.html'>Tails-Dokumentation über Persistenz</a> an, um mehr zu erfahren." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 21935205f3ef56e64e949724104a94166ceb7308 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 24 20:45:21 2014 +0000 Update translations for tails-persistence-setup --- de/de.po | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/de/de.po b/de/de.po index 63196be..1549163 100644 --- a/de/de.po +++ b/de/de.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# ivl1705 <listmember(a)rinnberger.de>, 2013 -# MarioBaier26 <mario.baier26(a)gmx.de>, 2013 +# gerhard <listmember(a)rinnberger.de>, 2013 +# Mario Baier <mario.baier26(a)gmx.de>, 2013 # mo <moritz(a)torservers.net>, 2013 -# Cooligan <ppt23(a)lkj.hopto.org>, 2012 +# Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 -# to_ba, 2014 +# sycamoreone <sycamoreone(a)riseup.net>, 2014 +# Tobias Bannert, 2014 # LH458 <wagnerbastian1(a)t-online.de>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-23 13:10+0000\n" -"Last-Translator: to_ba\n" +"POT-Creation-Date: 2014-07-01 22:15+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" @@ -125,67 +126,67 @@ msgstr "Alle Dateien und Verzeichnisse, die sich im Verzeichnis mit den Punktdat msgid "Setup Tails persistent volume" msgstr "Tails permanenten Datenspeicher erstellen" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Fehler" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Gerät %s hat bereits einen permanenten Datenspeicher." -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Gerät %s hat nicht genug freien Speicher" -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "Gerät %s hat keinen permanenten Datenspeicher." -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Der permanente Datenspeicher kann nicht während der Benutzung gelöscht werden. Sie sollten Tails ohne permanenten Datenspeicher neu starten." -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "Permanente Datenspeicher ist nicht freigegeben." -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "Permanenter Datenspeicher ist nicht eingehangen." -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Permanenter Datenspeicher ist nicht lesbar. Berechtigungs- oder Besitzerprobleme?" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Permanenter Datenspeicher ist nicht beschreibbar. Vielleicht wurde es als nur-lesbar eingehangen?" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails wird vom Nicht-USB/Nicht-SDIO-Gerät %s ausgeführt." -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "Gerät %s ist optisch." -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Das Gerät %s wurde nicht mit dem Tails-Installationsprogramm erstellt." -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "Fehler" - -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "Permanentassistent - Abgeschlossen" -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -218,7 +219,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "Vorsicht! Der Einsatz des permanenten Datenspeichers hat Konsequenzen, die gut verstanden werden müssen. Tails kann Ihnen nicht helfen, wenn Sie es falsch benutzen! Schauen Sie sich die <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails-Dokumentation über Persistenz</a> an, um mehr zu erfahren." +msgstr "Vorsicht! Der Einsatz des permanenten Datenspeichers hat Konsequenzen, die gut verstanden werden müssen. Tails kann Ihnen nicht helfen, wenn Sie es falsch benutzen! Schauen Sie sich die <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.de.html'>Tails-Dokumentation über Persistenz</a> an, um mehr zu erfahren." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:"

1 0

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

25 Jul '14

1 0

[tor/release-0.2.5] Use safe_str in channel_dumpstats: improve 12184 diagnostic
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 486bd4fae706a1493ee34c3b72d9097d835c6a09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 18 21:20:44 2014 +0200 Use safe_str in channel_dumpstats: improve 12184 diagnostic --- src/or/channel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 1cc7864..964b3fc 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -19,6 +19,7 @@ #include "circuitbuild.h" #include "circuitlist.h" #include "circuitstats.h" +#include "config.h" #include "connection_or.h" /* For var_cell_free() */ #include "circuitmux.h" #include "entrynodes.h" @@ -3277,9 +3278,9 @@ channel_dump_statistics(channel_t *chan, int severity) " is %s, and gives a canonical description of \"%s\" and an " "actual description of \"%s\"", U64_PRINTF_ARG(chan->global_identifier), - remote_addr_str, - channel_get_canonical_remote_descr(chan), - actual); + safe_str(remote_addr_str), + safe_str(channel_get_canonical_remote_descr(chan)), + safe_str(actual)); tor_free(remote_addr_str); tor_free(actual); } else {

1 0

[tor/release-0.2.5] Fix warning on building with bufferevents
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 3af2a5d00efd4e531fb823403b12ab0f6462f9a3 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jul 20 16:06:26 2014 -0700 Fix warning on building with bufferevents Fixes #11578 --- src/test/test_oom.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/test/test_oom.c b/src/test/test_oom.c index 32f4803..2726056 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -97,16 +97,25 @@ dummy_edge_conn_new(circuit_t *circ, int type, size_t in_bytes, size_t out_bytes) { edge_connection_t *conn; + generic_buffer_t *inbuf, *outbuf; if (type == CONN_TYPE_EXIT) conn = edge_connection_new(type, AF_INET); else conn = ENTRY_TO_EDGE_CONN(entry_connection_new(type, AF_INET)); +#ifdef USE_BUFFEREVENTS + inbuf = bufferevent_get_input(TO_CONN(conn)->bufev); + outbuf = bufferevent_get_output(TO_CONN(conn)->bufev); +#else + inbuf = TO_CONN(conn)->inbuf; + outbuf = TO_CONN(conn)->outbuf; +#endif + /* We add these bytes directly to the buffers, to avoid all the * edge connection read/write machinery. */ - add_bytes_to_buf(TO_CONN(conn)->inbuf, in_bytes); - add_bytes_to_buf(TO_CONN(conn)->outbuf, out_bytes); + add_bytes_to_buf(inbuf, in_bytes); + add_bytes_to_buf(outbuf, out_bytes); conn->on_circuit = circ; if (type == CONN_TYPE_EXIT) {

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit 75501dbe4a70914ec8f19689849d3539d87be271 Merge: 015f710 6345dfa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 21 14:29:43 2014 -0400 Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4 changes/geoip6-july2014 | 2 + src/config/geoip6 | 3674 ++++++++++++----------------------------------- 2 files changed, 940 insertions(+), 2736 deletions(-)

1 0

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

25 Jul '14

commit 015f710f72823bc31c3075fb41d3ae33eb7abe06 Merge: f5ce580 6d5efbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 21 14:29:30 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-july2014 | 3 + src/config/geoip | 3600 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 2499 insertions(+), 1104 deletions(-)

1 0

[tor/release-0.2.5] Put the bug number and correct credits in the changes file for the new curve25519-donna32
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit ad0cf550b727587337d2aed741923d3781bb334f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 23 21:25:53 2014 -0400 Put the bug number and correct credits in the changes file for the new curve25519-donna32 --- changes/curve25519-donna32-bug | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/curve25519-donna32-bug b/changes/curve25519-donna32-bug index 54892d7..7fccab1 100644 --- a/changes/curve25519-donna32-bug +++ b/changes/curve25519-donna32-bug @@ -6,5 +6,7 @@ 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. + 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.

1 0

[tor/release-0.2.5] update changes entry with info for 11578 patch
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit fa8bb25f642a4fc57d44951d0192a26dd5a66c5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 21 14:00:10 2014 -0400 update changes entry with info for 11578 patch --- changes/bufferevent_compilation | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/bufferevent_compilation b/changes/bufferevent_compilation index 0690e65..3a32873 100644 --- a/changes/bufferevent_compilation +++ b/changes/bufferevent_compilation @@ -1,5 +1,6 @@ o Minor bugfixes: - Fix compilation when building with bufferevents enabled. (This configuration is still not expected to work, however.) - Fixes bugs 12438, 12474; bugfixes on 0.2.5.1-alpha. Patches - from Anthony G. Basile. + 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.

1 0

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

25 Jul '14

commit e0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da Merge: fa8bb25 75501db Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 21 14:30:09 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-july2014 | 3 + changes/geoip6-july2014 | 2 + src/config/geoip | 3600 ++++++++++++++++++++++++++++++++-------------- src/config/geoip6 | 3674 ++++++++++++----------------------------------- 4 files changed, 3439 insertions(+), 3840 deletions(-)

1 0