- tor-commits - lists.torproject.org

[metrics-lib/master] Use the descriptor parser interface in the downloader, too.
by karsten＠torproject.org 09 May '12

09 May '12

commit 5d67942706cec18caf01fd00df0aba174790ac13 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 9 12:42:55 2012 +0200 Use the descriptor parser interface in the downloader, too. --- .../descriptor/impl/DirectoryDownloader.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index 685ee60..60e08b5 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -8,6 +8,9 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.zip.InflaterInputStream; +import org.torproject.descriptor.DescriptorParser; +import org.torproject.descriptor.DescriptorSourceFactory; + /* Download descriptors from one directory authority or mirror. First, * ask the coordinator thread to create a request, run it, and deliver * the response. Repeat until the coordinator thread says there are no @@ -16,9 +19,12 @@ public class DirectoryDownloader implements Runnable { private String nickname; private String ipPort; + private DescriptorParser descriptorParser; protected DirectoryDownloader(String nickname, String ip, int dirPort) { this.nickname = nickname; this.ipPort = ip + ":" + String.valueOf(dirPort); + this.descriptorParser = + DescriptorSourceFactory.createDescriptorParser(); } private DownloadCoordinator downloadCoordinator; @@ -37,11 +43,10 @@ public class DirectoryDownloader implements Runnable { this.readTimeout = readTimeout; } - private boolean failUnrecognizedDescriptorLines; protected void setFailUnrecognizedDescriptorLines( boolean failUnrecognizedDescriptorLines) { - this.failUnrecognizedDescriptorLines = - failUnrecognizedDescriptorLines; + this.descriptorParser.setFailUnrecognizedDescriptorLines( + failUnrecognizedDescriptorLines); } public void run() { @@ -76,9 +81,8 @@ public class DirectoryDownloader implements Runnable { byte[] responseBytes = baos.toByteArray(); request.setResponseBytes(responseBytes); request.setRequestEnd(System.currentTimeMillis()); - request.setDescriptors(DescriptorImpl. - parseRelayOrBridgeDescriptors(responseBytes, null, - this.failUnrecognizedDescriptorLines)); + request.setDescriptors(this.descriptorParser.parseDescriptors( + responseBytes, null)); } } catch (Exception e) { request.setException(e);

1 0

[doctor/master] Add library that is now required by metrics-lib.
by karsten＠torproject.org 09 May '12

09 May '12

commit e09d3476c10bf0d9ae53fb2bf80ed43858b6ff1e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 9 12:36:21 2012 +0200 Add library that is now required by metrics-lib. --- build.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build.xml b/build.xml index feedb12..9f24ae6 100644 --- a/build.xml +++ b/build.xml @@ -5,6 +5,7 @@ <path id="classpath"> <pathelement path="${classes}"/> <pathelement location="${libs}/commons-codec-1.4.jar"/> + <pathelement location="${libs}/commons-compress-1.0.jar"/> <pathelement location="${libs}/descriptor.jar"/> </path> <target name="init">

1 0

[metrics-lib/master] Add an in-memory descriptor parser as source.
by karsten＠torproject.org 09 May '12

09 May '12

commit 91aeedc3ab30a389b0652bcf3a810ea9e02f7237 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 9 12:15:09 2012 +0200 Add an in-memory descriptor parser as source. --- .../torproject/descriptor/DescriptorParser.java | 26 ++++++++++++++++++++ .../descriptor/DescriptorSourceFactory.java | 6 ++++ .../descriptor/impl/DescriptorParserImpl.java | 26 ++++++++++++++++++++ .../descriptor/impl/DescriptorReaderImpl.java | 18 +++++++------- 4 files changed, 67 insertions(+), 9 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorParser.java b/src/org/torproject/descriptor/DescriptorParser.java new file mode 100644 index 0000000..09ae593 --- /dev/null +++ b/src/org/torproject/descriptor/DescriptorParser.java @@ -0,0 +1,26 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +import java.util.List; + +import org.torproject.descriptor.impl.DescriptorParseException; + +/* Parse descriptors that are already in memory instead of using the + * descriptor reader or downloader. */ +public interface DescriptorParser { + + /* Fail descriptor parsing when encountering an unrecognized line. This + * is not set by default, because the Tor specifications allow for new + * lines to be added that shall be ignored by older Tor versions. But + * some applications may want to handle unrecognized descriptor lines + * explicitly. */ + public void setFailUnrecognizedDescriptorLines( + boolean failUnrecognizedDescriptorLines); + + /* Parse descriptors in the given byte array, possibly parsing the + * publication time from the file name (depending on the descriptor + * type). */ + public List<Descriptor> parseDescriptors(byte[] rawDescriptorBytes, + String fileName) throws DescriptorParseException; +} diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java index 102bfce..bcd7d60 100644 --- a/src/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java @@ -3,11 +3,17 @@ package org.torproject.descriptor; import org.torproject.descriptor.impl.DescriptorDownloaderImpl; +import org.torproject.descriptor.impl.DescriptorParserImpl; import org.torproject.descriptor.impl.DescriptorReaderImpl; /* Create descriptor source instances. */ public class DescriptorSourceFactory { + /* Create a descriptor parser. */ + public static DescriptorParser createDescriptorParser() { + return new DescriptorParserImpl(); + } + /* Create a descriptor reader. */ public static DescriptorReader createDescriptorReader() { return new DescriptorReaderImpl(); diff --git a/src/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/org/torproject/descriptor/impl/DescriptorParserImpl.java new file mode 100644 index 0000000..2ee6f40 --- /dev/null +++ b/src/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -0,0 +1,26 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.util.List; + +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorParser; + +public class DescriptorParserImpl implements DescriptorParser { + + private boolean failUnrecognizedDescriptorLines; + + public void setFailUnrecognizedDescriptorLines( + boolean failUnrecognizedDescriptorLines) { + this.failUnrecognizedDescriptorLines = + failUnrecognizedDescriptorLines; + } + + public List<Descriptor> parseDescriptors(byte[] rawDescriptorBytes, + String fileName) throws DescriptorParseException { + return DescriptorImpl.parseRelayOrBridgeDescriptors( + rawDescriptorBytes, fileName, + this.failUnrecognizedDescriptorLines); + } +} diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index e82d039..ddb6ea6 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; +import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorReader; public class DescriptorReaderImpl implements DescriptorReader { @@ -87,7 +88,7 @@ public class DescriptorReaderImpl implements DescriptorReader { private List<File> tarballs; private BlockingIteratorImpl<DescriptorFile> descriptorQueue; private File historyFile; - private boolean failUnrecognizedDescriptorLines; + private DescriptorParser descriptorParser; private DescriptorReaderRunnable(List<File> directories, List<File> tarballs, BlockingIteratorImpl<DescriptorFile> descriptorQueue, @@ -96,8 +97,9 @@ public class DescriptorReaderImpl implements DescriptorReader { this.tarballs = tarballs; this.descriptorQueue = descriptorQueue; this.historyFile = historyFile; - this.failUnrecognizedDescriptorLines = - failUnrecognizedDescriptorLines; + this.descriptorParser = new DescriptorParserImpl(); + this.descriptorParser.setFailUnrecognizedDescriptorLines( + failUnrecognizedDescriptorLines); } public void run() { this.readOldHistory(); @@ -245,9 +247,8 @@ public class DescriptorReaderImpl implements DescriptorReader { String fileName = tae.getName().substring( tae.getName().lastIndexOf("/") + 1); List<Descriptor> parsedDescriptors = - DescriptorImpl.parseRelayOrBridgeDescriptors( - rawDescriptorBytes, fileName, - this.failUnrecognizedDescriptorLines); + this.descriptorParser.parseDescriptors( + rawDescriptorBytes, fileName); descriptorFile.setDescriptors(parsedDescriptors); } catch (DescriptorParseException e) { descriptorFile.setException(e); @@ -272,9 +273,8 @@ public class DescriptorReaderImpl implements DescriptorReader { } bis.close(); byte[] rawDescriptorBytes = baos.toByteArray(); - return DescriptorImpl.parseRelayOrBridgeDescriptors( - rawDescriptorBytes, file.getName(), - this.failUnrecognizedDescriptorLines); + return this.descriptorParser.parseDescriptors(rawDescriptorBytes, + file.getName()); } } }

1 0

[metrics-db/master] Sanity-check relay descriptors before writing them to disk.
by karsten＠torproject.org 09 May '12

09 May '12

commit 1ea308da77f7b3f382be28bbce4989f176c3cf0a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 9 12:12:47 2012 +0200 Sanity-check relay descriptors before writing them to disk. In #5805 we found that we have quite a few files that are either empty or truncated. Turns out that the current metrics-db code doesn't allow writing empty files, but it does allow writing truncated files. We now parse all descriptors with metrics-lib and only store valid descriptors to disk. Fixes part of #5813. --- build.xml | 1 + src/org/torproject/ernie/db/ArchiveWriter.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/build.xml b/build.xml index b0ce368..f7cadef 100644 --- a/build.xml +++ b/build.xml @@ -10,6 +10,7 @@ <pathelement location="lib/commons-compress-1.0.jar"/> <pathelement location="lib/postgresql-8.4-701.jdbc4.jar"/> <pathelement location="lib/junit-4.8.2.jar"/> + <pathelement location="lib/descriptor.jar"/> </path> <target name="init"> <mkdir dir="${classes}"/> diff --git a/src/org/torproject/ernie/db/ArchiveWriter.java b/src/org/torproject/ernie/db/ArchiveWriter.java index e30cd1b..9d9e4de 100644 --- a/src/org/torproject/ernie/db/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/ArchiveWriter.java @@ -8,10 +8,14 @@ import java.util.*; import java.util.logging.*; import org.apache.commons.codec.binary.*; +import org.torproject.descriptor.DescriptorParser; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.impl.DescriptorParseException; public class ArchiveWriter { private Logger logger; private File outputDirectory; + private DescriptorParser descriptorParser; private int storedConsensuses = 0, storedVotes = 0, storedCerts = 0, storedServerDescriptors = 0, storedExtraInfoDescriptors = 0; @@ -23,6 +27,8 @@ public class ArchiveWriter { this.logger = Logger.getLogger(ArchiveWriter.class.getName()); this.outputDirectory = outputDirectory; + this.descriptorParser = + DescriptorSourceFactory.createDescriptorParser(); } private boolean store(byte[] data, String filename) { @@ -30,6 +36,12 @@ public class ArchiveWriter { File file = new File(filename); if (!file.exists()) { this.logger.finer("Storing " + filename); + if (this.descriptorParser.parseDescriptors(data, filename).size() + != 1) { + this.logger.info("Relay descriptor file " + filename + + " doesn't contain exactly one descriptor. Not storing."); + return false; + } file.getParentFile().mkdirs(); BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(file)); @@ -37,6 +49,9 @@ public class ArchiveWriter { bos.close(); return true; } + } catch (DescriptorParseException e) { + this.logger.log(Level.WARNING, "Could not parse relay descriptor " + + filename + " before storing it to disk. Skipping.", e); } catch (IOException e) { this.logger.log(Level.WARNING, "Could not store relay descriptor " + filename, e);

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 May '12

09 May '12

commit bcac453617e121a69d73b52192cec6c411d2d6c3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 09:45:30 2012 +0000 Update translations for https_everywhere --- hr_HR/ssl-observatory.dtd | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hr_HR/ssl-observatory.dtd b/hr_HR/ssl-observatory.dtd index 80e4ff3..44de0ea 100644 --- a/hr_HR/ssl-observatory.dtd +++ b/hr_HR/ssl-observatory.dtd @@ -41,12 +41,14 @@ to turn it on?">--> "Kada vidite novi certifikat, recite opservatoriju na koji ste ISP spojeni"> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"Ovo će dohvatiti i poslati "Autonomni broj sustava" vaše mreže. To će nam pomoći u lociranju napada na HTTPS i u otkrivanju kada nas promatraju iz mreža sa mjesta poput Irana i Sirije odkuda stižu učestali napadi."> -<!ENTITY ssl-observatory.prefs.done ""> +<!ENTITY ssl-observatory.prefs.done "Učinjeno"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere može koristiti EFF-ov SSL opservatorij. Ovo čini dvije stvari: (1) +šalje kopije HTTPS certifikata Opservatoriju, da nam pomogne otkriti 'glavnog u sredini' napadača i poboljša Web sigurnost; i (2) +da vas upozorimo o nesigurnim vezama ili napadima na vaš preglednik.">  <!ENTITY ssl-observatory.prefs.explanation2 -""> +"Npr., kada posjetite https://www.something.com, certifikat +primljen od Opservatorija će naznačiti da je netko posjetio +www.something.com, ali ne tko je posjetio stranicu, ili koju su određenu +stranicu tražili. Prelazak mišem za daljnje pojedinosti:"> -<!ENTITY ssl-observatory.prefs.hide ""> +<!ENTITY ssl-observatory.prefs.hide "Sakrij napredne mogućnpsti"> <!ENTITY ssl-observatory.prefs.nonanon "">

1 0

[metrics-db/master] Suspend parsing .gz-compressed assignment files.
by karsten＠torproject.org 09 May '12

09 May '12

commit 7d535ea29f19b75745cd79c6656f9d7292bb8427 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 9 11:40:59 2012 +0200 Suspend parsing .gz-compressed assignment files. This is a temporary workaround for #5792. --- .../ernie/db/BridgePoolAssignmentsProcessor.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java index f43723f..d2e64ec 100644 --- a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java @@ -33,7 +33,7 @@ public class BridgePoolAssignmentsProcessor { File file = files.pop(); if (file.isDirectory()) { files.addAll(Arrays.asList(file.listFiles())); - } else { + } else if (!file.getName().endsWith(".gz")) { assignmentFiles.add(file); } } @@ -45,6 +45,8 @@ public class BridgePoolAssignmentsProcessor { new SimpleDateFormat("yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); filenameFormat.setTimeZone(TimeZone.getTimeZone("UTC")); for (File assignmentFile : assignmentFiles) { + logger.info("Processing bridge pool assignment file '" + + assignmentFile.getAbsolutePath() + "'..."); try { BufferedReader br = null; if (assignmentFile.getName().endsWith(".gz")) {

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 May '12

09 May '12

commit 94e2deea35e80130d583aece65de2d2a5b05a911 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 09:15:34 2012 +0000 Update translations for https_everywhere --- hr_HR/ssl-observatory.dtd | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/hr_HR/ssl-observatory.dtd b/hr_HR/ssl-observatory.dtd index d832b69..80e4ff3 100644 --- a/hr_HR/ssl-observatory.dtd +++ b/hr_HR/ssl-observatory.dtd @@ -1,9 +1,11 @@  -<!ENTITY ssl-observatory.popup.details ""> -<!ENTITY ssl-observatory.popup.later ""> -<!ENTITY ssl-observatory.popup.no ""> +<!ENTITY ssl-observatory.popup.details "Pojedinosti i informacije privatnosti"> +<!ENTITY ssl-observatory.popup.later "Pitaj me kasnije"> +<!ENTITY ssl-observatory.popup.no "Ne"> -<!ENTITY ssl-observatory.popup.text ""> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere može otkriti napade +na vaš preglednik šaljući certifikate koje primite +Opservatoriju. Želite li uključiti ovo?">  <!ENTITY ssl-observatory.popup.title -""> +"Treba li HTTPS Everywhere koristiti SSL Opservatorij?"> -<!ENTITY ssl-observatory.popup.yes ""> +<!ENTITY ssl-observatory.popup.yes "Da">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -""> +"Sigurnije je da omogućite ovo, osim ako koristite jako ometajuću korporativnu mrežu:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -""> +"Sigurno, osim ako koristite korporativnu mrežu sa tajnim internet nazivima poslužitelja:"> <!ENTITY ssl-observatory.prefs.alt_roots -""> +"Prijavi i provjeri certifikate potpisanim od ne-standardnih korijenskih certifikata"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -""> +"Sigurno je (i dobra je ideja) da omogućite ovu mogućnost, osim ako koristite ometajuću korporativnu mrežu ili Kaspersky antivirusni softver koji nadgleda vaše surfanje sa TLS proxyjem i privatnim korijenskim certifikatima ovlasti. Ako je omogućeno na takvoj mreži, ova mogućnost bi mogla objaviti dokaz koja https:// domena je bila posjećena kroz taj proxy, zbog jedinstvenog certifikata kojeg bi proizvela. Stoga je zadano, ostavljena isključena."> -<!ENTITY ssl-observatory.prefs.anonymous ""> +<!ENTITY ssl-observatory.prefs.anonymous "Provjeri certifikate koristeći Tor za anonimnost"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -""> +"Provjeri certifikate koristeći Tor za anonimnost (zahtjeva Tortipku)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -""> +"Ova mogućnost zahtjeva instalirani Tor i Tortipku"> <!ENTITY ssl-observatory.prefs.asn -""> +"Kada vidite novi certifikat, recite opservatoriju na koji ste ISP spojeni"> <!ENTITY ssl-observatory.prefs.asn_tooltip "">

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 09 May '12

09 May '12

commit 63f4912fcbd5c37b25e6960cb97ac7d327325a23 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 09:15:13 2012 +0000 Update translations for vidalia --- hr_HR/qt_hr_HR.po | 4 ++-- hr_HR/vidalia_hr_HR.po | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hr_HR/qt_hr_HR.po b/hr_HR/qt_hr_HR.po index db20820..f309161 100644 --- a/hr_HR/qt_hr_HR.po +++ b/hr_HR/qt_hr_HR.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2012-05-09 08:08+0000\n" +"PO-Revision-Date: 2012-05-09 08:52+0000\n" "Last-Translator: gogo <trebelnik2(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -75,7 +75,7 @@ msgstr "Primjeni" #: qdialogbuttonbox.cpp:543 msgctxt "QDialogButtonBox" msgid "Reset" -msgstr "" +msgstr "Poništi" #: qdialogbuttonbox.cpp:546 msgctxt "QDialogButtonBox" diff --git a/hr_HR/vidalia_hr_HR.po b/hr_HR/vidalia_hr_HR.po index 0e9d720..4a5ecae 100644 --- a/hr_HR/vidalia_hr_HR.po +++ b/hr_HR/vidalia_hr_HR.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: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-05-09 08:44+0000\n" +"PO-Revision-Date: 2012-05-09 08:49+0000\n" "Last-Translator: gogo <trebelnik2(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -239,7 +239,7 @@ msgstr "Postavke ikone sustava (izmjene će se primjeniti nakon ponovnog pokreta msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "Prikaži ikonu obavijesnog područja i i ikonu pokretača (uobičajeno)" +msgstr "Prikaži ikonu obavijesnog područja i ikonu pokretača (uobičajeno)" msgctxt "AppearancePage" msgid "Hide the Tray Icon" @@ -247,7 +247,7 @@ msgstr "Sakrij ikonu " msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "Sakrij ikonu pokretača" msgctxt "BandwidthGraph" msgid "Since:" @@ -2118,14 +2118,14 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "Vidalia ne može saznati kako komunicirati sa Tor-om zato jer ne može pristupiti ovoj datoteki: %1\n\nOvdje je posljednja poruka greške:\n%2" +msgstr "Vidalia ne može saznati kako komunicirati sa Tor-om zato jer ne može pristupiti ovoj datoteci: %1\n\nOvdje je posljednja poruka greške:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "It seems Tor has stopped running since Vidalia started it.\n\nSee the Advanced Message Log for more information." +msgstr "Čini se da je Tor prestao sa radom od kada je Vidalia pokrenuta.\n\nPogledajte 'Napredni popis poruka' za više informacija." msgctxt "MainWindow" msgid "" @@ -2690,7 +2690,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Morate odrediti jedan ili više mostova." msgctxt "Policy" msgid "accept" @@ -3114,11 +3114,11 @@ msgstr "Automatski distribuiraj adresu mog mosta" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Relej prometa za Tor mrežu (napusti relej)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Relej prometa unutar Tor mreže (nemoguće napuštanje releja)" msgctxt "ServerPage" msgid "Mirror the Relay Directory"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 09 May '12

09 May '12

commit 9d29036d65bc463bd4abfeabd92b658c759cccc1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 08:45:12 2012 +0000 Update translations for vidalia --- hr_HR/vidalia_hr_HR.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hr_HR/vidalia_hr_HR.po b/hr_HR/vidalia_hr_HR.po index 5ed4bfb..0e9d720 100644 --- a/hr_HR/vidalia_hr_HR.po +++ b/hr_HR/vidalia_hr_HR.po @@ -1,13 +1,14 @@ # # Translators: # Armando Vega <synaan(a)gmail.com>, 2012. +# <trebelnik2(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-22 08:52+0000\n" -"Last-Translator: Armando Vega <synaan(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-09 08:44+0000\n" +"Last-Translator: gogo <trebelnik2(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -202,7 +203,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "Odabrali ste mogućnost automatskog podešavanja za Kontrolni ulaz, ali bez direktorija podatka. Dodajte jedan direktorij ili odznačite mogućnost \"Podesi kontrolni ulaz automatski\"." msgctxt "AdvancedPage" msgid "" @@ -234,15 +235,15 @@ msgstr "Vidalia nije bila u mogućnosti učitati odabrani jezični prijevod." msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "Postavke ikone sustava (izmjene će se primjeniti nakon ponovnog pokretanja Vidalia)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr "Prikaži ikonu obavijesnog područja i i ikonu pokretača (uobičajeno)" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "Sakrij ikonu " msgctxt "AppearancePage" msgid "Hide the Dock Icon" @@ -2117,14 +2118,14 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia ne može saznati kako komunicirati sa Tor-om zato jer ne može pristupiti ovoj datoteki: %1\n\nOvdje je posljednja poruka greške:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "It seems Tor has stopped running since Vidalia started it.\n\nSee the Advanced Message Log for more information." msgctxt "MainWindow" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 09 May '12

09 May '12

commit 7398f4bfb499206ebbf17afe77e21c8efd787391 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 9 08:15:11 2012 +0000 Update translations for vidalia --- hr_HR/qt_hr_HR.po | 75 +++++++++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 37 deletions(-) diff --git a/hr_HR/qt_hr_HR.po b/hr_HR/qt_hr_HR.po index 0a0395b..db20820 100644 --- a/hr_HR/qt_hr_HR.po +++ b/hr_HR/qt_hr_HR.po @@ -1,13 +1,14 @@ # Translators: # Translators: # Armando Vega <synaan(a)gmail.com>, 2012. +# <trebelnik2(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2012-02-14 09:47+0000\n" -"Last-Translator: Armando Vega <synaan(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-09 08:08+0000\n" +"Last-Translator: gogo <trebelnik2(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "Izvršna datoteka '%1' zahtjeva Qt %2, pronađen Qt %3." #: qmessagebox.h:321 msgctxt "QApplication" msgid "Incompatible Qt Library Error" -msgstr "Greška Zbog Nekompatibilnog Qt Librarya" +msgstr "Greška nekompatibilne Qt knjižnice" #: qapplication.cpp:2095 msgctxt "QApplication" @@ -74,7 +75,7 @@ msgstr "Primjeni" #: qdialogbuttonbox.cpp:543 msgctxt "QDialogButtonBox" msgid "Reset" -msgstr "Reset" +msgstr "" #: qdialogbuttonbox.cpp:546 msgctxt "QDialogButtonBox" @@ -84,7 +85,7 @@ msgstr "Pomoć" #: qdialogbuttonbox.cpp:550 msgctxt "QDialogButtonBox" msgid "Don't Save" -msgstr "Ne Spremaj" +msgstr "Ne spremaj" #: qdialogbuttonbox.cpp:554 msgctxt "QDialogButtonBox" @@ -94,12 +95,12 @@ msgstr "Odbaci" #: qdialogbuttonbox.cpp:557 msgctxt "QDialogButtonBox" msgid "&Yes" -msgstr "Da" +msgstr "&Da" #: qdialogbuttonbox.cpp:560 msgctxt "QDialogButtonBox" msgid "Yes to &All" -msgstr "Da z&a Sve" +msgstr "Da z&a sve" #: qdialogbuttonbox.cpp:563 msgctxt "QDialogButtonBox" @@ -109,17 +110,17 @@ msgstr "&Ne" #: qdialogbuttonbox.cpp:566 msgctxt "QDialogButtonBox" msgid "N&o to All" -msgstr "Ne za Sve" +msgstr "N&e za sve" #: qdialogbuttonbox.cpp:569 msgctxt "QDialogButtonBox" msgid "Save All" -msgstr "Spremi Sve" +msgstr "Spremi sve" #: qdialogbuttonbox.cpp:572 msgctxt "QDialogButtonBox" msgid "Abort" -msgstr "Obustavi" +msgstr "Prekini" #: qdialogbuttonbox.cpp:575 msgctxt "QDialogButtonBox" @@ -134,17 +135,17 @@ msgstr "Ignoriraj" #: qdialogbuttonbox.cpp:581 msgctxt "QDialogButtonBox" msgid "Restore Defaults" -msgstr "Vrati Pretpostavljene Vrijednosti" +msgstr "Vrati uobičajeno" #: qdialogbuttonbox.cpp:552 msgctxt "QDialogButtonBox" msgid "Close without Saving" -msgstr "Zatvori bez Spremanja" +msgstr "Zatvori bez spremanja" #: qdialogbuttonbox.cpp:525 msgctxt "QDialogButtonBox" msgid "&OK" -msgstr "&OK" +msgstr "&U redu" #: qdirmodel.cpp:423 msgctxt "QDirModel" @@ -169,17 +170,17 @@ msgstr "Tip" #: qdirmodel.cpp:435 msgctxt "QDirModel" msgid "Date Modified" -msgstr "Datum Izmjene" +msgstr "Datum izmjene" #: qfiledialog_win.cpp:126 msgctxt "QFileDialog" msgid "All Files (*)" -msgstr "Sve Datoteke(*)" +msgstr "Sve datoteke(*)" #: qfiledialog.cpp:881 msgctxt "QFileDialog" msgid "Directories" -msgstr "Mape" +msgstr "Direktoriji" #: qfiledialog.cpp:2408 msgctxt "QFileDialog" @@ -209,7 +210,7 @@ msgid "" "%1\n" "File not found.\n" "Please verify the correct file name was given." -msgstr "%1\nDatoteka nije pronađena.\nMolimo provjerite točnost datog imena datoteke." +msgstr "%1\nDatoteka nije pronađena.\nMolimo provjerite točnost datog naziva datoteke." #: qdirmodel.cpp:833 msgctxt "QFileDialog" @@ -224,7 +225,7 @@ msgstr "P&reimenuj" #: qfiledialog.cpp:463 msgctxt "QFileDialog" msgid "&Delete" -msgstr "Izbriši" +msgstr "&Izbriši" #: qfiledialog.cpp:464 msgctxt "QFileDialog" @@ -239,27 +240,27 @@ msgstr "Natrag" #: ui_qfiledialog.h:274 msgctxt "QFileDialog" msgid "Parent Directory" -msgstr "Nadređena Mapa" +msgstr "Nadređeni direktorij" #: ui_qfiledialog.h:284 msgctxt "QFileDialog" msgid "List View" -msgstr "Popisni Pogled" +msgstr "Popisni pogled" #: ui_qfiledialog.h:289 msgctxt "QFileDialog" msgid "Detail View" -msgstr "Detaljni Pogled" +msgstr "Detaljni pogled" #: ui_qfiledialog.h:292 msgctxt "QFileDialog" msgid "Files of type:" -msgstr "Datoteke tipa:" +msgstr "Vrsta datoteka:" #: qfiledialog.cpp:883 msgctxt "QFileDialog" msgid "Directory:" -msgstr "Mapa:" +msgstr "Direktorij:" #: qfiledialog.cpp:2476 msgctxt "QFileDialog" @@ -267,7 +268,7 @@ msgid "" "%1\n" "Directory not found.\n" "Please verify the correct directory name was given." -msgstr "%1\nMapa nije pronađena.\nMolimo provjerite točnost imena date mape." +msgstr "%1\nDirektorij nije pronađen.\nMolimo provjerite točnost naziva datog direktorija." #: qfiledialog.cpp:2281 msgctxt "QFileDialog" @@ -279,27 +280,27 @@ msgstr "'%1' je zaštićena od pisanja.\nŽelite li ju svejedno izbrisati?" #: qfiledialog.cpp:2286 msgctxt "QFileDialog" msgid "Are sure you want to delete '%1'?" -msgstr "Jeste li sigurni da želite izbrisati '%1'?" +msgstr "Sigurno želite izbrisati '%1'?" #: qfiledialog.cpp:2299 msgctxt "QFileDialog" msgid "Could not delete directory." -msgstr "Nije bilo moguće izbrisati mapu." +msgstr "Nemoguće brisanje direktorija." #: qfiledialog_win.cpp:128 msgctxt "QFileDialog" msgid "All Files (*.*)" -msgstr "Sve Datoteke (*.*)" +msgstr "Sve datoteke (*.*)" #: qfiledialog.cpp:437 msgctxt "QFileDialog" msgid "Save As" -msgstr "Spremi Kao" +msgstr "Spremi kao" #: qfileiconprovider.cpp:379 msgctxt "QFileDialog" msgid "Drive" -msgstr "Drive" +msgstr "Pogon" #: qfileiconprovider.cpp:383 msgctxt "QFileDialog" @@ -314,7 +315,7 @@ msgstr "Nepoznato" #: qfiledialog.cpp:439 msgctxt "QFileDialog" msgid "Find Directory" -msgstr "Pronađi Mapu" +msgstr "Pronađi direktorij" #: qfiledialog.cpp:458 msgctxt "QFileDialog" @@ -329,17 +330,17 @@ msgstr "Naprijed" #: qfiledialog.cpp:2137 msgctxt "QFileDialog" msgid "New Folder" -msgstr "Nova Mapa" +msgstr "Nova mapa" #: qfiledialog.cpp:465 msgctxt "QFileDialog" msgid "&New Folder" -msgstr "&Nova Mapa" +msgstr "&Nova mapa" #: qfiledialog.cpp:917 msgctxt "QFileDialog" msgid "&Choose" -msgstr "Odaberi" +msgstr "&Odaberi" #: qsidebar.cpp:388 msgctxt "QFileDialog" @@ -349,7 +350,7 @@ msgstr "Ukloni" #: qfiledialog.cpp:886 msgctxt "QFileDialog" msgid "File &name:" -msgstr "Ime datoteke:" +msgstr "Naziv datoteke:" #: ui_qfiledialog.h:261 msgctxt "QFileDialog" @@ -359,12 +360,12 @@ msgstr "Pogledaj u:" #: ui_qfiledialog.h:279 msgctxt "QFileDialog" msgid "Create New Folder" -msgstr "Stvori Novu Mapu" +msgstr "Stvori novu mapu" #: qfilesystemmodel.cpp:761 msgctxt "QFileSystemModel" msgid "Invalid filename" -msgstr "Neispravno ime datoteke" +msgstr "Neispravni naziv datoteke" #: qfilesystemmodel.cpp:763 msgctxt "QFileSystemModel" @@ -396,7 +397,7 @@ msgstr "Tip" #: qfilesystemmodel.cpp:847 msgctxt "QFileSystemModel" msgid "Date Modified" -msgstr "Datum Izmjene" +msgstr "Datum izmjene" #: qfilesystemmodel_p.h:198 msgctxt "QFileSystemModel"

1 0