January 2012 - tor-commits - lists.torproject.org

[metrics-lib/master] Skip lines in server descriptors starting with @.
by karsten＠torproject.org 08 Jan '12

08 Jan '12

commit d8c21b3cf8581a888ea0869713c8cb446325eb88 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 8 16:53:14 2012 +0100 Skip lines in server descriptors starting with @. --- .../torproject/descriptor/impl/DescriptorImpl.java | 2 +- .../descriptor/impl/RelayServerDescriptorImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index d337630..8165d69 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -72,7 +72,7 @@ public abstract class DescriptorImpl implements Descriptor { skipCrypto = true; } else if (line.startsWith("-----END")) { skipCrypto = false; - } else if (!skipCrypto) { + } else if (!line.startsWith("@") && !skipCrypto) { String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; String keyword = lineNoOpt.split(" ", -1)[0]; diff --git a/src/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java index aa984fe..472a2bc 100644 --- a/src/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/RelayServerDescriptorImpl.java @@ -69,6 +69,9 @@ public class RelayServerDescriptorImpl extends DescriptorImpl String line; boolean skipCrypto = false; while ((line = br.readLine()) != null) { + if (line.startsWith("@")) { + continue; + } String lineNoOpt = line.startsWith("opt ") ? line.substring("opt ".length()) : line; String[] partsNoOpt = lineNoOpt.split(" ");

1 0

[metrics-lib/master] Detect relay descriptor type from first lines.
by karsten＠torproject.org 08 Jan '12

08 Jan '12

commit ee1976649c74cb408dd7d6d334acc95e4e71c417 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 8 16:55:56 2012 +0100 Detect relay descriptor type from first lines. --- .../torproject/descriptor/impl/DescriptorImpl.java | 37 ++++++++++++++++++++ .../descriptor/impl/RelayDescriptorReaderImpl.java | 26 +------------- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 8165d69..cade4cf 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -14,6 +14,43 @@ import org.torproject.descriptor.Descriptor; public abstract class DescriptorImpl implements Descriptor { + protected static List<Descriptor> parseRelayDescriptors( + byte[] rawDescriptorBytes) throws DescriptorParseException { + List<Descriptor> parsedDescriptors = new ArrayList<Descriptor>(); + byte[] first100Chars = new byte[Math.min(100, + rawDescriptorBytes.length)]; + System.arraycopy(rawDescriptorBytes, 0, first100Chars, 0, + first100Chars.length); + String firstLines = new String(first100Chars); + if (firstLines.startsWith("network-status-version 3\n") || + firstLines.contains("\nnetwork-status-version 3\n")) { + if (firstLines.contains("\nvote-status consensus\n")) { + parsedDescriptors.addAll(RelayNetworkStatusConsensusImpl. + parseConsensuses(rawDescriptorBytes)); + } else if (firstLines.contains("\nvote-status consensus\n")) { + parsedDescriptors.addAll(RelayNetworkStatusVoteImpl. + parseVotes(rawDescriptorBytes)); + } else { + throw new DescriptorParseException("Could not detect relay " + + "network status type in descriptor starting with '" + + firstLines + "'."); + } + } else if (firstLines.startsWith("router ") || + firstLines.contains("\nrouter ")) { + parsedDescriptors.addAll(RelayServerDescriptorImpl. + parseDescriptors(rawDescriptorBytes)); + } else if (firstLines.startsWith("extra-info ") || + firstLines.contains("\nextra-info ")) { + parsedDescriptors.addAll(RelayExtraInfoDescriptorImpl. + parseDescriptors(rawDescriptorBytes)); + } else { + throw new DescriptorParseException("Could not detect relay " + + "descriptor type in descriptor starting with '" + firstLines + + "'."); + } + return parsedDescriptors; + } + protected static List<byte[]> splitRawDescriptorBytes( byte[] rawDescriptorBytes, String startToken) { List<byte[]> rawDescriptors = new ArrayList<byte[]>(); diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java index f0efbb3..b0e2b81 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java @@ -110,31 +110,7 @@ public class RelayDescriptorReaderImpl implements RelayDescriptorReader { } bis.close(); byte[] rawDescriptorBytes = baos.toByteArray(); - /* TODO This consensus/vote detection is a hack. */ - boolean isConsensus = false; - if (file.getName().contains("consensus")) { - isConsensus = true; - } else if (file.getName().contains("vote")) { - } else { - throw new RuntimeException("Unknown descriptor type in '" - + file.getAbsolutePath() + "."); - } - return this.parseDescriptors(rawDescriptorBytes, isConsensus); - } - private List<Descriptor> parseDescriptors(byte[] rawDescriptorBytes, - boolean isConsensus) throws DescriptorParseException { - List<Descriptor> parsedDescriptors = new ArrayList<Descriptor>(); - if (isConsensus) { - List<RelayNetworkStatusConsensus> parsedConsensuses = - RelayNetworkStatusConsensusImpl.parseConsensuses( - rawDescriptorBytes); - parsedDescriptors.addAll(parsedConsensuses); - } else { - List<RelayNetworkStatusVote> parsedVotes = - RelayNetworkStatusVoteImpl.parseVotes(rawDescriptorBytes); - parsedDescriptors.addAll(parsedVotes); - } - return parsedDescriptors; + return DescriptorImpl.parseRelayDescriptors(rawDescriptorBytes); } } }

1 0

[metrics-lib/master] Start defining the bridge status interface.
by karsten＠torproject.org 08 Jan '12

08 Jan '12

commit 5114da288f7f1ce82efadd68d562236cf5116138 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 8 21:11:39 2012 +0100 Start defining the bridge status interface. --- .../torproject/descriptor/BridgeNetworkStatus.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/descriptor/BridgeNetworkStatus.java b/src/org/torproject/descriptor/BridgeNetworkStatus.java index d3ed347..31dfd47 100644 --- a/src/org/torproject/descriptor/BridgeNetworkStatus.java +++ b/src/org/torproject/descriptor/BridgeNetworkStatus.java @@ -2,6 +2,14 @@ * See LICENSE for licensing information */ package org.torproject.descriptor; +import java.util.SortedMap; + public interface BridgeNetworkStatus extends Descriptor { + + /* Return the published time in milliseconds. */ + public long getPublishedMillis(); + + /* Return status entries, one for each contained bridge. */ + public SortedMap<String, NetworkStatusEntry> getStatusEntries(); }

1 0

[tordnsel/master] fix up the man page paths.
by andrew＠torproject.org 08 Jan '12

08 Jan '12

commit 7b2fe7179c607742bde9e920a04aefa527c83632 Author: phobos <phobos@kilik> Date: Sun Jan 8 15:05:57 2012 -0500 fix up the man page paths. --- doc/tordnsel.8 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/tordnsel.8 b/doc/tordnsel.8 index e53c646..e49ec22 100644 --- a/doc/tordnsel.8 +++ b/doc/tordnsel.8 @@ -174,13 +174,13 @@ closing and reopening logs. .SH FILES .TP -\fB/etc/tordnsel.conf\fP +\fB/srv/tordnsel/tordnsel.conf\fP The configuration file, which contains "option value" pairs. .TP -\fB/var/lib/tordnsel/state\fP +\fB/srv/tordnsel/state\fP The state directory where test results are stored. .TP -\fB/var/run/tordnsel\fP +\fB/srv/tordnsel/run\fP The runtime directory where statistics and reconfigure sockets are located. .TP \fIStateDirectory\fR\fB/exit-addresses\fR and \fBexit-addresses.new\fP

1 0

[tordnsel/master] migrate from system var to self-contained /srv/tordnsel
by andrew＠torproject.org 08 Jan '12

08 Jan '12

commit 17b6b6babe5adaed998abc06e12e89182797dc56 Author: phobos <phobos@kilik> Date: Sun Jan 8 14:54:47 2012 -0500 migrate from system var to self-contained /srv/tordnsel --- src/TorDNSEL/Config/Tests.hs | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/TorDNSEL/Config/Tests.hs b/src/TorDNSEL/Config/Tests.hs index 382acb9..54460a0 100644 --- a/src/TorDNSEL/Config/Tests.hs +++ b/src/TorDNSEL/Config/Tests.hs @@ -28,26 +28,26 @@ tests = TestList . map TestCase $ config' = toConfig [ "User" ~> "nobody" - , "ConfigFile" ~> "/etc/tordnsel.conf" ] + , "ConfigFile" ~> "/srv/tordnsel/tordnsel.conf" ] -configArgs = ["--User", "nobody", "-f", "/etc/tordnsel.conf"] +configArgs = ["--User", "nobody", "-f", "/srv/tordnsel/tordnsel.conf"] config = toConfig [ "ZoneOfAuthority" ~> "exitlist.example.com." , "DomainName" ~> "exitlist-ns.example.com." , "SOARName" ~> "hostmaster.example.com." , "StateDirectory" ~> "/state" - , "RuntimeDirectory" ~> "/var/run/tordnsel" + , "RuntimeDirectory" ~> "/srv/tordnsel/run/" , "DNSListenAddress" ~> "127.0.0.1:53" , "Address" ~> "10.0.0.1" , "TorControlAddress" ~> "127.0.0.1:9051" , "TorControlPassword" ~> "password" - , "Log" ~> "notice file /var/log/tordnsel/log" + , "Log" ~> "notice file /srv/tordnsel/log/" , "RunAsDaemon" ~> "True" , "User" ~> "tordnsel" , "Group" ~> "tordnsel" - , "ChangeRootDirectory" ~> "/var/lib/tordnsel" - , "PIDFile" ~> "/var/run/tordnsel.pid" + , "ChangeRootDirectory" ~> "/srv/tordnsel/" + , "PIDFile" ~> "/srv/tordnsel/run/tordnsel.pid" , "EnableActiveTesting" ~> "True" , "TorSocksAddress" ~> "127.0.0.1:9050" , "TestListenAddress" ~> "10.0.0.1:80,443,110,53,22,5190,6667,9030" @@ -77,14 +77,14 @@ configFile = \\n\ \## Store exit test results in this directory. This should be an absolute\n\ \## path accessible inside the chroot (if one is configured).\n\ - \#StateDirectory /var/lib/tordnsel/state\n\ + \#StateDirectory /srv/tordnsel/state\n\ \## This line is equivalent to the previous line if you've specified\n\ - \## ChangeRootDirectory as /var/lib/tordnsel.\n\ + \## ChangeRootDirectory as /srv/tordnsel.\n\ \StateDirectory /state\n\ \\n\ \## Place the statistics and reconfigure sockets in this directory before\n\ \## chrooting or dropping privileges.\n\ - \RuntimeDirectory /var/run/tordnsel\n\ + \RuntimeDirectory /srv/tordnsel/run/\n\ \\n\ \################ Optional options #########################################\n\ \##\n\ @@ -121,7 +121,7 @@ configFile = \#Log notice stdout\n\ \#Log info stderr\n\ \#Log warn syslog\n\ - \Log notice file /var/log/tordnsel/log\n\ + \Log notice file /srv/tordnsel/log/\n\ \\n\ \## Detach from the controlling terminal and run in the background as a\n\ \## daemon. The default is \"False\".\n\ @@ -137,11 +137,11 @@ configFile = \\n\ \## Call chroot(2) to change our root directory. This option also requires\n\ \## root privileges.\n\ - \ChangeRootDirectory /var/lib/tordnsel\n\ + \ChangeRootDirectory /srv/tordnsel\n\ \\n\ \## Write our PID to the specified file before chrooting or dropping\n\ \## privileges. This file won't be removed on exit.\n\ - \PIDFile /var/run/tordnsel.pid\n\ + \PIDFile /srv/tordnsel/run/tordnsel.pid\n\ \\n\ \################ Active testing options ###################################\n\ \##\n\

1 0

[tordnsel/master] fix the paths for the sample file, as tordnsel should not be run as root nor as a system service.
by andrew＠torproject.org 08 Jan '12

08 Jan '12

commit 0b4719a79a12f0b1f4bcf08c73683cfe3246e405 Author: phobos <phobos@kilik> Date: Sun Jan 8 14:47:16 2012 -0500 fix the paths for the sample file, as tordnsel should not be run as root nor as a system service. --- config/tordnsel.conf.sample | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/tordnsel.conf.sample b/config/tordnsel.conf.sample index 7cf8895..a6b5b2a 100644 --- a/config/tordnsel.conf.sample +++ b/config/tordnsel.conf.sample @@ -21,14 +21,14 @@ ## Store exit test results in this directory. This should be an absolute ## path accessible inside the chroot (if one is configured). -#StateDirectory /var/lib/tordnsel/state +#StateDirectory /srv/tordnsel/state ## This line is equivalent to the previous line if you've specified ## ChangeRootDirectory as /var/lib/tordnsel. #StateDirectory /state ## Place the statistics and reconfigure sockets in this directory before ## chrooting or dropping privileges. -#RuntimeDirectory /var/run/tordnsel +#RuntimeDirectory /srv/tordnsel/tordnsel ################ Optional options ######################################### ## @@ -65,7 +65,7 @@ #Log notice stdout #Log info stderr #Log warn syslog -#Log notice file /var/log/tordnsel/log +#Log notice file /srv/tordnsel/log ## Detach from the controlling terminal and run in the background as a ## daemon. The default is "False". @@ -81,11 +81,11 @@ ## Call chroot(2) to change our root directory. This option also requires ## root privileges. -#ChangeRootDirectory /var/lib/tordnsel +#ChangeRootDirectory /srv/tordnsel/root ## Write our PID to the specified file before chrooting or dropping ## privileges. This file won't be removed on exit. -#PIDFile /var/run/tordnsel.pid +#PIDFile /srv/tordnsel/run/tordnsel.pid ################ Active testing options ################################### ##

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit e59bef87508ff9ff80d9617cab221647fc683426 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 19:45:17 2012 +0000 Update translations for vidalia --- fi/vidalia_fi.po | 73 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 29 deletions(-) diff --git a/fi/vidalia_fi.po b/fi/vidalia_fi.po index 7a1c4b9..83246b0 100644 --- a/fi/vidalia_fi.po +++ b/fi/vidalia_fi.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-08 19:13+0000\n" +"PO-Revision-Date: 2012-01-08 19:32+0000\n" "Last-Translator: morso <debris(a)riseup.net>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -140,7 +140,7 @@ msgstr "Valitse kansio, johon Tor-ohjelman tiedot tallennetaan" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor:in hallinta" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" @@ -152,7 +152,7 @@ msgstr "Polku:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "Käytä Unix domain socketia (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc" @@ -160,7 +160,7 @@ msgstr "Muokkaa nykyistä torrc:ta" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "HUOM: tämä muuttaa ladattuna olevaa torrc:ta" +msgstr "HUOM: tämä muuttaa nyt ladattuna olevaa torrc:ta" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -196,7 +196,7 @@ msgstr "Tor-asetustiedosto (torrc);;Kaikki tiedostot (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "Valitse tiedosto, jota käytetään Tor-socketin polkuna" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -1600,27 +1600,27 @@ msgstr "Tuntematon" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Debug" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Tietoa" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Huomautus" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Varoitus" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Virhe" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Tuntematon" msgctxt "MainWindow" msgid "Start Tor" @@ -2098,6 +2098,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Kaikkea tämän yhteyden yli lähetettyä voidaan tarkkailla. Tarkista " +"sovelluksesi asetukset ja käytä vain kryptattuja protokollia, kuten SSL:ää, " +"jos mahdollista." msgctxt "MainWindow" msgid "failed (%1)" @@ -2403,15 +2406,15 @@ msgstr "Tallenna automaattisesti uudet tapahtumat tiedostoon" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Yksinkertainen" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor tila" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Edistynyt" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2698,31 +2701,31 @@ msgstr "Napsauta \"Ohje\"-painiketta nähdäksesi muita tapoja löytää siltoja msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Osoite:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Tyyppi" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Sinun on valittava välityspalvelimen tyyppi." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3159,7 +3162,7 @@ msgstr "<a href=\"#bridgeUsage\">Kuka on käyttänyt reititintäni?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Mikä tämä on?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3266,19 +3269,19 @@ msgstr "Tor on luonut" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Kopioi leikepöydälle" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor-ohjelma on käynnissä" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Käytät parhaillaan Tor-ohjelman versiota \"%1\"" msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor-ohjelma ei ole käynnissä" msgctxt "StatusEventWidget" msgid "" @@ -3286,6 +3289,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Napsauta \"Käynnistä Tor\" Vidalian hallintapaneelissa käynnistääksesi Tor-" +"ohjelman uudelleen. Jos Tor sulkeutui odottamattomasti, valitse ylhäältä " +"\"Edistynyt\"-välilehti saadaksesi tietoa mahdollisista virheistä." msgctxt "StatusEventWidget" msgid "" @@ -3294,6 +3300,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"Käytät parhaillaan Tor-ohjelman versiota \"%1\", jota ei enää suositella. " +"Päivitäthän ohjelman uusimpaan versioon, joka saattaa sisältää tärkeitä " +"turvallisuutta, luotettavuutta ja suorituskykyä parantavia korjauksia." msgctxt "StatusEventWidget" msgid "" @@ -3302,24 +3311,30 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"Käytät parhaillaan Tor-ohjelman versiota \"%1\", joka ei ehkä enää toimi " +"nykyisen Tor-verkon kanssa. Päivitäthän ohjelman uusimpaan versioon, joka " +"saattaa sisältää tärkeitä turvallisuutta, luotettavuutta ja suorituskykyä " +"parantavia korjauksia." msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Tor-ohjelmasi on vanhentunut." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Yhdistetty Tor-verkkoon." msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." msgstr "" +"Onnistuimme luomaan yhteyden Tor-verkkoon. Voit nyt asettaa ohjelmasi " +"käyttämään Internetiä anonyymisti." msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor Ohjelmavirhe" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit f4a5462351dc7723f30eb589cfa5e1197f554b5a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 19:45:03 2012 +0000 Update translations for orbot --- values-el/strings.xml | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/values-el/strings.xml b/values-el/strings.xml index 0032d9d..df4cdf5 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -21,21 +21,21 @@ <string name="menu_log">Καταγραφή</string> <string name="menu_info">Βοήθεια</string> <string name="menu_apps">Εφαρμογές</string> - <string name="menu_start"></string> - <string name="menu_stop"></string> - <string name="menu_about"></string> - <string name="menu_wizard"></string> - <string name="button_help"></string> - <string name="button_close"></string> - <string name="button_about"></string> - <string name="button_clear_log"></string> - <string name="menu_verify"></string> - <string name="menu_exit"></string> - <string name="powered_by"></string> - <string name="press_to_start"></string> - <string name="pref_trans_proxy_group"></string> - <string name="pref_trans_proxy_title"></string> - <string name="pref_trans_proxy_summary"></string> + <string name="menu_start">Εκκίνηση</string> + <string name="menu_stop">Διακοπή</string> + <string name="menu_about">Σχετικά</string> + <string name="menu_wizard">Μάγος</string> + <string name="button_help">Βοήθεια</string> + <string name="button_close">Κλείσιμο</string> + <string name="button_about">Σχετικά</string> + <string name="button_clear_log">Διαγραφή Καταγραφής</string> + <string name="menu_verify">Έλεγχος</string> + <string name="menu_exit">Έξοδος</string> + <string name="powered_by">με την δύναμη το Tor Project</string> + <string name="press_to_start">-για να εκκινήσει κρατήστε το πατημένο-</string> + <string name="pref_trans_proxy_group">Διαφανής Πληρεξούσιος Διακομηστής (Απαιτεί διαχείριση root)</string> + <string name="pref_trans_proxy_title">Διαφανής Πληρεξούσιος Διακομηστής</string> + <string name="pref_trans_proxy_summary">Αυτόματη Προσαρμογή Εφαρμογών στο Tor</string> <string name="pref_transparent_all_title"></string> <string name="pref_transparent_all_summary"></string> <string name="pref_transparent_port_fallback_title"></string>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Jan '12

08 Jan '12

commit d37d2bb88acb5cf005f678674982a29bfc8aac33 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 8 19:15:14 2012 +0000 Update translations for vidalia --- fi/vidalia_fi.po | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/fi/vidalia_fi.po b/fi/vidalia_fi.po index 4a6abbb..7a1c4b9 100644 --- a/fi/vidalia_fi.po +++ b/fi/vidalia_fi.po @@ -1,13 +1,14 @@ # # Translators: +# <debris(a)riseup.net>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:47+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-08 19:13+0000\n" +"Last-Translator: morso <debris(a)riseup.net>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,11 +144,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Käytä TCP-yhteyttä (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Polku:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -155,39 +156,43 @@ msgstr "" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Muokkaa nykyistä torrc:ta" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "HUOM: tämä muuttaa ladattuna olevaa torrc:ta" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "" +msgstr "ControlSocket-polkua ei ole olemassa." msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." msgstr "" +"Annettu Tor-asetustiedoston sijainti sisältää merkkejä, joita järjestelmäsi " +"nykyinen 8-bittinen merkistökoodaus ei voi näyttää." msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Annettu Tor-datahakemiston sijainti sisältää merkkejä, joita järjestelmäsi " +"nykyinen 8-bittinen merkistökoodaus ei voi näyttää." msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Varoitus" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "Muutit torrc:n polkua, haluaisitko käynnistää Tor:in uudelleen?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Tor-asetustiedosto (torrc);;Kaikki tiedostot (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" @@ -1166,7 +1171,7 @@ msgstr "Zimbabwe" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Zaire" msgctxt "CountryInfo" msgid "Albania" @@ -1266,29 +1271,31 @@ msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Lähetä kaatumisilmoitus" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia kohtasi ongelman ja oli suljettava" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Käynnistä Vidalia uudelleen" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Älä käynnistä uudelleen" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Vidaliaa ei voi käynnistää uudelleen" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Emme onnistuneet käynnistämään Vidaliaa uudelleen automaattisesti. Käynnistä" +" Vidalia uudelleen manuaalisesti." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:"

1 0

[tor/master] add a note from wanoskarnet
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 1416dd47a994fb9f3ff5108be8517270352c9699 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 09:03:03 2012 -0500 add a note from wanoskarnet he disagrees about what the code that we decided not to use would do --- src/common/tortls.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index ef61f71..37074de 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -781,6 +781,11 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, * with clients that are configured to use SSLv23_method(), so we should * probably never use it. */ + /* XXX wanoskarnet says this comment is bunk -- that even if we turn + * this line on, clients configured to use SSLv23 would still able to + * talk to us. But he also says it's ok to leave it out. I suggest we + * delete this whole clause (the one that's #if 0'ed out). I'll leave + * it in place until Nick expresses an opinion. -RD */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; #endif

1 0