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

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 02 Feb '15

02 Feb '15

commit 225ebfe3d406fca56d663bf35dac9f78ad6218f2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 2 23:45:20 2015 +0000 Update translations for liveusb-creator_completed --- hr_HR/hr_HR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index da2f3ae..2b67e2a 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -7,14 +7,14 @@ # cisterna, 2013 # leonardo_cro <leonardo.miodrag(a)gmail.com>, 2014 # skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 -# Neven Lovrić <neven(a)lovric.net>, 2014 +# Neven Lovrić <neven(a)lovric.net>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-29 14:56+0000\n" -"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-02 23:25+0000\n" +"Last-Translator: Neven Lovrić <neven(a)lovric.net>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +63,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\"> Kopirajte pokrenuti Tails na USB ili SD karticu. Svi podatci na odredišnom uređaju će biti izgubljeni.</span></p></body></html>" +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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\"> Kopirajte pokrenuti Tails na USB ili SD karticu. Svi podatki na odredišnom uređaju će biti izgubǉeni.</span></p></body></html>" #: ../liveusb/launcher_ui.py:153 msgid "" @@ -72,7 +72,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\np style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Preslikajte radeći Tails na već ugrađeni Tails uređaj. Ostale podjele pronađene na štapiću ostaju očuvane.</span></p></body></html>" +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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\np style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Preslikajte radeći Tails na već ugrađeni Tailsov uređaj. Ostale podjele pronađene na štapiću ostaju očuvane.</span></p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid ""

1 0

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

02 Feb '15

commit 325cd1f372176bba764cf812ee500912bead63b9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 2 23:45:16 2015 +0000 Update translations for liveusb-creator --- hr_HR/hr_HR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index da2f3ae..2b67e2a 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -7,14 +7,14 @@ # cisterna, 2013 # leonardo_cro <leonardo.miodrag(a)gmail.com>, 2014 # skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 -# Neven Lovrić <neven(a)lovric.net>, 2014 +# Neven Lovrić <neven(a)lovric.net>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-29 14:56+0000\n" -"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-02 23:25+0000\n" +"Last-Translator: Neven Lovrić <neven(a)lovric.net>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +63,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\"> Kopirajte pokrenuti Tails na USB ili SD karticu. Svi podatci na odredišnom uređaju će biti izgubljeni.</span></p></body></html>" +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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\"> Kopirajte pokrenuti Tails na USB ili SD karticu. Svi podatki na odredišnom uređaju će biti izgubǉeni.</span></p></body></html>" #: ../liveusb/launcher_ui.py:153 msgid "" @@ -72,7 +72,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\np style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Preslikajte radeći Tails na već ugrađeni Tails uređaj. Ostale podjele pronađene na štapiću ostaju očuvane.</span></p></body></html>" +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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\np style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Preslikajte radeći Tails na već ugrađeni Tailsov uređaj. Ostale podjele pronađene na štapiću ostaju očuvane.</span></p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid ""

1 0

[globe/master] #13921 Remove "bridge pool assignment" field from Globe
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 9264e33515a3421dc365d44d5cb2e140889795be Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Dec 12 02:48:46 2014 -0800 #13921 Remove "bridge pool assignment" field from Globe Remove "Bridge pool assignment" field from Globe, add "Transports" field. * REMOVE pool_assignment field. * ADD transports field to show which PTs a bridge supports. * FIXES #13921 Signed-off-by: Isis Lovecruft <isis(a)torproject.org> --- src/js/models/defaults.js | 4 ++-- src/js/templates/bridgeDetail.hbs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/models/defaults.js b/src/js/models/defaults.js index 688dea9..d5c2c29 100644 --- a/src/js/models/defaults.js +++ b/src/js/models/defaults.js @@ -4,7 +4,7 @@ /** * default bridge detail object * @see {@link https://onionoo.torproject.org/#details} - * @type {{nickname: string, hashed_fingerprint: string, or_addresses: Array, last_seen: string, first_seen: string, running: null, flags: string, last_restarted: string, advertised_bandwidth: number, platform: string, pool_assignment: string}} + * @type {{nickname: string, hashed_fingerprint: string, or_addresses: Array, last_seen: string, first_seen: string, running: null, flags: string, last_restarted: string, advertised_bandwidth: number, platform: string, transports: string}} */ GLOBE.defaults.OnionooBridgeDetail = { nickname: 'Unnamed', @@ -17,7 +17,7 @@ GLOBE.defaults.OnionooBridgeDetail = { last_restarted: '', advertised_bandwidth: -1, platform: '', - pool_assignment: '' + transports: '' }; /** diff --git a/src/js/templates/bridgeDetail.hbs b/src/js/templates/bridgeDetail.hbs index 9d642ed..ca5d713 100644 --- a/src/js/templates/bridgeDetail.hbs +++ b/src/js/templates/bridgeDetail.hbs @@ -120,12 +120,12 @@ <div class="property"> <h5 class="has-tip" - data-description="Information of the pool that BridgeDB assigned this bridge to." - title="Pool assignment"> - Pool Assignment + data-description="Pluggable transports supported by this bridge" + title="Transports"> + Transports </h5> <p class="property-content"> - {{ pool_assignment }} + {{ transports }} </p> </div> </div>

1 0

[globe/master] Fix unittest in onionoodetail.test.js to check s/pool_assignment/transport/.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 37d2bc63a2d974facaf2a203f0228a8613e2c9ae Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 2 23:03:29 2015 +0000 Fix unittest in onionoodetail.test.js to check s/pool_assignment/transport/. --- test/unit/onionoodetail.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/onionoodetail.test.js b/test/unit/onionoodetail.test.js index f554feb..3ac9733 100644 --- a/test/unit/onionoodetail.test.js +++ b/test/unit/onionoodetail.test.js @@ -80,7 +80,7 @@ test('detail defaults test', function(){ 'last_restarted', 'advertised_bandwidth', 'platform', - 'pool_assignment' + 'transport' ] }; @@ -129,4 +129,4 @@ test('detail defaults test', function(){ relay: GLOBE.defaults.OnionooRelayDetail, bridge: GLOBE.defaults.OnionooBridgeDetail }).bridges[0], shouldContain.bridge), 'test function with given bridgeData should contain bridge with default params'); -}); \ No newline at end of file +});

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 02 Feb '15

02 Feb '15

commit aa382a0ed260dd7ff9ea4d9f3f7e129f20d926ae Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 2 23:15:32 2015 +0000 Update translations for tails-greeter_completed --- hr_HR/hr_HR.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 633a159..d4fe14c 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -5,13 +5,13 @@ # Translators: # Ana B, 2014 # cisterna, 2013 -# Neven Lovrić <neven(a)lovric.net>, 2014 +# Neven Lovrić <neven(a)lovric.net>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-08 21:10+0200\n" -"PO-Revision-Date: 2014-10-14 12:41+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-02-02 23:11+0000\n" "Last-Translator: Neven Lovrić <neven(a)lovric.net>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Lozinka:" #: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" -msgstr "Isključivo čitljivo?" +msgstr "Iskǉučivo čitǉivo?" #: ../glade/persistencewindow.glade.h:10 msgid "<i>Wrong passphrase. Please try again.</i>" @@ -66,7 +66,7 @@ msgstr "Više mogućnosti?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "Upraviteljska lozinka" +msgstr "Upraviteǉska lozinka" #: ../glade/optionswindow.glade.h:4 msgid "" @@ -78,7 +78,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Unesite upraviteljsku lozinku za slučaj potrebe izvršavanja upravljačkih zadaći.\nOne će u suprotnome biti onemogućene radi bolje sigurnosti." +msgstr "Unesite upraviteǉsku lozinku za slučaj potrebe izvršavaǌa upravǉačkih zadaći. One će u suprotnome biti onemogućene radi boǉe sigurnosti." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -106,15 +106,15 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Ova opcija čini neka Tails izgleda kao Microsoft Windows 8. To može biti korisno na javnim\nmjestima kako bi se izbjegla sumnja." +msgstr "Ova opcija čini neka Tails izgleda kao Microsoft Windows 8. To može biti korisno na javnim mjestima kako bi se izbjegla sumǌa." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "Aktiviraj Microsoft Windows 8 Prikrivanje" +msgstr "Aktiviraj Microsoft Windows 8 prikrivaǌe" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" -msgstr "lažiranje MAC adrese" +msgstr "lažiraǌe MAC adrese" #: ../glade/optionswindow.glade.h:15 msgid "" @@ -126,13 +126,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumen msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "Lažiranje MAC adresa mjesnim mrežama skriva slijedni broj Vaših mrežnih kartica. Ovo Vam može pomoći sakriti Vaš zemljopisni položaj." +msgstr "Lažiraǌe MAC adresa mjesnim mrežama skriva slijedni broj Vaših mrežnih kartica. Ovo Vam može pomoći sakriti Vaš zemǉopisni položaj." #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "Općenito je sigurnije lažirati MAC adrese ali to bi također moglo izazvati sumnju ili prouzročiti probleme mrežne veze." +msgstr "Općenito je sigurnije lažirati MAC adrese ali to bi također moglo izazvati sumǌu ili prouzročiti probleme mrežne veze." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" @@ -140,7 +140,7 @@ msgstr "Lažirati sve MAC adrese" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "Postavljanje mreže" +msgstr "Postavǉaǌe mreže" #: ../glade/optionswindow.glade.h:20 msgid "" @@ -158,7 +158,7 @@ msgstr "Međumrežna veza ovoga računala je bez prepreka. Željeli bi ste se sp msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "Međumrežna veza ovoga računala je cenzurirana, filtrirana ili koristi posrednik. Trebate postaviti mostovne, vatrozididne ili posredničke postavke." +msgstr "Međumrežna veza ovoga računala je cenzurirana, filtrirana ili koristi posrednik. Trebate postaviti mostovne, vatrozidne ili posredničke postavke." #: ../glade/langpanel.glade.h:1 msgid " " @@ -181,7 +181,7 @@ msgstr "Raspored" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "živa ustrajnost nije uspjela s povratnim kôdom %(returncode)s:\n%(stderr)s" +msgstr "live-persist nije uspio s povratnim kôdom %(returncode)s:\n%(stderr)s" #: ../tailsgreeter/persistence.py:99 #, python-format @@ -197,7 +197,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "živa ustrajnost nije uspjela s povratnim kôdom %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "live-persist nije uspio s povratnim kôdom %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 #: ../tailsgreeter/langpanel.py:183

1 0

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

02 Feb '15

commit 95b33e70e2ede2b78e72e78336ba76054a1adb1b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 2 23:15:28 2015 +0000 Update translations for tails-greeter --- hr_HR/hr_HR.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 633a159..d4fe14c 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -5,13 +5,13 @@ # Translators: # Ana B, 2014 # cisterna, 2013 -# Neven Lovrić <neven(a)lovric.net>, 2014 +# Neven Lovrić <neven(a)lovric.net>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-08 21:10+0200\n" -"PO-Revision-Date: 2014-10-14 12:41+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-02-02 23:11+0000\n" "Last-Translator: Neven Lovrić <neven(a)lovric.net>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Lozinka:" #: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" -msgstr "Isključivo čitljivo?" +msgstr "Iskǉučivo čitǉivo?" #: ../glade/persistencewindow.glade.h:10 msgid "<i>Wrong passphrase. Please try again.</i>" @@ -66,7 +66,7 @@ msgstr "Više mogućnosti?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "Upraviteljska lozinka" +msgstr "Upraviteǉska lozinka" #: ../glade/optionswindow.glade.h:4 msgid "" @@ -78,7 +78,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Unesite upraviteljsku lozinku za slučaj potrebe izvršavanja upravljačkih zadaći.\nOne će u suprotnome biti onemogućene radi bolje sigurnosti." +msgstr "Unesite upraviteǉsku lozinku za slučaj potrebe izvršavaǌa upravǉačkih zadaći. One će u suprotnome biti onemogućene radi boǉe sigurnosti." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -106,15 +106,15 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Ova opcija čini neka Tails izgleda kao Microsoft Windows 8. To može biti korisno na javnim\nmjestima kako bi se izbjegla sumnja." +msgstr "Ova opcija čini neka Tails izgleda kao Microsoft Windows 8. To može biti korisno na javnim mjestima kako bi se izbjegla sumǌa." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "Aktiviraj Microsoft Windows 8 Prikrivanje" +msgstr "Aktiviraj Microsoft Windows 8 prikrivaǌe" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" -msgstr "lažiranje MAC adrese" +msgstr "lažiraǌe MAC adrese" #: ../glade/optionswindow.glade.h:15 msgid "" @@ -126,13 +126,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumen msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "Lažiranje MAC adresa mjesnim mrežama skriva slijedni broj Vaših mrežnih kartica. Ovo Vam može pomoći sakriti Vaš zemljopisni položaj." +msgstr "Lažiraǌe MAC adresa mjesnim mrežama skriva slijedni broj Vaših mrežnih kartica. Ovo Vam može pomoći sakriti Vaš zemǉopisni položaj." #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "Općenito je sigurnije lažirati MAC adrese ali to bi također moglo izazvati sumnju ili prouzročiti probleme mrežne veze." +msgstr "Općenito je sigurnije lažirati MAC adrese ali to bi također moglo izazvati sumǌu ili prouzročiti probleme mrežne veze." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" @@ -140,7 +140,7 @@ msgstr "Lažirati sve MAC adrese" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "Postavljanje mreže" +msgstr "Postavǉaǌe mreže" #: ../glade/optionswindow.glade.h:20 msgid "" @@ -158,7 +158,7 @@ msgstr "Međumrežna veza ovoga računala je bez prepreka. Željeli bi ste se sp msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "Međumrežna veza ovoga računala je cenzurirana, filtrirana ili koristi posrednik. Trebate postaviti mostovne, vatrozididne ili posredničke postavke." +msgstr "Međumrežna veza ovoga računala je cenzurirana, filtrirana ili koristi posrednik. Trebate postaviti mostovne, vatrozidne ili posredničke postavke." #: ../glade/langpanel.glade.h:1 msgid " " @@ -181,7 +181,7 @@ msgstr "Raspored" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "živa ustrajnost nije uspjela s povratnim kôdom %(returncode)s:\n%(stderr)s" +msgstr "live-persist nije uspio s povratnim kôdom %(returncode)s:\n%(stderr)s" #: ../tailsgreeter/persistence.py:99 #, python-format @@ -197,7 +197,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "živa ustrajnost nije uspjela s povratnim kôdom %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "live-persist nije uspio s povratnim kôdom %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 #: ../tailsgreeter/langpanel.py:183

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 02 Feb '15

02 Feb '15

commit 918771967d7f8e2f2a07f400be8d4eee63f46f51 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 2 23:15:24 2015 +0000 Update translations for tails-persistence-setup_completed --- hr_HR/hr_HR.po | 62 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 2d6c564..b71b48b 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -5,13 +5,13 @@ # Translators: # Ana B, 2013 # skiddiep <lyricaltumor(a)gmail.com>, 2014 -# Neven Lovrić <neven(a)lovric.net>, 2014 +# Neven Lovrić <neven(a)lovric.net>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-14 15:21+0000\n" +"POT-Creation-Date: 2015-01-13 19:22+0100\n" +"PO-Revision-Date: 2015-02-02 23:14+0000\n" "Last-Translator: Neven Lovrić <neven(a)lovric.net>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Osobni podatki" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "Datoteke držite spremljene u popisu „Persistent“" +msgstr "Datoteke držati spremǉene u popisu „Persistent“" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" @@ -34,11 +34,11 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "GnuPG prsteni ključa i postavke" +msgstr "GnuPG prsteni kǉuča i postavke" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "SSH Mušterija" +msgstr "SSH mušterija" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" @@ -54,15 +54,15 @@ msgstr "Pidgin profili i OTR prsten ključa" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "Claws Pošta" +msgstr "Claws pošta" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" -msgstr "Profili Claws Pošte i mjesno spremljlena e-pošta" +msgstr "Profili Claws pošte i mjesno spremǉena e-pošta" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" -msgstr "GNOME Prsten Ključa" +msgstr "GNOME prsten ključa" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" @@ -78,11 +78,11 @@ msgstr "Postavke mrežnih uređaja i veza" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "Pregledničke knjižne oznake" +msgstr "Pregledničke kǌižne oznake" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" -msgstr "Knjižne oznake spremljene u Tor Pregledniku" +msgstr "Kǌižne oznake spremǉene u Tor Pregledniku" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" @@ -94,7 +94,7 @@ msgstr "Postavke pisača" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" -msgstr "APT Paketi" +msgstr "APT paketi" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" @@ -102,7 +102,7 @@ msgstr "Paketi preuzeti od strane APT‑a" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "APT Popisi" +msgstr "APT popisi" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" @@ -121,67 +121,67 @@ msgstr "Svaku datoteku ili popis pronađen u popisu „dotfiles“ znakovito pov msgid "Setup Tails persistent volume" msgstr "Postavi Tailsov ustrajni obujam" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "Greška" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Uređaj %s već ima ustrajni obujam." -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "Uređaj %s nema dovoljno nezaposjednutoga prostora." +msgstr "Uređaj %s nema dovoǉno nezaposjednutoga prostora." -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "Uređaj %s nema ustrajni obujam." -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Ne mogu izbirsati ustrajni obujam dok se koristi. Trebali bi ponovno pokrenuti Tails bez ustrajnoga obujma." -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." -msgstr "Ustrajnički obujam nije odključan." +msgstr "Ustrajnički obujam nije odkǉučan." -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "Ustrajnički obujam nije montiran." -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "Ustrajnički obujam nije čitljiv. Problemi dozvola ili vlasništva?" +msgstr "Ustrajnički obujam nije čitǉiv. Problemi dozvola ili vlasništva?" -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "Po ustrajničkome obujmu ne može se pisati. Možda je montiran isključivo čitljivo?" +msgstr "Po ustrajničkome obujmu ne može se pisati. Možda je montiran iskǉučivo čitǉivo?" -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails radi s ne‑USB / ne‑SDIO uređaja %s." -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "Uređaj %s je optički." -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Uređaj %s nije stvoren koristeći Tailsov Ugrađivač." -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "Čarobnjak ustrajnosti – Gotov" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 02 Feb '15

02 Feb '15

commit 38be9f807d538291351dac9f13d2e378e4c47fdf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 2 23:15:19 2015 +0000 Update translations for tails-persistence-setup --- hr_HR/hr_HR.po | 62 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 2d6c564..b71b48b 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -5,13 +5,13 @@ # Translators: # Ana B, 2013 # skiddiep <lyricaltumor(a)gmail.com>, 2014 -# Neven Lovrić <neven(a)lovric.net>, 2014 +# Neven Lovrić <neven(a)lovric.net>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-14 15:21+0000\n" +"POT-Creation-Date: 2015-01-13 19:22+0100\n" +"PO-Revision-Date: 2015-02-02 23:14+0000\n" "Last-Translator: Neven Lovrić <neven(a)lovric.net>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Osobni podatki" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "Datoteke držite spremljene u popisu „Persistent“" +msgstr "Datoteke držati spremǉene u popisu „Persistent“" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" @@ -34,11 +34,11 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "GnuPG prsteni ključa i postavke" +msgstr "GnuPG prsteni kǉuča i postavke" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "SSH Mušterija" +msgstr "SSH mušterija" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" @@ -54,15 +54,15 @@ msgstr "Pidgin profili i OTR prsten ključa" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "Claws Pošta" +msgstr "Claws pošta" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" -msgstr "Profili Claws Pošte i mjesno spremljlena e-pošta" +msgstr "Profili Claws pošte i mjesno spremǉena e-pošta" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" -msgstr "GNOME Prsten Ključa" +msgstr "GNOME prsten ključa" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" @@ -78,11 +78,11 @@ msgstr "Postavke mrežnih uređaja i veza" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "Pregledničke knjižne oznake" +msgstr "Pregledničke kǌižne oznake" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" -msgstr "Knjižne oznake spremljene u Tor Pregledniku" +msgstr "Kǌižne oznake spremǉene u Tor Pregledniku" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" @@ -94,7 +94,7 @@ msgstr "Postavke pisača" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" -msgstr "APT Paketi" +msgstr "APT paketi" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" @@ -102,7 +102,7 @@ msgstr "Paketi preuzeti od strane APT‑a" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "APT Popisi" +msgstr "APT popisi" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" @@ -121,67 +121,67 @@ msgstr "Svaku datoteku ili popis pronađen u popisu „dotfiles“ znakovito pov msgid "Setup Tails persistent volume" msgstr "Postavi Tailsov ustrajni obujam" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "Greška" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Uređaj %s već ima ustrajni obujam." -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "Uređaj %s nema dovoljno nezaposjednutoga prostora." +msgstr "Uređaj %s nema dovoǉno nezaposjednutoga prostora." -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "Uređaj %s nema ustrajni obujam." -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Ne mogu izbirsati ustrajni obujam dok se koristi. Trebali bi ponovno pokrenuti Tails bez ustrajnoga obujma." -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." -msgstr "Ustrajnički obujam nije odključan." +msgstr "Ustrajnički obujam nije odkǉučan." -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "Ustrajnički obujam nije montiran." -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "Ustrajnički obujam nije čitljiv. Problemi dozvola ili vlasništva?" +msgstr "Ustrajnički obujam nije čitǉiv. Problemi dozvola ili vlasništva?" -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "Po ustrajničkome obujmu ne može se pisati. Možda je montiran isključivo čitljivo?" +msgstr "Po ustrajničkome obujmu ne može se pisati. Možda je montiran iskǉučivo čitǉivo?" -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails radi s ne‑USB / ne‑SDIO uređaja %s." -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "Uređaj %s je optički." -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Uređaj %s nije stvoren koristeći Tailsov Ugrađivač." -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "Čarobnjak ustrajnosti – Gotov" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[tor/master] tweak based on comments from dgoulet
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit 41ba4f5627326e1745f0eea143f038677170c596 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 2 14:37:02 2015 -0500 tweak based on comments from dgoulet --- src/or/circuitbuild.c | 1 - src/or/onion_ntor.c | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 873eba1..676e69c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1289,7 +1289,6 @@ circuit_finish_handshake(origin_circuit_t *circ, onion_handshake_state_release(&hop->handshake_state); if (circuit_init_cpath_crypto(hop, keys, 0)<0) { - log_warn(LD_BUG, "Couldn't initialize cpath crypto"); return -END_CIRC_REASON_TORPROTOCOL; } diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index 32d5344..a7c0545 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -292,15 +292,17 @@ onion_skin_ntor_client_handshake( memwipe(&s, 0, sizeof(s)); - if (bad && msg_out) { + if (bad) { if (bad & 4) { - *msg_out = NULL; /* Don't report this one; we probably just had the - * wrong onion key.*/ + if (msg_out) + *msg_out = NULL; /* Don't report this one; we probably just had the + * wrong onion key.*/ log_fn(LOG_INFO, LD_PROTOCOL, "Invalid result from curve25519 handshake: %d", bad); } if (bad & 3) { - *msg_out = "Zero output from curve25519 handshake"; + if (msg_out) + *msg_out = "Zero output from curve25519 handshake"; log_fn(LOG_WARN, LD_PROTOCOL, "Invalid result from curve25519 handshake: %d", bad); }

1 0

[tor/master] Downgrade 'invalid result from curve25519 handshake: 4' warning
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit fb91d647acdf0560fc7479d72eeea52e4e6ff41d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 16 13:26:42 2014 -0400 Downgrade 'invalid result from curve25519 handshake: 4' warning Also, refactor the way we handle failed handshakes so that this warning doesn't propagate itself to "onion_skin_client_handshake failed" and "circuit_finish_handshake failed" and "connection_edge_process_relay_cell (at origin) failed." Resolves warning from 9635. --- changes/bug9635 | 3 +++ src/or/circuitbuild.c | 12 +++++++++--- src/or/command.c | 1 - src/or/onion.c | 24 +++++++++++++++--------- src/or/onion.h | 3 ++- src/or/onion_fast.c | 10 ++++++---- src/or/onion_fast.h | 3 ++- src/or/onion_ntor.c | 19 +++++++++++++++---- src/or/onion_ntor.h | 3 ++- src/or/onion_tap.c | 10 ++++++---- src/or/onion_tap.h | 3 ++- src/or/relay.c | 5 +++-- src/test/bench.c | 6 ++++-- src/test/test.c | 11 ++++++----- src/test/test_ntor_cl.c | 2 +- 15 files changed, 76 insertions(+), 39 deletions(-) diff --git a/changes/bug9635 b/changes/bug9635 new file mode 100644 index 0000000..17a2ea5 --- /dev/null +++ b/changes/bug9635 @@ -0,0 +1,3 @@ + o Downgraded warnings: + - Don't warn when we've attempted to contact a relay using the wrong + ntor onion key. Closes ticket 9635. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 897f90f..873eba1 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1256,8 +1256,10 @@ circuit_finish_handshake(origin_circuit_t *circ, crypt_path_t *hop; int rv; - if ((rv = pathbias_count_build_attempt(circ)) < 0) + if ((rv = pathbias_count_build_attempt(circ)) < 0) { + log_warn(LD_CIRC, "pathbias_count_build_attempt failed: %d", rv); return rv; + } if (circ->cpath->state == CPATH_STATE_AWAITING_KEYS) { hop = circ->cpath; @@ -1271,12 +1273,15 @@ circuit_finish_handshake(origin_circuit_t *circ, tor_assert(hop->state == CPATH_STATE_AWAITING_KEYS); { + const char *msg = NULL; if (onion_skin_client_handshake(hop->handshake_state.tag, &hop->handshake_state, reply->reply, reply->handshake_len, (uint8_t*)keys, sizeof(keys), - (uint8_t*)hop->rend_circ_nonce) < 0) { - log_warn(LD_CIRC,"onion_skin_client_handshake failed."); + (uint8_t*)hop->rend_circ_nonce, + &msg) < 0) { + if (msg) + log_warn(LD_CIRC,"onion_skin_client_handshake failed: %s", msg); return -END_CIRC_REASON_TORPROTOCOL; } } @@ -1284,6 +1289,7 @@ circuit_finish_handshake(origin_circuit_t *circ, onion_handshake_state_release(&hop->handshake_state); if (circuit_init_cpath_crypto(hop, keys, 0)<0) { + log_warn(LD_BUG, "Couldn't initialize cpath crypto"); return -END_CIRC_REASON_TORPROTOCOL; } diff --git a/src/or/command.c b/src/or/command.c index 1f6f93a..1f8d0ba 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -398,7 +398,6 @@ command_process_created_cell(cell_t *cell, channel_t *chan) log_debug(LD_OR,"at OP. Finishing handshake."); if ((err_reason = circuit_finish_handshake(origin_circ, &extended_cell.created_cell)) < 0) { - log_warn(LD_OR,"circuit_finish_handshake failed."); circuit_mark_for_close(circ, -err_reason); return; } diff --git a/src/or/onion.c b/src/or/onion.c index ae39f45..b5e801d 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -541,13 +541,15 @@ onion_skin_server_handshake(int type, * bytes worth of key material in <b>keys_out_len</b>, set * <b>rend_authenticator_out</b> to the "KH" field that can be used to * establish introduction points at this hop, and return 0. On failure, - * return -1. */ + * return -1, and set *msg_out to an error message if this is worth + * complaining to the usre about. */ int onion_skin_client_handshake(int type, const onion_handshake_state_t *handshake_state, const uint8_t *reply, size_t reply_len, uint8_t *keys_out, size_t keys_out_len, - uint8_t *rend_authenticator_out) + uint8_t *rend_authenticator_out, + const char **msg_out) { if (handshake_state->tag != type) return -1; @@ -555,12 +557,14 @@ onion_skin_client_handshake(int type, switch (type) { case ONION_HANDSHAKE_TYPE_TAP: if (reply_len != TAP_ONIONSKIN_REPLY_LEN) { - log_warn(LD_CIRC, "TAP reply was not of the correct length."); + if (msg_out) + *msg_out = "TAP reply was not of the correct length."; return -1; } if (onion_skin_TAP_client_handshake(handshake_state->u.tap, (const char*)reply, - (char *)keys_out, keys_out_len) < 0) + (char *)keys_out, keys_out_len, + msg_out) < 0) return -1; memcpy(rend_authenticator_out, reply+DH_KEY_LEN, DIGEST_LEN); @@ -568,11 +572,12 @@ onion_skin_client_handshake(int type, return 0; case ONION_HANDSHAKE_TYPE_FAST: if (reply_len != CREATED_FAST_LEN) { - log_warn(LD_CIRC, "CREATED_FAST reply was not of the correct length."); + if (msg_out) + *msg_out = "TAP reply was not of the correct length."; return -1; } if (fast_client_handshake(handshake_state->u.fast, reply, - keys_out, keys_out_len) < 0) + keys_out, keys_out_len, msg_out) < 0) return -1; memcpy(rend_authenticator_out, reply+DIGEST_LEN, DIGEST_LEN); @@ -580,15 +585,16 @@ onion_skin_client_handshake(int type, #ifdef CURVE25519_ENABLED case ONION_HANDSHAKE_TYPE_NTOR: if (reply_len < NTOR_REPLY_LEN) { - log_warn(LD_CIRC, "ntor reply was not of the correct length."); + if (msg_out) + *msg_out = "ntor reply was not of the correct length."; return -1; } { size_t keys_tmp_len = keys_out_len + DIGEST_LEN; uint8_t *keys_tmp = tor_malloc(keys_tmp_len); if (onion_skin_ntor_client_handshake(handshake_state->u.ntor, - reply, - keys_tmp, keys_tmp_len) < 0) { + reply, + keys_tmp, keys_tmp_len, msg_out) < 0) { tor_free(keys_tmp); return -1; } diff --git a/src/or/onion.h b/src/or/onion.h index d62f032..1a53896 100644 --- a/src/or/onion.h +++ b/src/or/onion.h @@ -51,7 +51,8 @@ int onion_skin_client_handshake(int type, const onion_handshake_state_t *handshake_state, const uint8_t *reply, size_t reply_len, uint8_t *keys_out, size_t key_out_len, - uint8_t *rend_authenticator_out); + uint8_t *rend_authenticator_out, + const char **msg_out); /** A parsed CREATE, CREATE_FAST, or CREATE2 cell. */ typedef struct create_cell_t { diff --git a/src/or/onion_fast.c b/src/or/onion_fast.c index 38b62de..30f60e8 100644 --- a/src/or/onion_fast.c +++ b/src/or/onion_fast.c @@ -92,7 +92,8 @@ int fast_client_handshake(const fast_handshake_state_t *handshake_state, const uint8_t *handshake_reply_out,/*DIGEST_LEN*2 bytes*/ uint8_t *key_out, - size_t key_out_len) + size_t key_out_len, + const char **msg_out) { uint8_t tmp[DIGEST_LEN+DIGEST_LEN]; uint8_t *out; @@ -104,13 +105,14 @@ fast_client_handshake(const fast_handshake_state_t *handshake_state, out_len = key_out_len+DIGEST_LEN; out = tor_malloc(out_len); if (crypto_expand_key_material_TAP(tmp, sizeof(tmp), out, out_len)) { - log_warn(LD_CIRC, "Failed to expand key material"); + if (msg_out) + *msg_out = "Failed to expand key material"; goto done; } if (tor_memneq(out, handshake_reply_out+DIGEST_LEN, DIGEST_LEN)) { /* H(K) does *not* match. Something fishy. */ - log_warn(LD_PROTOCOL,"Digest DOES NOT MATCH on fast handshake. " - "Bug or attack."); + if (msg_out) + *msg_out = "Digest DOES NOT MATCH on fast handshake. Bug or attack."; goto done; } memcpy(key_out, out+DIGEST_LEN, key_out_len); diff --git a/src/or/onion_fast.h b/src/or/onion_fast.h index 8c07837..e6c213e 100644 --- a/src/or/onion_fast.h +++ b/src/or/onion_fast.h @@ -32,7 +32,8 @@ int fast_server_handshake(const uint8_t *message_in, int fast_client_handshake(const fast_handshake_state_t *handshake_state, const uint8_t *handshake_reply_out, uint8_t *key_out, - size_t key_out_len); + size_t key_out_len, + const char **msg_out); #endif diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index ef501f6..32d5344 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -3,8 +3,8 @@ #include "orconfig.h" -#include "crypto.h" #define ONION_NTOR_PRIVATE +#include "crypto.h" #include "onion_ntor.h" #include "torlog.h" #include "util.h" @@ -226,7 +226,8 @@ onion_skin_ntor_client_handshake( const ntor_handshake_state_t *handshake_state, const uint8_t *handshake_reply, uint8_t *key_out, - size_t key_out_len) + size_t key_out_len, + const char **msg_out) { const tweakset_t *T = &proto1_tweaks; /* Sensitive stack-allocated material. Kept in an anonymous struct to make @@ -291,8 +292,18 @@ onion_skin_ntor_client_handshake( memwipe(&s, 0, sizeof(s)); - if (bad) { - log_warn(LD_PROTOCOL, "Invalid result from curve25519 handshake: %d", bad); + if (bad && msg_out) { + if (bad & 4) { + *msg_out = NULL; /* Don't report this one; we probably just had the + * wrong onion key.*/ + log_fn(LOG_INFO, LD_PROTOCOL, + "Invalid result from curve25519 handshake: %d", bad); + } + if (bad & 3) { + *msg_out = "Zero output from curve25519 handshake"; + log_fn(LOG_WARN, LD_PROTOCOL, + "Invalid result from curve25519 handshake: %d", bad); + } } return bad ? -1 : 0; diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h index c942e6e..3fd6c88 100644 --- a/src/or/onion_ntor.h +++ b/src/or/onion_ntor.h @@ -37,7 +37,8 @@ int onion_skin_ntor_client_handshake( const ntor_handshake_state_t *handshake_state, const uint8_t *handshake_reply, uint8_t *key_out, - size_t key_out_len); + size_t key_out_len, + const char **msg_out); #ifdef ONION_NTOR_PRIVATE diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c index 65f8275..668c48c 100644 --- a/src/or/onion_tap.c +++ b/src/or/onion_tap.c @@ -183,7 +183,8 @@ int onion_skin_TAP_client_handshake(crypto_dh_t *handshake_state, const char *handshake_reply, /* TAP_ONIONSKIN_REPLY_LEN bytes */ char *key_out, - size_t key_out_len) + size_t key_out_len, + const char **msg_out) { ssize_t len; char *key_material=NULL; @@ -196,14 +197,15 @@ onion_skin_TAP_client_handshake(crypto_dh_t *handshake_state, handshake_reply, DH_KEY_LEN, key_material, key_material_len); if (len < 0) { - log_warn(LD_PROTOCOL,"DH computation failed."); + if (msg_out) + *msg_out = "DH computation failed."; goto err; } if (tor_memneq(key_material, handshake_reply+DH_KEY_LEN, DIGEST_LEN)) { /* H(K) does *not* match. Something fishy. */ - log_warn(LD_PROTOCOL,"Digest DOES NOT MATCH on onion handshake. " - "Bug or attack."); + if (msg_out) + *msg_out = "Digest DOES NOT MATCH on onion handshake. Bug or attack."; goto err; } diff --git a/src/or/onion_tap.h b/src/or/onion_tap.h index b978b66..3b23d62 100644 --- a/src/or/onion_tap.h +++ b/src/or/onion_tap.h @@ -31,7 +31,8 @@ int onion_skin_TAP_server_handshake(const char *onion_skin, int onion_skin_TAP_client_handshake(crypto_dh_t *handshake_state, const char *handshake_reply, char *key_out, - size_t key_out_len); + size_t key_out_len, + const char **msg_out); #endif diff --git a/src/or/relay.c b/src/or/relay.c index 9407df0..73961de 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1643,8 +1643,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } if ((reason = circuit_finish_handshake(TO_ORIGIN_CIRCUIT(circ), &extended_cell.created_cell)) < 0) { - log_warn(domain,"circuit_finish_handshake failed."); - return reason; + circuit_mark_for_close(circ, -reason); + return 0; /* We don't want to cause a warning, so we mark the circuit + * here. */ } } if ((reason=circuit_send_next_onion_skin(TO_ORIGIN_CIRCUIT(circ)))<0) { diff --git a/src/test/bench.c b/src/test/bench.c index f6c3362..fd374b5 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -162,7 +162,8 @@ bench_onion_TAP(void) char key_out[CPATH_KEY_MATERIAL_LEN]; int s; dh = crypto_dh_dup(dh_out); - s = onion_skin_TAP_client_handshake(dh, or, key_out, sizeof(key_out)); + s = onion_skin_TAP_client_handshake(dh, or, key_out, sizeof(key_out), + NULL); crypto_dh_free(dh); tor_assert(s == 0); } @@ -222,7 +223,8 @@ bench_onion_ntor(void) for (i = 0; i < iters; ++i) { uint8_t key_out[CPATH_KEY_MATERIAL_LEN]; int s; - s = onion_skin_ntor_client_handshake(state, or, key_out, sizeof(key_out)); + s = onion_skin_ntor_client_handshake(state, or, key_out, sizeof(key_out), + NULL); tor_assert(s == 0); } end = perftime(); diff --git a/src/test/test.c b/src/test/test.c index 8bce9c9..e6f79a6 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -264,7 +264,8 @@ test_onion_handshake(void) /* client handshake 2 */ memset(c_keys, 0, 40); - test_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + test_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, + NULL)); test_memeq(c_keys, s_keys, 40); memset(s_buf, 0, 40); @@ -337,18 +338,18 @@ test_bad_onion_handshake(void *arg) /* Client: Case 1: The server sent back junk. */ s_buf[64] ^= 33; tt_int_op(-1, ==, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); s_buf[64] ^= 33; /* Let the client finish; make sure it can. */ tt_int_op(0, ==, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); test_memeq(s_keys, c_keys, 40); /* Client: Case 2: The server sent back a degenerate DH. */ memset(s_buf, 0, sizeof(s_buf)); tt_int_op(-1, ==, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); done: crypto_dh_free(c_dh); @@ -398,7 +399,7 @@ test_ntor_handshake(void *arg) /* client handshake 2 */ memset(c_keys, 0, 40); tt_int_op(0, ==, onion_skin_ntor_client_handshake(c_state, s_buf, - c_keys, 400)); + c_keys, 400, NULL)); test_memeq(c_keys, s_keys, 400); memset(s_buf, 0, 40); diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index f2b7a72..6103e80 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -130,7 +130,7 @@ client2(int argc, char **argv) keys = tor_malloc(keybytes); hexkeys = tor_malloc(keybytes*2+1); - if (onion_skin_ntor_client_handshake(&state, msg, keys, keybytes)<0) { + if (onion_skin_ntor_client_handshake(&state, msg, keys, keybytes, NULL)<0) { fprintf(stderr, "handshake failed"); result = 2; goto done;

1 0