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

[stem/master] Pyflakes and PEP8 corrections
by atagar＠torproject.org 07 Jul '13

07 Jul '13

commit 5cd89263f0acc5a7b6fcdd4021efa09a4f1634ab Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 4 13:41:22 2013 -0700 Pyflakes and PEP8 corrections After upgrading both they each complained about a few new things. Mostly pyflakes getting confused by pydoc comments, but there were a couple fair catches. --- stem/util/conf.py | 2 +- test/settings.cfg | 2 ++ test/unit/descriptor/networkstatus/document_v3.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 14cc306..f897aac 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -299,7 +299,7 @@ def parse_enum_csv(key, value, enumeration, count = None): raise ValueError("The count must be None, an int, or two value tuple. Got '%s' (%s)'" % (count, type(count))) result = [] - enum_keys = [key.upper() for key in enumeration.keys()] + enum_keys = [k.upper() for k in enumeration.keys()] enum_values = list(enumeration) for val in values: diff --git a/test/settings.cfg b/test/settings.cfg index 96fc407..16d8c8b 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -129,6 +129,7 @@ pep8.ignore E127 # False positives from pyflakes. These are mappings between the path and the # issue. +pyflakes.ignore stem/control.py => undefined name 'control' pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'mock' imported but unused @@ -137,6 +138,7 @@ pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDi pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes_impl' from line 51 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode_impl' from line 57 pyflakes.ignore test/mocking.py => undefined name 'builtins' +pyflakes.ignore test/mocking.py => undefined name 'test' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names # Test modules we want to run. Modules are roughly ordered by the dependencies diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 366b516..ece95de 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -220,7 +220,9 @@ class TestNetworkStatusDocument(unittest.TestCase): for index in xrange(len(lines) - 1): # once we reach the crypto blob we're done since swapping those won't # be detected - if lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): break + + if lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): + break # swaps this line with the one after it test_lines = list(lines)

1 0

[stem/master] Typo in descriptor reader pydocs
by atagar＠torproject.org 07 Jul '13

07 Jul '13

commit b6c23b0c2934b6c1b1c51530754cc48f6ef4e38e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 7 13:35:50 2013 -0700 Typo in descriptor reader pydocs Correction from Roger. Honestly I had to look this one up. Both 'run' and 'ran' sound right when I read them to myself. Oh well, grammar is most certainly not my strong suit. --- stem/descriptor/reader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 236c963..1723929 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -25,11 +25,11 @@ content. To be notified of skipped files you can register a listener with The :class:`~stem.descriptor.reader.DescriptorReader` keeps track of the last modified timestamps for descriptor files that it has read so it can skip -unchanged files if ran again. This listing of processed files can also be +unchanged files if run again. This listing of processed files can also be persisted and applied to other :class:`~stem.descriptor.reader.DescriptorReader` instances. For example, the following prints descriptors as they're changed over the course of a minute, -and picks up where it left off if ran again... +and picks up where it left off if run again... ::

1 0

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

07 Jul '13

commit 7d5dcb32c90bb8cfdd878492068f563bfdb42a8f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 19:16:15 2013 +0000 Update translations for tails-greeter_completed --- hr_HR/hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 2ac2a2f..c4e0481 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-07-07 18:44+0000\n" +"PO-Revision-Date: 2013-07-07 18:50+0000\n" "Last-Translator: cisterna <jan.lovrinic(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Jul '13

07 Jul '13

commit f4723202437d6cb4da3a0dc53d9edf636a551a12 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 19:16:12 2013 +0000 Update translations for tails-greeter --- hr_HR/hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 2ac2a2f..c4e0481 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-07-07 18:44+0000\n" +"PO-Revision-Date: 2013-07-07 18:50+0000\n" "Last-Translator: cisterna <jan.lovrinic(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Jul '13

commit 8ab43d0ce45e8d5d49affb8cc563bd1182d399a2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 18:46:20 2013 +0000 Update translations for tails-greeter_completed --- hr_HR/hr_HR.po | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po new file mode 100644 index 0000000..2ac2a2f --- /dev/null +++ b/hr_HR/hr_HR.po @@ -0,0 +1,139 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# cisterna <jan.lovrinic(a)gmail.com>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2013-07-07 18:44+0000\n" +"Last-Translator: cisterna <jan.lovrinic(a)gmail.com>\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" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Naprijed" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "Prijava" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Dobrodošli u Tails" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "Koristi perzistenciju?" + +#: ../glade/persistencewindow.glade.h:5 +msgid "Yes" +msgstr "Da" + +#: ../glade/persistencewindow.glade.h:6 +msgid "No" +msgstr "Ne" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Passphrase:" +msgstr "Lozinka:" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Read-Only?" +msgstr "Samo za čitanje?" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "Pogrešna lozinka. Molimo pokušajte ponovno." + +#: ../glade/persistencewindow.glade.h:10 +msgid "More options?" +msgstr "Više opcija?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Administracijska lozinka" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Unesite administracijsku lozinku u slučaju da trebate izvršavati administracijske zadatke.\nU suprotnom, bit će onemogućena za pojačanu sigurnost." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Lozinka:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Potvrdite lozinku:" + +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "Lozinke se ne podudaraju" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows maskiranje" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Ova opcija omogućuje da Tails izgleda više kao Microsoft Windows XP. To može biti korisno na javnim mjestima radi izbjegavanja privlačenja sumnje." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Uključi Microsoft Windows XP maskiranje" + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Jezik" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Mjesto" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Izgled" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-perzistencija nije uspjela, kod greške %(returncode)s:⏎\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup nije uspio, kod greške %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-perzistencija nije uspjela, kod greške %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Ostalo..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Jul '13

07 Jul '13

commit b35a512eb6c898f4d9e9ad570e79860edf06eef6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 18:46:18 2013 +0000 Update translations for tails-greeter --- hr_HR/hr_HR.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 412ba70..2ac2a2f 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# cisterna <jan.lovrinic(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2012-10-03 17:36+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-07-07 18:44+0000\n" +"Last-Translator: cisterna <jan.lovrinic(a)gmail.com>\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" @@ -23,15 +24,15 @@ msgstr "Naprijed" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" -msgstr "" +msgstr "Prijava" #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" -msgstr "" +msgstr "Dobrodošli u Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "Koristi perzistenciju?" #: ../glade/persistencewindow.glade.h:5 msgid "Yes" @@ -43,29 +44,29 @@ msgstr "Ne" #: ../glade/persistencewindow.glade.h:7 msgid "Passphrase:" -msgstr "" +msgstr "Lozinka:" #: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" -msgstr "" +msgstr "Samo za čitanje?" #: ../glade/persistencewindow.glade.h:9 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "Pogrešna lozinka. Molimo pokušajte ponovno." #: ../glade/persistencewindow.glade.h:10 msgid "More options?" -msgstr "" +msgstr "Više opcija?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "Administracijska lozinka" #: ../glade/optionswindow.glade.h:4 msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "Unesite administracijsku lozinku u slučaju da trebate izvršavati administracijske zadatke.\nU suprotnom, bit će onemogućena za pojačanu sigurnost." #: ../glade/optionswindow.glade.h:6 msgid "Password:" @@ -73,29 +74,29 @@ msgstr "Lozinka:" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "" +msgstr "Potvrdite lozinku:" #: ../glade/optionswindow.glade.h:8 msgid "Passwords do not match" -msgstr "" +msgstr "Lozinke se ne podudaraju" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" -msgstr "" +msgstr "Windows maskiranje" #: ../glade/optionswindow.glade.h:10 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "Ova opcija omogućuje da Tails izgleda više kao Microsoft Windows XP. To može biti korisno na javnim mjestima radi izbjegavanja privlačenja sumnje." #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "" +msgstr "Uključi Microsoft Windows XP maskiranje" #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" @@ -103,18 +104,18 @@ msgstr "Jezik" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "Mjesto" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "Izgled" #: ../GdmGreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-perzistencija nije uspjela, kod greške %(returncode)s:⏎\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -122,7 +123,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "cryptsetup nije uspio, kod greške %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format @@ -130,9 +131,9 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-perzistencija nije uspjela, kod greške %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "Ostalo..."

1 0

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

07 Jul '13

commit ce7f3593a60b6059505d6189e025f0e807ae953a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 18:46:13 2013 +0000 Update translations for tails-persistence-setup --- hr_HR/hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 28a0439..399fbc3 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -217,7 +217,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Lozinka:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:"

1 0

[onionoo/master] Omit "flags" field if a relay or bridge has no flags.
by karsten＠torproject.org 07 Jul '13

07 Jul '13

commit 885f040cc42ca7592e60e1009e2e953f18d6f4da Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 7 17:28:22 2013 +0200 Omit "flags" field if a relay or bridge has no flags. So far, we parsed the empty string as single flag called "". This is a bug. We need to omit the "flags" field in this case. --- src/org/torproject/onionoo/NodeStatus.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/onionoo/NodeStatus.java b/src/org/torproject/onionoo/NodeStatus.java index 81e5c7f..4f207a0 100644 --- a/src/org/torproject/onionoo/NodeStatus.java +++ b/src/org/torproject/onionoo/NodeStatus.java @@ -158,8 +158,10 @@ public class NodeStatus extends Document { getTime(); orPort = Integer.parseInt(parts[6]); dirPort = Integer.parseInt(parts[7]); - relayFlags = new TreeSet<String>( - Arrays.asList(parts[8].split(","))); + relayFlags = new TreeSet<String>(); + if (parts[8].length() > 0) { + relayFlags.addAll(Arrays.asList(parts[8].split(","))); + } if (parts.length > 9) { consensusWeight = Long.parseLong(parts[9]); }

1 0

[onionoo/master] Fix "running" fields in summary and details documents.
by karsten＠torproject.org 07 Jul '13

07 Jul '13

commit 176497eea359655b99698cd603081a0e1f4965dc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 7 17:13:21 2013 +0200 Fix "running" fields in summary and details documents. We say that a bridge is "running" if it's contained in the bridge network status, but it also needs the "Running" flag. This worked fine for relays, because only running relays are contained in the consensus, but bridge network statuses may contain non-running bridges. We should require the "Running" flag for both relays and bridges, just in case we fall back to a consensus method that contains non-running relays. Fixes #9198. --- src/org/torproject/onionoo/NodeDataWriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/onionoo/NodeDataWriter.java b/src/org/torproject/onionoo/NodeDataWriter.java index 69ce01b..723dd16 100644 --- a/src/org/torproject/onionoo/NodeDataWriter.java +++ b/src/org/torproject/onionoo/NodeDataWriter.java @@ -145,11 +145,11 @@ public class NodeDataWriter implements DescriptorListener { public void setRunningBits() { for (NodeStatus node : this.knownNodes.values()) { - if (node.isRelay() && + if (node.isRelay() && node.getRelayFlags().contains("Running") && node.getLastSeenMillis() == this.relaysLastValidAfterMillis) { node.setRunning(true); } - if (!node.isRelay() && + if (!node.isRelay() && node.getRelayFlags().contains("Running") && node.getLastSeenMillis() == this.bridgesLastPublishedMillis) { node.setRunning(true); }

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Jul '13

07 Jul '13

commit a61cbf54d61217a8a4e21937434411ad172d99eb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 16:46:30 2013 +0000 Update translations for tor-launcher-network-settings_completed --- hr_HR/network-settings.dtd | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd new file mode 100644 index 0000000..78991bc --- /dev/null +++ b/hr_HR/network-settings.dtd @@ -0,0 +1,54 @@ +<!ENTITY torsettings.dialog.title "Tor mrežne postavke"> + + + +<!ENTITY torsettings.prompt "Prije nego se Tor preglednički paket pokuša spojiti na Tor mrežu, trebate pružiti informacije o internetskoj vezi ovog računala."> + +<!ENTITY torSettings.yes "Da"> +<!ENTITY torSettings.no "Ne"> + +<!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> +<!ENTITY torSettings.configurePrompt1 "Internetska veza ovog računala je cenzurirana, filtrirana ili prolazi kroz proxy."> +<!ENTITY torSettings.configurePrompt2 "Trebam podesiti mrežne postavke."> +<!ENTITY torSettings.configure "Podesi"> +<!ENTITY torSettings.connectPrompt1 "Internetska veza ovog računala je neometana."> +<!ENTITY torSettings.connectPrompt2 "Želim se izravno spojiti na Tor mrežu."> +<!ENTITY torSettings.connect "Spajanje"> + +<!ENTITY torSettings.proxyQuestion "Koristi li ovo računalo proxy za pristup Internetu?"> + +<!ENTITY torSettings.proxyHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku i provjerite je li podešen za korištenje proxyja."> +<!ENTITY torSettings.enterProxy "Unesite postavke proxyja."> +<!ENTITY torSettings.firewallQuestion "Prolazi li Internet veza ovog računala kroz vatrozid koji dopušta spajanje samo na određene portove?"> +<!ENTITY torSettings.firewallHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite "Ne". Ako uočite probleme pri spajanju na Tor mrežu, promijenite ovu postavku."> +<!ENTITY torSettings.enterFirewall "Unesite popis portova, odvojenih zarezom, koji su dopušteni na vatrozidu."> +<!ENTITY torSettings.bridgeQuestion "Ukoliko je internetska veza ovog računala cenzurirana, trebat ćete dobaviti i koristiti bridge releje.&#160; U suprotnom, samo kliknite na Spoji."> + + + +<!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene..."> + +<!ENTITY torsettings.optional "Opcionalno"> + +<!ENTITY torsettings.useProxy.checkbox "Ovo računalo koristi proxy za pristup internetu."> +<!ENTITY torsettings.useProxy.type "Tip proxyja:"> +<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname"> +<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.username "Korisničko ime:"> +<!ENTITY torsettings.useProxy.password "Lozinka:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove"> +<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> +<!ENTITY torsettings.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži"> +<!ENTITY torsettings.useBridges.label "Unesite jednog ili više bridge releja u obliku adresa:port"> +<!ENTITY torsettings.useBridges.placeholder "adresa:port"> + +<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> +<!ENTITY torsettings.bridgeHelpTitle "Pomoć za bridge relej"> +<!ENTITY torsettings.bridgeHelp1 "Ako se ne možete spojiti na Tor mrežu, moguće je da Vaš pružatelj Internet usluga (ISP) ili druga organizacija blokira Tor.&#160; Taj se problem često može riješiti korištenjem Tor bridge releja, skrivenih releja koje je teže blokirati."> +<!ENTITY torsettings.bridgeHelp2 "Da biste dobavili bridge releje, upotrijebite web preglednik i posjetite sljedeću stranicu: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Drugi način za pronalazak adresa javnih bridge releja je slanje emaila koji sadrži samo liniju "get bridges" u tijelu poruke na bridges(a)torproject.org.&#160; Međutim, da bismo otežali napadaču da dozna puno adresa bridge releja, ovaj zahtjev mora biti poslan s email adrese na jednoj od sljedećih domena: gmail.com ili yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "Također, možete zatražiti bridge releje slanjem emaila na help(a)rt.torproject.org.">

1 0