November 2015 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit 42aa74ff546d4e5249594c67ccc436706be22010 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 10:15:28 2015 +0000 Update translations for tails-greeter --- bg/bg.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 2704330..1aad4fc 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -7,13 +7,14 @@ # Mal Malakov <dev(a)epsilon-labs.com>, 2015 # Teodora Milchova Markova <t.the.orange(a)abv.bg>, 2015 # Tsvetan Nikolov <slakware(a)gmail.com>, 2015 +# Ивайло Малинов <iv.malinov(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-26 17:51+0100\n" -"PO-Revision-Date: 2015-10-27 10:10+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2015-11-02 21:29+0100\n" +"PO-Revision-Date: 2015-11-26 10:09+0000\n" +"Last-Translator: Ивайло Малинов <iv.malinov(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -163,7 +164,7 @@ msgstr "Интернет връзката на този компютър е це #: ../glade/optionswindow.glade.h:23 msgid "Disable all networking" -msgstr "" +msgstr "Изключи всички мрежи" #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit 67255a71673c47122475457b204a25f7f1e087cb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 10:15:19 2015 +0000 Update translations for liveusb-creator --- bg/bg.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 2bf53bc..9a9bb80 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -9,13 +9,14 @@ # Kiril Ivailov Velinov <kirilvelinov(a)gmail.com>, 2012 # Teodora Milchova Markova <t.the.orange(a)abv.bg>, 2015 # Tsvetan Nikolov <slakware(a)gmail.com>, 2015 +# Ивайло Малинов <iv.malinov(a)gmail.com>, 2015 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: 2015-11-03 09:24+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-11-26 10:12+0000\n" +"Last-Translator: Ивайло Малинов <iv.malinov(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +64,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>.</body></html>" -msgstr "" +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Нужда от помощ? Прочети<a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.bg.html\">документацията</a>.</body></html>" #: ../liveusb/launcher_ui.py:155 msgid ""

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit 09811fbaf97bdb60a2437805417ebae021dc66c2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 09:16:49 2015 +0000 Update translations for tails-openpgp-applet_completed --- sv/openpgp-applet.pot | 178 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+) diff --git a/sv/openpgp-applet.pot b/sv/openpgp-applet.pot new file mode 100644 index 0000000..79354cf --- /dev/null +++ b/sv/openpgp-applet.pot @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Anders Nilsson <locally(a)devode.se>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: tails(a)boum.org\n" +"POT-Creation-Date: 2015-08-10 15:55+0200\n" +"PO-Revision-Date: 2015-11-26 09:04+0000\n" +"Last-Translator: Anders Nilsson <locally(a)devode.se>\n" +"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bin/openpgp-applet:163 +msgid "You are about to exit OpenPGP Applet. Are you sure?" +msgstr "Du håller på att avsluta OpenPGP Applet. Är du säker?" + +#: bin/openpgp-applet:175 +msgid "OpenPGP encryption applet" +msgstr "Panelprogram för OpenPGP-kryptering" + +#: bin/openpgp-applet:178 +msgid "Exit" +msgstr "Avsluta" + +#: bin/openpgp-applet:180 +msgid "About" +msgstr "Om" + +#: bin/openpgp-applet:235 +msgid "Encrypt Clipboard with _Passphrase" +msgstr "Kryptera urklipp med _lösenord" + +#: bin/openpgp-applet:238 +msgid "Sign/Encrypt Clipboard with Public _Keys" +msgstr "Signera/kryptera urklipp med _publik nyckel" + +#: bin/openpgp-applet:243 +msgid "_Decrypt/Verify Clipboard" +msgstr "_Dekryptera/verifiera urklipp" + +#: bin/openpgp-applet:247 +msgid "_Manage Keys" +msgstr "_Hantera nycklar" + +#: bin/openpgp-applet:251 +msgid "_Open Text Editor" +msgstr "_Öppna textredigerare" + +#: bin/openpgp-applet:295 +msgid "The clipboard does not contain valid input data." +msgstr "Urklippet innehåller ingen giltig data." + +#: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351 +msgid "Unknown Trust" +msgstr "Okänd tillit" + +#: bin/openpgp-applet:353 +msgid "Marginal Trust" +msgstr "Marginell tillit" + +#: bin/openpgp-applet:355 +msgid "Full Trust" +msgstr "Full tillit" + +#: bin/openpgp-applet:357 +msgid "Ultimate Trust" +msgstr "Ultimat tillit" + +#: bin/openpgp-applet:410 +msgid "Name" +msgstr "Namn" + +#: bin/openpgp-applet:411 +msgid "Key ID" +msgstr "Nyckel-ID" + +#: bin/openpgp-applet:412 +msgid "Status" +msgstr "Status" + +#: bin/openpgp-applet:444 +msgid "Fingerprint:" +msgstr "Fingeravtryck:" + +#: bin/openpgp-applet:447 +msgid "User ID:" +msgid_plural "User IDs:" +msgstr[0] "Användar-ID:" +msgstr[1] "Användar-IDn:" + +#: bin/openpgp-applet:476 +msgid "None (Don't sign)" +msgstr "Ingen (signera inte)" + +#: bin/openpgp-applet:539 +msgid "Select recipients:" +msgstr "Välj mottagare:" + +#: bin/openpgp-applet:547 +msgid "Hide recipients" +msgstr "Dölj mottagare" + +#: bin/openpgp-applet:550 +msgid "" +"Hide the user IDs of all recipients of an encrypted message. Otherwise " +"anyone that sees the encrypted message can see who the recipients are." +msgstr "Dölj användar-IDn för alla mottagare av krypterade meddelanden. Annars kan vem som helst som ser meddelandet också se vilka mottagarna är." + +#: bin/openpgp-applet:556 +msgid "Sign message as:" +msgstr "Signera meddelandet som:" + +#: bin/openpgp-applet:560 +msgid "Choose keys" +msgstr "Välj nycklar" + +#: bin/openpgp-applet:600 +msgid "Do you trust these keys?" +msgstr "Litar du på dessa nycklar?" + +#: bin/openpgp-applet:603 +msgid "The following selected key is not fully trusted:" +msgid_plural "The following selected keys are not fully trusted:" +msgstr[0] "Följande vald nyckel är inte helt betrodd:" +msgstr[1] "Följande valda nycklar är inte helt betrodda:" + +#: bin/openpgp-applet:621 +msgid "Do you trust this key enough to use it anyway?" +msgid_plural "Do you trust these keys enough to use them anyway?" +msgstr[0] "Litar du tillräckligt på den här nyckeln för att använda den ändå?" +msgstr[1] "Litar du tillräckligt på de här nycklarna för att använda dem ändå?" + +#: bin/openpgp-applet:634 +msgid "No keys selected" +msgstr "Inga nycklar valda" + +#: bin/openpgp-applet:636 +msgid "" +"You must select a private key to sign the message, or some public keys to " +"encrypt the message, or both." +msgstr "Du måste välja en privat nyckel för att signera meddelandet, eller några publika nycklar för att kryptera meddelandet, eller både och." + +#: bin/openpgp-applet:664 +msgid "No keys available" +msgstr "Inga nycklar tillgängliga" + +#: bin/openpgp-applet:666 +msgid "" +"You need a private key to sign messages or a public key to encrypt messages." +msgstr "Du behöver en privat nyckel för att signera meddelanden eller publik nyckel för att kryptera meddelanden." + +#: bin/openpgp-applet:794 +msgid "GnuPG error" +msgstr "Fel från GnuPG" + +#: bin/openpgp-applet:815 +msgid "Therefore the operation cannot be performed." +msgstr "Därför kan inte åtgärden utföras." + +#: bin/openpgp-applet:865 +msgid "GnuPG results" +msgstr "Resultat från GnuPG" + +#: bin/openpgp-applet:871 +msgid "Output of GnuPG:" +msgstr "Utmatning från GnuPG:" + +#: bin/openpgp-applet:896 +msgid "Other messages provided by GnuPG:" +msgstr "Andra meddelanden givna av GnuPG:"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit e1ed8cbe5cc60318c0a3bf847badc83810ff4a1f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 09:16:44 2015 +0000 Update translations for tails-openpgp-applet --- sv/openpgp-applet.pot | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sv/openpgp-applet.pot b/sv/openpgp-applet.pot index 219a9e5..79354cf 100644 --- a/sv/openpgp-applet.pot +++ b/sv/openpgp-applet.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Anders Nilsson <locally(a)devode.se>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2015-11-23 02:23+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2015-11-26 09:04+0000\n" +"Last-Translator: Anders Nilsson <locally(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: bin/openpgp-applet:163 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "" +msgstr "Du håller på att avsluta OpenPGP Applet. Är du säker?" #: bin/openpgp-applet:175 msgid "OpenPGP encryption applet" @@ -92,8 +93,8 @@ msgstr "Fingeravtryck:" #: bin/openpgp-applet:447 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Användar-ID:" +msgstr[1] "Användar-IDn:" #: bin/openpgp-applet:476 msgid "None (Don't sign)" @@ -111,7 +112,7 @@ msgstr "Dölj mottagare" msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "Dölj användar IDn för alla mottagare av krypterade meddelanden. Annars kan vem som helst som ser meddelandet också se vilka mottagarna är." +msgstr "Dölj användar-IDn för alla mottagare av krypterade meddelanden. Annars kan vem som helst som ser meddelandet också se vilka mottagarna är." #: bin/openpgp-applet:556 msgid "Sign message as:" @@ -128,14 +129,14 @@ msgstr "Litar du på dessa nycklar?" #: bin/openpgp-applet:603 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande vald nyckel är inte helt betrodd:" +msgstr[1] "Följande valda nycklar är inte helt betrodda:" #: bin/openpgp-applet:621 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Litar du tillräckligt på den här nyckeln för att använda den ändå?" +msgstr[1] "Litar du tillräckligt på de här nycklarna för att använda dem ändå?" #: bin/openpgp-applet:634 msgid "No keys selected"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit c3a9524b906c76929b7bfc72a5f8068da01ebc47 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 09:15:45 2015 +0000 Update translations for tails-misc_completed --- sv.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sv.po b/sv.po index 5f2f091..426c19e 100644 --- a/sv.po +++ b/sv.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-24 12:45+0000\n" +"POT-Creation-Date: 2015-11-03 01:06+0100\n" +"PO-Revision-Date: 2015-11-26 09:04+0000\n" "Last-Translator: Anders Nilsson <locally(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -315,23 +315,23 @@ msgstr "Det verkar som din åtkomst till nätverket är blockerad. Detta kan ber msgid "This version of Tails has known security issues:" msgstr "Det finns kända säkerhetsproblem i den här Tails versionen:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:50 #, sh-format msgid "Network card ${nic} disabled" msgstr "Nätverkskortet ${nic} inaktiverad" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:51 #, sh-format 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 "Kunde inte fejka MAC för nätverkskortet ${nic_name} (${nic}), så den har lämnats inaktiverad.\nDu vill nog starta om Tails och inaktivera fejkning av MAC. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentationen</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:60 msgid "All networking disabled" msgstr "Alla nätverk inaktiverade" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:61 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -462,40 +462,40 @@ msgstr "Misslyckades med att konfigurera webbläsaren." msgid "Failed to run browser." msgstr "Misslyckades att starta webbläsare." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "I2P failed to start" msgstr "Misslyckades med att starta I2P" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Något blev fel då I2P startade. Kolla loggarna i /var/log/i2p för mer information." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "I2P's router console is ready" msgstr "I2P:s router konsol är klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Du kan nu komma åt I2P-router-konsollen i I2P-webbläsaren." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is not ready" msgstr "I2P är inte klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Eepsite-tunneln skapades inte inom sex minuter. Kolla i routerkonsollen i I2P-webbläsaren eller loggarna i /var/log/i2p för ytterligare information. Återanslut till nätverket för att försöka igen." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "I2P is ready" msgstr "I2P är klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 msgid "You can now access services on I2P." msgstr "Du kan nu tillgång till tjänster på I2P."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Nov '15

26 Nov '15

commit 3e099c90ae93cb8fa92ad660294d5c8bca78f8c6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 26 09:15:40 2015 +0000 Update translations for tails-misc --- sv.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sv.po b/sv.po index 5f2f091..426c19e 100644 --- a/sv.po +++ b/sv.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-24 12:45+0000\n" +"POT-Creation-Date: 2015-11-03 01:06+0100\n" +"PO-Revision-Date: 2015-11-26 09:04+0000\n" "Last-Translator: Anders Nilsson <locally(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -315,23 +315,23 @@ msgstr "Det verkar som din åtkomst till nätverket är blockerad. Detta kan ber msgid "This version of Tails has known security issues:" msgstr "Det finns kända säkerhetsproblem i den här Tails versionen:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:50 #, sh-format msgid "Network card ${nic} disabled" msgstr "Nätverkskortet ${nic} inaktiverad" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:51 #, sh-format 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 "Kunde inte fejka MAC för nätverkskortet ${nic_name} (${nic}), så den har lämnats inaktiverad.\nDu vill nog starta om Tails och inaktivera fejkning av MAC. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentationen</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:60 msgid "All networking disabled" msgstr "Alla nätverk inaktiverade" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:61 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -462,40 +462,40 @@ msgstr "Misslyckades med att konfigurera webbläsaren." msgid "Failed to run browser." msgstr "Misslyckades att starta webbläsare." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "I2P failed to start" msgstr "Misslyckades med att starta I2P" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Något blev fel då I2P startade. Kolla loggarna i /var/log/i2p för mer information." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "I2P's router console is ready" msgstr "I2P:s router konsol är klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Du kan nu komma åt I2P-router-konsollen i I2P-webbläsaren." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is not ready" msgstr "I2P är inte klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Eepsite-tunneln skapades inte inom sex minuter. Kolla i routerkonsollen i I2P-webbläsaren eller loggarna i /var/log/i2p för ytterligare information. Återanslut till nätverket för att försöka igen." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "I2P is ready" msgstr "I2P är klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 msgid "You can now access services on I2P." msgstr "Du kan nu tillgång till tjänster på I2P."

1 0

[tor/master] Fix documentation for crypto_rand*
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit 1cfa2bc859c0a7f27b49b80dc1be4be2acc91ee8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 12:28:20 2015 -0500 Fix documentation for crypto_rand* --- src/common/crypto.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 9e27ad3..9669493 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2364,8 +2364,11 @@ crypto_seed_rng(void) return -1; } -/** Write n bytes of strong random data to to. Return 0 on - * success, -1 on failure, with support for mocking for unit tests. +/** Write n bytes of strong random data to to. Supports mocking + * for unit tests. + * + * This function is not allowed to fail; if it would fail to generate strong + * entropy, it must terminate the process instead. */ MOCK_IMPL(void, crypto_rand, (char *to, size_t n)) @@ -2373,8 +2376,11 @@ crypto_rand, (char *to, size_t n)) crypto_rand_unmocked(to, n); } -/** Write n bytes of strong random data to to. Return 0 on - * success, -1 on failure. Most callers will want crypto_rand instead. +/** Write n bytes of strong random data to to. Most callers + * will want crypto_rand instead. + * + * This function is not allowed to fail; if it would fail to generate strong + * entropy, it must terminate the process instead. */ void crypto_rand_unmocked(char *to, size_t n)

1 0

[tor/master] Add a changes file for bug 17686
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit 943369f927967268cacd2067ccae0bc5f1c5835e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 13:25:21 2015 -0500 Add a changes file for bug 17686 --- changes/bug17686 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug17686 b/changes/bug17686 new file mode 100644 index 0000000..8fa16c7 --- /dev/null +++ b/changes/bug17686 @@ -0,0 +1,4 @@ + o Minor features: + - Adjust Tor's use of OpenSSL's RNG APIs so that they absolutely, + positively are not allowed to fail. Previously we depended on + internals about OpenSSL behavior. Closes ticket 17686.

1 0

[tor/master] Merge branch 'bug17686_v2_027'
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit e5754c42d124549b3fd8e8d7c11d4dde3b5acec1 Merge: c875265 943369f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 22:33:49 2015 -0500 Merge branch 'bug17686_v2_027' changes/bug17686 | 4 ++++ src/common/compat.h | 2 ++ src/common/crypto.c | 35 +++++++++++++++++++++-------------- src/common/crypto.h | 11 ++++++----- src/common/crypto_curve25519.c | 3 +-- src/common/tortls.c | 3 +-- src/or/config.c | 3 +-- src/or/connection_or.c | 3 +-- src/or/control.c | 3 +-- src/or/ext_orport.c | 3 +-- src/or/main.c | 6 ++++-- src/or/onion_fast.c | 8 ++------ src/or/rendclient.c | 6 +----- src/or/rendcommon.c | 12 ++---------- src/test/bench.c | 5 ++++- src/test/test_extorport.c | 5 ++--- src/test/test_workqueue.c | 10 ++++++++-- src/test/testing_common.c | 5 ++++- 18 files changed, 66 insertions(+), 61 deletions(-) diff --cc src/or/main.c index c9007b9,0f8d7ff..1469fd1 --- a/src/or/main.c +++ b/src/or/main.c @@@ -1607,37 -1371,43 +1607,39 @@@ rotate_x509_certificate_callback(time_ /* 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our * TLS context. */ - if (!time_to.last_rotated_x509_certificate) - time_to.last_rotated_x509_certificate = now; - if (time_to.last_rotated_x509_certificate + - MAX_SSL_KEY_LIFETIME_INTERNAL < now) { - log_info(LD_GENERAL,"Rotating tls context."); - if (router_initialize_tls_context() < 0) { - log_warn(LD_BUG, "Error reinitializing TLS context"); - /* XXX is it a bug here, that we just keep going? -RD */ - } - time_to.last_rotated_x509_certificate = now; - /* We also make sure to rotate the TLS connections themselves if they've - * been up for too long -- but that's done via is_bad_for_new_circs in - * connection_run_housekeeping() above. */ - } - - if (time_to.add_entropy < now) { - if (time_to.add_entropy) { - /* We already seeded once, so don't die on failure. */ - if (crypto_seed_rng() < 0) { - log_warn(LD_GENERAL, "Tried to re-seed RNG, but failed. We already " - "seeded once, though, so we won't exit here."); - } - } -/** How often do we add more entropy to OpenSSL's RNG pool? */ -#define ENTROPY_INTERVAL (60*60) - time_to.add_entropy = now + ENTROPY_INTERVAL; + log_info(LD_GENERAL,"Rotating tls context."); + if (router_initialize_tls_context() < 0) { + log_warn(LD_BUG, "Error reinitializing TLS context"); + /* XXX is it a bug here, that we just keep going? -RD */ } - /* 1c. If we have to change the accounting interval or record - * bandwidth used in this accounting interval, do so. */ - if (accounting_is_enabled(options)) - accounting_run_housekeeping(now); + /* We also make sure to rotate the TLS connections themselves if they've + * been up for too long -- but that's done via is_bad_for_new_circs in + * run_connection_housekeeping() above. */ - + return MAX_SSL_KEY_LIFETIME_INTERNAL; +} + +static int +add_entropy_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; + /* We already seeded once, so don't die on failure. */ - crypto_seed_rng(); ++ if (crypto_seed_rng() < 0) { ++ log_warn(LD_GENERAL, "Tried to re-seed RNG, but failed. We already " ++ "seeded once, though, so we won't exit here."); ++ } + + /** How often do we add more entropy to OpenSSL's RNG pool? */ +#define ENTROPY_INTERVAL (60*60) + return ENTROPY_INTERVAL; +} - if (time_to.launch_reachability_tests < now && - (authdir_mode_tests_reachability(options)) && - !net_is_disabled()) { - time_to.launch_reachability_tests = now + REACHABILITY_TEST_INTERVAL; +static int +launch_reachability_tests_callback(time_t now, const or_options_t *options) +{ + if (authdir_mode_tests_reachability(options) && + !net_is_disabled()) { /* try to determine reachability of the other Tor relays */ dirserv_test_reachability(now); }

1 0

[tor/master] Make crypto_seed_rng() and crypto_rand() less scary.
by nickm＠torproject.org 26 Nov '15

26 Nov '15

commit dedea28c2ef59eb86f5d9704e5609ae13fa8b3c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 10:30:58 2015 -0500 Make crypto_seed_rng() and crypto_rand() less scary. These functions must really never fail; so have crypto_rand() assert that it's working okay, and have crypto_seed_rng() demand that callers check its return value. Also have crypto_seed_rng() check RAND_status() before returning. --- src/common/compat.h | 2 ++ src/common/crypto.c | 10 ++++++---- src/common/crypto.h | 3 ++- src/or/main.c | 5 ++++- src/test/bench.c | 5 ++++- src/test/test_workqueue.c | 5 ++++- src/test/testing_common.c | 5 ++++- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index c7c468c..c3d6abd 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -118,6 +118,7 @@ #define ATTR_CONST __attribute__((const)) #define ATTR_MALLOC __attribute__((malloc)) #define ATTR_NORETURN __attribute__((noreturn)) +#define ATTR_WUR __attribute__((warn_unused_result)) /* Alas, nonnull is not at present a good idea for us. We'd like to get * warnings when we pass NULL where we shouldn't (which nonnull does, albeit * spottily), but we don't want to tell the compiler to make optimizations @@ -153,6 +154,7 @@ #define ATTR_NORETURN #define ATTR_NONNULL(x) #define ATTR_UNUSED +#define ATTR_WUR #define PREDICT_LIKELY(exp) (exp) #define PREDICT_UNLIKELY(exp) (exp) #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index 815c2ec..b7dc4b8 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2358,7 +2358,7 @@ crypto_seed_rng(void) memwipe(buf, 0, sizeof(buf)); - if (rand_poll_ok || load_entropy_ok) + if ((rand_poll_ok || load_entropy_ok) && RAND_status() == 1) return 0; else return -1; @@ -2380,12 +2380,14 @@ int crypto_rand_unmocked(char *to, size_t n) { int r; + if (n == 0) + return 0; + tor_assert(n < INT_MAX); tor_assert(to); r = RAND_bytes((unsigned char*)to, (int)n); - if (r == 0) - crypto_log_errors(LOG_WARN, "generating random data"); - return (r == 1) ? 0 : -1; + tor_assert(r >= 0); + return 0; } /** Return a pseudorandom integer, chosen uniformly from the values diff --git a/src/common/crypto.h b/src/common/crypto.h index 6256f73..d2ced63 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -16,6 +16,7 @@ #include <stdio.h> #include "torint.h" #include "testsupport.h" +#include "compat.h" /* Macro to create an arbitrary OpenSSL version number as used by @@ -258,7 +259,7 @@ int crypto_expand_key_material_rfc5869_sha256( uint8_t *key_out, size_t key_out_len); /* random numbers */ -int crypto_seed_rng(void); +int crypto_seed_rng(void) ATTR_WUR; MOCK_DECL(int,crypto_rand,(char *to, size_t n)); int crypto_rand_unmocked(char *to, size_t n); int crypto_strongest_rand(uint8_t *out, size_t out_len); diff --git a/src/or/main.c b/src/or/main.c index 9b3dbb5..0f8d7ff 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1389,7 +1389,10 @@ run_scheduled_events(time_t now) if (time_to.add_entropy < now) { if (time_to.add_entropy) { /* We already seeded once, so don't die on failure. */ - crypto_seed_rng(); + if (crypto_seed_rng() < 0) { + log_warn(LD_GENERAL, "Tried to re-seed RNG, but failed. We already " + "seeded once, though, so we won't exit here."); + } } /** How often do we add more entropy to OpenSSL's RNG pool? */ #define ENTROPY_INTERVAL (60*60) diff --git a/src/test/bench.c b/src/test/bench.c index 2a27377..70ec025 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -643,7 +643,10 @@ main(int argc, const char **argv) reset_perftime(); - crypto_seed_rng(); + if (crypto_seed_rng() < 0) { + printf("Couldn't seed RNG; exiting.\n"); + return 1; + } crypto_init_siphash_key(); options = options_new(); init_logging(1); diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 0d79733..6edfd31 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -391,7 +391,10 @@ main(int argc, char **argv) init_logging(1); network_init(); crypto_global_init(1, NULL, NULL); - crypto_seed_rng(); + if (crypto_seed_rng() < 0) { + printf("Couldn't seed RNG; exiting.\n"); + return 1; + } rq = replyqueue_new(as_flags); tor_assert(rq); diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 441024b..2ea158f 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -272,7 +272,10 @@ main(int c, const char **v) return 1; } crypto_set_tls_dh_prime(); - crypto_seed_rng(); + if (crypto_seed_rng() < 0) { + printf("Couldn't seed RNG; exiting.\n"); + return 1; + } rep_hist_init(); network_init(); setup_directory();

1 0