April 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 22845df2a7503ed73ed325c3a98916f289918caa Merge: 3ee4c9b1f d064122e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 10:04:36 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3 changes/bug25226 | 4 +++ src/or/networkstatus.c | 1 + src/or/or.h | 6 ----- src/or/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++--- src/or/relay.h | 1 + 5 files changed, 70 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 22845df2a7503ed73ed325c3a98916f289918caa Merge: 3ee4c9b1f d064122e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 10:04:36 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3 changes/bug25226 | 4 +++ src/or/networkstatus.c | 1 + src/or/or.h | 6 ----- src/or/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++--- src/or/relay.h | 1 + 5 files changed, 70 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 8ae9ed6287649a67a1cef5636a8042dfa6a341c0 Merge: d17ddb839 22845df2a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 10:06:21 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25226 | 4 +++ src/or/networkstatus.c | 1 + src/or/or.h | 6 ----- src/or/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++--- src/or/relay.h | 1 + 5 files changed, 70 insertions(+), 9 deletions(-)

1 0

[tor/master] Remove old tor-fw-helper README from EXTRA_DIST
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 197d1992dba2fe4dd9c7f2eb0e232487f8c177ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 09:52:15 2018 -0400 Remove old tor-fw-helper README from EXTRA_DIST We removed this file, but didn't take it out of EXTRA_DIST -- thus breaking "make dist". --- src/tools/include.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tools/include.am b/src/tools/include.am index 92cc3f10a..016cf3b12 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -44,8 +44,6 @@ src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ endif -EXTRA_DIST += src/tools/tor-fw-helper/README - if BUILD_LIBTORRUNNER noinst_LIBRARIES += src/tools/libtorrunner.a src_tools_libtorrunner_a_SOURCES = src/tools/tor_runner.c src/or/tor_api.c

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit bc0642cb2bb0a6eb1b8ee3d3f06b8bb25494fd37 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 12:50:13 2018 +0000 Update translations for tails-greeter-2_completed --- de/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/de.po b/de/de.po index f94e14b4e..425589035 100644 --- a/de/de.po +++ b/de/de.po @@ -131,7 +131,7 @@ msgstr "Sprache & Regionseinstellungen speichern" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "_Sprache" +msgstr "S_prache" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit cd183d769ef663162c10359afd7b222a51737f2a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 12:50:08 2018 +0000 Update translations for tails-greeter-2 --- de/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/de.po b/de/de.po index f94e14b4e..425589035 100644 --- a/de/de.po +++ b/de/de.po @@ -131,7 +131,7 @@ msgstr "Sprache & Regionseinstellungen speichern" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "_Sprache" +msgstr "S_prache" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 09971dcec5199558a2f2711929571d349861bb39 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 12:46:00 2018 +0000 Update translations for tails-persistence-setup_completed --- de/de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index 24a4815dd..81803573e 100644 --- a/de/de.po +++ b/de/de.po @@ -14,6 +14,7 @@ # mo <moritz(a)torservers.net>, 2013 # Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 +# spriver, 2018 # sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert <tobannert(a)gmail.com>, 2014 # rike, 2014-2015 @@ -23,8 +24,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2018-04-12 18:58+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-04-16 12:02+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,7 +111,7 @@ msgstr "Bitcoin-Client" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Electrums Bitcoin Wallet und Konfiguration" +msgstr "Electrums Bitcoin-Wallet und Konfiguration" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit faa3fcadfcb82fe2df0515e2108d51cbe2c95f70 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 12:45:50 2018 +0000 Update translations for tails-persistence-setup --- de/de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index 24a4815dd..81803573e 100644 --- a/de/de.po +++ b/de/de.po @@ -14,6 +14,7 @@ # mo <moritz(a)torservers.net>, 2013 # Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 +# spriver, 2018 # sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert <tobannert(a)gmail.com>, 2014 # rike, 2014-2015 @@ -23,8 +24,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2018-04-12 18:58+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-04-16 12:02+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,7 +111,7 @@ msgstr "Bitcoin-Client" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Electrums Bitcoin Wallet und Konfiguration" +msgstr "Electrums Bitcoin-Wallet und Konfiguration" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit d2beab5095c08938e1a7e8273407e8ae517e76b6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:47:44 2018 +0000 Update translations for tails-perl5lib --- de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de.po b/de.po index 01bd7391d..3994afebf 100644 --- a/de.po +++ b/de.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-03-15 12:15+0000\n" -"PO-Revision-Date: 2018-03-31 13:21+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-04-16 10:35+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Apr '18

16 Apr '18

commit 710f63bb81bfca21fd93361aa0a8893cc82903e3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 16 10:46:49 2018 +0000 Update translations for tails-misc --- de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index b31ff1cb0..24085bd40 100644 --- a/de.po +++ b/de.po @@ -19,7 +19,8 @@ # max weber, 2015,2017-2018 # Sandra R <drahtseilakt(a)live.com>, 2014 # Sebastian <sebix+transifex(a)sebix.at>, 2015 -# spriver <spriver(a)autistici.org>, 2015 +# spriver, 2018 +# spriver, 2015 # sycamoreone <sycamoreone(a)riseup.net>, 2014 # Tobias Bannert <tobannert(a)gmail.com>, 2014,2016 # try once, 2015 @@ -29,8 +30,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-12 19:07+0000\n" -"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" +"PO-Revision-Date: 2018-04-16 10:17+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -322,7 +323,7 @@ msgstr "Dies könnte eine Weile dauern, bitte haben Sie etwas Geduld." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." -msgstr "Unsicherer Browser wird beendet …" +msgstr "Unsicherer Browser wird beendet…" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid ""

1 0