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

[collector/master] Use the latest describtor release 1.3.0
by karsten＠torproject.org 20 Jul '16

20 Jul '16

commit adee62f64159fb2fbd778808411e6e229a8eb087 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jul 19 14:24:03 2016 +0200 Use the latest describtor release 1.3.0 --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 099eb8b..51471f6 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ <project default="compile" name="CollecTor" basedir="."> <property name="release.version" value="0.9.0-dev" /> <property name="name" value="CollecTor"/> - <property name="descriptorversion" value="1.1.0-dev" /> + <property name="descriptorversion" value="1.3.0" /> <property name="source-and-target-java-version" value="1.7" /> <property name="sources" value="src/main/java"/> <property name="resources" value="src/main/resources/"/>

1 0

[collector/master] Implements #19424: make all main paths configurable, add property instance url.
by karsten＠torproject.org 20 Jul '16

20 Jul '16

commit 2f725efbf6a527bee8663fca3751da7069787625 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jul 19 15:32:31 2016 +0200 Implements #19424: make all main paths configurable, add property instance url. --- .../bridgedescs/SanitizedBridgesWriter.java | 28 ++++++++++++---------- .../java/org/torproject/collector/conf/Key.java | 2 ++ .../collector/exitlists/ExitListDownloader.java | 22 ++++++++++------- .../collector/index/CreateIndexJson.java | 7 +++--- .../collector/torperf/TorperfDownloader.java | 25 +++++++++++-------- src/main/resources/collector.properties | 7 +++--- .../collector/conf/ConfigurationTest.java | 2 +- 7 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index 9d5828c..121f8ca 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -120,7 +120,7 @@ public class SanitizedBridgesWriter extends Thread { config.getPath(Key.BridgeSnapshotsDirectory).toFile(); File sanitizedBridgesDirectory = config.getPath(Key.SanitizedBridgesWriteDirectory).toFile(); - File statsDirectory = new File("stats"); + File statsDirectory = config.getPath(Key.StatsPath).toFile(); if (bridgeDirectoriesDirectory == null || sanitizedBridgesDirectory == null || statsDirectory == null) { @@ -923,12 +923,12 @@ public class SanitizedBridgesWriter extends Thread { + "/" + descriptorDigest.charAt(0) + "/" + descriptorDigest.charAt(1) + "/" + descriptorDigest); - File rsyncCatFile = new File("recent/bridge-descriptors/" - + "server-descriptors/" + this.rsyncCatString - + "-server-descriptors.tmp"); - File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; - boolean[] append = new boolean[] { false, true }; try { + File rsyncCatFile = new File(config.getPath(Key.RecentPath).toFile(), + "bridge-descriptors/server-descriptors/" + this.rsyncCatString + + "-server-descriptors.tmp"); + File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; + boolean[] append = new boolean[] { false, true }; for (int i = 0; i < outputFiles.length; i++) { File outputFile = outputFiles[i]; boolean appendToFile = append[i]; @@ -950,7 +950,7 @@ public class SanitizedBridgesWriter extends Thread { + "\n"); bw.close(); } - } catch (IOException e) { + } catch (ConfigurationException | IOException e) { this.logger.warn("Could not write sanitized server " + "descriptor to disk.", e); return; @@ -1201,11 +1201,12 @@ public class SanitizedBridgesWriter extends Thread { + descriptorDigest.charAt(0) + "/" + descriptorDigest.charAt(1) + "/" + descriptorDigest); - File rsyncCatFile = new File("recent/bridge-descriptors/" - + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp"); - File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; - boolean[] append = new boolean[] { false, true }; try { + File rsyncCatFile = new File(config.getPath(Key.RecentPath).toFile(), + "bridge-descriptors/extra-infos/" + this.rsyncCatString + + "-extra-infos.tmp"); + File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; + boolean[] append = new boolean[] { false, true }; for (int i = 0; i < outputFiles.length; i++) { File outputFile = outputFiles[i]; boolean appendToFile = append[i]; @@ -1313,11 +1314,12 @@ public class SanitizedBridgesWriter extends Thread { /** Delete all files from the rsync directory that have not been modified * in the last three days, and remove the .tmp extension from newly * written files. */ - public void cleanUpRsyncDirectory() { + public void cleanUpRsyncDirectory() throws ConfigurationException { long cutOffMillis = System.currentTimeMillis() - 3L * 24L * 60L * 60L * 1000L; Stack<File> allFiles = new Stack<File>(); - allFiles.add(new File("recent/bridge-descriptors")); + allFiles.add(new File(config.getPath(Key.RecentPath).toFile(), + "bridge-descriptors")); while (!allFiles.isEmpty()) { File file = allFiles.pop(); if (file.isDirectory()) { diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index 21e536d..4f5df64 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -8,6 +8,8 @@ import java.nio.file.Path; */ public enum Key { + ExitlistOutputDirectory(Path.class), + InstanceBaseUrl(String.class), LockFilePath(Path.class), ArchivePath(Path.class), RecentPath(Path.class), diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index 5e17971..70de74f 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -53,7 +53,12 @@ public class ExitListDownloader extends Thread { logger.info("Terminating exit-lists module of CollecTor."); } - public ExitListDownloader(Configuration config) {} + private Configuration config; + + /** Instanciate the exit-lists module using the given configuration. */ + public ExitListDownloader(Configuration config) { + this.config = config; + } @Override public void run() { @@ -113,8 +118,8 @@ public class ExitListDownloader extends Thread { SimpleDateFormat tarballFormat = new SimpleDateFormat("yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); tarballFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - File tarballFile = new File("out/exit-lists/" + tarballFormat.format( - downloadedDate)); + File tarballFile = new File(config.getPath(Key.ExitlistOutputDirectory) + + tarballFormat.format(downloadedDate)); long maxScanMillis = 0L; try { @@ -146,8 +151,8 @@ public class ExitListDownloader extends Thread { } /* Write to disk. */ - File rsyncFile = new File("recent/exit-lists/" - + tarballFile.getName()); + File rsyncFile = new File(config.getPath(Key.RecentPath).toFile(), + "exit-lists/" + tarballFile.getName()); File[] outputFiles = new File[] { tarballFile, rsyncFile }; for (File outputFile : outputFiles) { try { @@ -166,7 +171,7 @@ public class ExitListDownloader extends Thread { StringBuilder dumpStats = new StringBuilder("Finished downloading " + "exit list.\nLast three exit lists are:"); Stack<File> filesInInputDir = new Stack<File>(); - filesInInputDir.add(new File("out/exit-lists")); + filesInInputDir.add(config.getPath(Key.ExitlistOutputDirectory).toFile()); SortedSet<File> lastThreeExitLists = new TreeSet<File>(); while (!filesInInputDir.isEmpty()) { File pop = filesInInputDir.pop(); @@ -198,11 +203,12 @@ public class ExitListDownloader extends Thread { /** Delete all files from the rsync directory that have not been modified * in the last three days. */ - public void cleanUpRsyncDirectory() { + public void cleanUpRsyncDirectory() throws ConfigurationException { long cutOffMillis = System.currentTimeMillis() - 3L * 24L * 60L * 60L * 1000L; Stack<File> allFiles = new Stack<File>(); - allFiles.add(new File("recent/exit-lists")); + allFiles.add(new File(config.getPath(Key.RecentPath).toFile(), + "/exit-lists")); while (!allFiles.isEmpty()) { File file = allFiles.pop(); if (file.isDirectory()) { diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 821be59..7da2b5e 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -39,7 +39,7 @@ public class CreateIndexJson { private static File indexJsonFile; - private static String basePath = "https://collector.torproject.org"; + private static String basePath; private static File[] indexedDirectories; @@ -54,9 +54,10 @@ public class CreateIndexJson { public static void main(Configuration config) throws ConfigurationException, IOException { indexJsonFile = new File(config.getPath(Key.IndexPath).toFile(), "index.json"); + basePath = config.getProperty(Key.InstanceBaseUrl.name()); indexedDirectories = new File[] { - new File(config.getPath(Key.ArchivePath).toFile(), "archive"), - new File(config.getPath(Key.RecentPath).toFile(), "recent") }; + config.getPath(Key.ArchivePath).toFile(), + config.getPath(Key.RecentPath).toFile() }; writeIndex(indexDirectories()); } diff --git a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java index dd1c541..7616dd8 100644 --- a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java @@ -62,6 +62,7 @@ public class TorperfDownloader extends Thread { private Map<String, String> torperfSources = new HashMap<>(); private String[] torperfFilesLines = null; private SimpleDateFormat dateFormat; + private File torperfLastMergedFile; @Override public void run() { @@ -77,6 +78,8 @@ public class TorperfDownloader extends Thread { this.torperfFilesLines = config.getStringArray(Key.TorperfFilesLines); this.torperfOutputDirectory = config.getPath(Key.TorperfOutputDirectory) .toFile(); + this.torperfLastMergedFile = new File(config.getPath(Key.StatsPath).toFile(), + "torperf-last-merged"); if (!this.torperfOutputDirectory.exists()) { this.torperfOutputDirectory.mkdirs(); } @@ -94,9 +97,6 @@ public class TorperfDownloader extends Thread { this.cleanUpRsyncDirectory(); } - private File torperfLastMergedFile = - new File("stats/torperf-last-merged"); - SortedMap<String, String> lastMergedTimestamps = new TreeMap<String, String>(); @@ -160,7 +160,8 @@ public class TorperfDownloader extends Thread { } } - private void downloadAndMergeFiles(String torperfFilesLine) { + private void downloadAndMergeFiles(String torperfFilesLine) + throws ConfigurationException { String[] parts = torperfFilesLine.split(" "); String sourceName = parts[0]; int fileSize = -1; @@ -306,7 +307,8 @@ public class TorperfDownloader extends Thread { } private String mergeFiles(File dataFile, File extradataFile, - String source, int fileSize, String skipUntil) throws IOException { + String source, int fileSize, String skipUntil) throws IOException, + ConfigurationException { SortedMap<String, String> config = new TreeMap<String, String>(); config.put("SOURCE", source); config.put("FILESIZE", String.valueOf(fileSize)); @@ -548,7 +550,8 @@ public class TorperfDownloader extends Thread { private SortedMap<String, String> cachedTpfLines; private void writeTpfLine(String source, int fileSize, - SortedMap<String, String> keysAndValues) throws IOException { + SortedMap<String, String> keysAndValues) throws ConfigurationException, + IOException { StringBuilder sb = new StringBuilder(); int written = 0; for (Map.Entry<String, String> keyAndValue : @@ -602,7 +605,8 @@ public class TorperfDownloader extends Thread { br.close(); } - private void writeCachedTpfLines() throws IOException { + private void writeCachedTpfLines() throws ConfigurationException, + IOException { if (this.cachedSource == null || this.cachedFileSize == 0 || this.cachedStartDate == null || this.cachedTpfLines == null) { return; @@ -612,7 +616,8 @@ public class TorperfDownloader extends Thread { + "/" + this.cachedSource + "-" + String.valueOf(this.cachedFileSize) + "-" + this.cachedStartDate + ".tpf"); - File rsyncFile = new File("recent/torperf/" + tarballFile.getName()); + File rsyncFile = new File(config.getPath(Key.RecentPath).toFile(), + "torperf/" + tarballFile.getName()); File[] outputFiles = new File[] { tarballFile, rsyncFile }; for (File outputFile : outputFiles) { outputFile.getParentFile().mkdirs(); @@ -631,11 +636,11 @@ public class TorperfDownloader extends Thread { /** Delete all files from the rsync directory that have not been modified * in the last three days. */ - public void cleanUpRsyncDirectory() { + public void cleanUpRsyncDirectory() throws ConfigurationException { long cutOffMillis = System.currentTimeMillis() - 3L * 24L * 60L * 60L * 1000L; Stack<File> allFiles = new Stack<File>(); - allFiles.add(new File("recent/torperf")); + allFiles.add(new File(config.getPath(Key.RecentPath).toFile(), "torperf")); while (!allFiles.isEmpty()) { File file = allFiles.pop(); if (file.isDirectory()) { diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index c7df21f..fb9e1b4 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -1,6 +1,7 @@ ######## Collector Properties # ######## General Properties ######## +InstanceBaseUrl = "https://collector.torproject.org" LockFilePath = lock IndexPath = out/index ArchivePath = out/archive @@ -95,9 +96,9 @@ SanitizedBridgesWriteDirectory = out/bridge-descriptors/ ######## Exit lists ######## # -## (No options available) -# -# +## +ExitlistOutputDirectory = out/exit-lists/ + ######## Torperf downloader ######## # ## Path to the directory to store Torperf files in. diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index f966b43..57dda75 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -22,7 +22,7 @@ public class ConfigurationTest { public void testKeyCount() throws Exception { assertEquals("The number of properties keys in enum Key changed." + "\n This test class should be adapted.", - 30, Key.values().length); + 32, Key.values().length); } @Test()

1 0

[chutney/master] Find TOR_DIR if it's called tor and next to chutney
by teor＠torproject.org 20 Jul '16

20 Jul '16

commit 9c6885e94d22127fc982bcf7576058a64a905763 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jul 20 10:39:24 2016 +1000 Find TOR_DIR if it's called tor and next to chutney --- tools/test-network.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index 2e0cd7c..ccd9f53 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -92,6 +92,12 @@ if [ ! -d "$TOR_DIR" ]; then # But only if it looks like one echo "$myname: \$TOR_DIR not set, trying \$PWD" export TOR_DIR="$PWD" + elif [ -d "$PWD/../tor" -a -d "$PWD/../tor/src/or" -a \ + -d "$PWD/../tor/src/tools" ]; then + # Guess the tor directory is next to the current directory + # But only if it looks like one + echo "$myname: \$TOR_DIR not set, trying \$PWD/../tor" + export TOR_DIR="$PWD/../tor" else echo "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" unset TOR_DIR

1 0

[chutney/master] Find CHUTNEY_PATH based on the script's location
by teor＠torproject.org 20 Jul '16

20 Jul '16

commit 4f8dc02043f3a732e3ad49497a9d4965cd45ded3 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jul 20 10:39:41 2016 +1000 Find CHUTNEY_PATH based on the script's location And do this before checking TOR_DIR, which is optional. --- tools/test-network.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index ccd9f53..1d4816e 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -113,6 +113,10 @@ if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then if [ -x "$PWD/chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" export CHUTNEY_PATH="$PWD" + elif [ -d "`dirname \"$0\"`/.." -a \ + -x "`dirname \"$0\"`/../chutney" ]; then + echo "$myname: \$CHUTNEY_PATH not valid, using this script's location" + export CHUTNEY_PATH="`dirname \"$0\"`/.." elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ -x "$TOR_DIR/../chutney/chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney"

1 0

[chutney/master] Document all the test-network.sh arguments in the README
by teor＠torproject.org 20 Jul '16

20 Jul '16

commit b86168c2e284ad8a9f090a2ea7d2a7e6d3a80f25 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jul 20 10:40:22 2016 +1000 Document all the test-network.sh arguments in the README Well, accept for --dry-run, which is an implementation detail. --- README | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README b/README index 0ae9380..a2f9f7c 100644 --- a/README +++ b/README @@ -23,8 +23,21 @@ Automated Setup, Verification, and Shutdown: ./tools/test-network.sh --tor-path <tor-build-directory> ./tools/test-network.sh --tor <name-or-path> --tor-gencert <name-or-path> (--tor-path and $TOR_DIR override --tor and --tor-gencert.) + ./tools/test-network.sh --chutney-path <chutney-directory> + (The script is pretty good at guessing this.) -The environmental variables documented below also work with test-network.sh. +test-network.sh looks for some tor binaries (either in a nearby build +directory or in your $PATH), configures a comprehensive tor test network, +launches it, then verifies data transmission through it, and cleans up after +itself. + +You can modify its configuration using command-line arguments, or use the +chutney environmental variables documented below: + + --delay CHUTNEY_BOOTSTRAP_TIME + --data CHUTNEY_DATA_BYTES + --connections CHUTNEY_CONNECTIONS + --hs-multi-client CHUTNEY_HS_MULTI_CLIENT Standard Actions: ./chutney configure networks/basic

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 Jul '16

19 Jul '16

commit be41f269f076095a91f92e3074dbfce41bc1413b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 19 20:15:11 2016 +0000 Update translations for bridgedb_completed --- fr_CA/LC_MESSAGES/bridgedb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po index 9c80db0..c5a728f 100644 --- a/fr_CA/LC_MESSAGES/bridgedb.po +++ b/fr_CA/LC_MESSAGES/bridgedb.po @@ -7,6 +7,7 @@ # Lunar <lunar(a)torproject.org>, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 # Onizuka, 2013 +# Stéphanie Séguin <stephanie.seguin(a)yahoo.ca>, 2016 # French language coordinator <yahoe.001(a)gmail.com>, 2015 # French language coordinator <yahoe.001(a)gmail.com>, 2014-2015 msgid "" @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-05 18:59+0000\n" -"Last-Translator: French language coordinator <yahoe.001(a)gmail.com>\n" +"PO-Revision-Date: 2016-07-19 19:49+0000\n" +"Last-Translator: Stéphanie Séguin <stephanie.seguin(a)yahoo.ca>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Jul '16

19 Jul '16

commit e9e184474b3cd27ac07d3ed1a524cff9bd6abc42 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 19 20:15:03 2016 +0000 Update translations for bridgedb --- fr_CA/LC_MESSAGES/bridgedb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po index 9c80db0..c5a728f 100644 --- a/fr_CA/LC_MESSAGES/bridgedb.po +++ b/fr_CA/LC_MESSAGES/bridgedb.po @@ -7,6 +7,7 @@ # Lunar <lunar(a)torproject.org>, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 # Onizuka, 2013 +# Stéphanie Séguin <stephanie.seguin(a)yahoo.ca>, 2016 # French language coordinator <yahoe.001(a)gmail.com>, 2015 # French language coordinator <yahoe.001(a)gmail.com>, 2014-2015 msgid "" @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-05 18:59+0000\n" -"Last-Translator: French language coordinator <yahoe.001(a)gmail.com>\n" +"PO-Revision-Date: 2016-07-19 19:49+0000\n" +"Last-Translator: Stéphanie Séguin <stephanie.seguin(a)yahoo.ca>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 19 Jul '16

19 Jul '16

commit da2314dc34456ef6f94c6ba6fa8c5688011f8aa0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 19 17:47:00 2016 +0000 Update translations for tor_animation_completed --- sk_SK.srt | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/sk_SK.srt b/sk_SK.srt new file mode 100644 index 0000000..f2190b0 --- /dev/null +++ b/sk_SK.srt @@ -0,0 +1,164 @@ +1 +00:00:00,660 --> 00:00:02,780 +Veľmi sme si zvykli na internet. + +2 +00:00:03,120 --> 00:00:07,700 +Neustále zdieľame informácie o sebe a našich súkromných životoch: + +3 +00:00:08,000 --> 00:00:09,960 +jedlo, ktoré jeme, ľúdi, ktorých stretávame, + +4 +00:00:10,180 --> 00:00:12,480 +miesta, na ktoré chodíme, veci, ktoré čítame. + +5 +00:00:13,280 --> 00:00:14,640 +Vysvetlím to bližšie. + +6 +00:00:14,920 --> 00:00:17,740 +Ak sa v tejto chvíli +niekto pokúsi vyhľadať vás, + +7 +00:00:18,060 --> 00:00:22,480 +nájdu vášu skutočnú identitu, +presnú polohu, operačný systém, + +8 +00:00:22,800 --> 00:00:26,500 +všetky stránky, ktoré ste navštívili, +webový prehliadač, ktorý používate na surfovanie, + +9 +00:00:26,700 --> 00:00:29,140 +a oveľa viac informácií +o vás a vašom živote + +10 +00:00:29,200 --> 00:00:31,500 +ktoré ste pravdepodobne nechceli +zdieľať s úplnými cudzincami, + +11 +00:00:31,700 --> 00:00:34,000 +ktorí môžu tieto dáta celkom ľahko +zneužiť. + +12 +00:00:34,500 --> 00:00:37,000 +Ale nie, ak používate Tor! + +13 +00:00:37,140 --> 00:00:40,840 +Prehliadač Tor ochraňuje naše súkromie +a identitu na internete. + +14 +00:00:41,560 --> 00:00:44,760 +Tor ochráni vaše internetové spojenie +troma vrstvami šifrovania + +15 +00:00:44,940 --> 00:00:49,760 +a nechá ich prejsť troma dobrovoľne +prevádzkovanými servermi kdekoľvek na svete, + +16 +00:00:50,280 --> 00:00:53,520 +čo nám umožňuje komunikovať +na internete anonymne. + +17 +00:00:56,560 --> 00:00:58,280 +Tor tiež ochraňuje naše dáta + +18 +00:00:58,400 --> 00:01:01,900 +proti korporáciám alebo hromadným +sledovaním zo strany vlády. + +19 +00:01:02,880 --> 00:01:07,340 +Možno žijete v krajine s autoritatívnym režimom, +ktorý sa snaží kontrolovať a sledovať internet. + +20 +00:01:07,900 --> 00:01:11,800 +Alebo možno nechcete, aby obrovské korporácie +zneužívali vaše osobné informácie. + +21 +00:01:12,880 --> 00:01:15,640 +Tor spôsobuje, že všetci používatelia +vyzerajú rovnako + +22 +00:01:15,920 --> 00:01:18,800 +čo mätie pozorovateľov +a vás robí anonymným. + +23 +00:01:19,500 --> 00:01:22,980 +Takže čím viac ľudí používa sieť Tor, tým +je silnejšia + +24 +00:01:23,140 --> 00:01:27,800 +keďže je ľahšie sa skryť v dave +ľudí, ktorí vyzerajú úplne rovnako. + +25 +00:01:28,700 --> 00:01:31,240 +Môžete obísť cenzúru bez toho, +aby ste sa museli báť, + +26 +00:01:31,400 --> 00:01:34,100 +že cenzor bude vedieť, +čo robíte na internete. + +27 +00:01:36,540 --> 00:01:39,440 +Reklamy vás nebudú +mesiace sledovať len preto + +28 +00:01:39,640 --> 00:01:41,300 +že ste raz klikli +na nejaký produkt. + +29 +00:01:43,880 --> 00:01:47,380 +Používaním prehliadača Tor ani len stránky, ktoré navštívite nebudú poznať vašu identitu, + +30 +00:01:47,540 --> 00:01:49,760 +nebudú vedieť z ktorej časti +sveta ich navštevujete, + +31 +00:01:49,920 --> 00:01:51,920 +pokým sa neprihlásite a nepoviete im to. + +32 +00:01:54,200 --> 00:01:55,840 +Stiahnutím a používaním siete Tor, + +33 +00:01:56,200 --> 00:01:58,560 +môžete ochrániť ľudí, +ktorí potrebujú anonymitu, + +34 +00:01:58,880 --> 00:02:01,640 +ako aktivisti, novinári a blogeri. + +35 +00:02:02,000 --> 00:02:07,000 +Stiahnite si a používate Tor! +Alebo nechajte bežať prenos! +

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 19 Jul '16

19 Jul '16

commit efc2eb4599c17e49ad7c431ab4215ae91ef7aab4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 19 17:46:57 2016 +0000 Update translations for tor_animation --- sk_SK.srt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sk_SK.srt b/sk_SK.srt index 48a252c..f2190b0 100644 --- a/sk_SK.srt +++ b/sk_SK.srt @@ -142,22 +142,23 @@ sveta ich navštevujete, 31 00:01:49,920 --> 00:01:51,920 -unless you login and tell them so. +pokým sa neprihlásite a nepoviete im to. 32 00:01:54,200 --> 00:01:55,840 -By downloading and using Tor, +Stiahnutím a používaním siete Tor, 33 00:01:56,200 --> 00:01:58,560 -you can protect the people -who need anonymity, +môžete ochrániť ľudí, +ktorí potrebujú anonymitu, 34 00:01:58,880 --> 00:02:01,640 -like activists, journalists and bloggers. +ako aktivisti, novinári a blogeri. 35 00:02:02,000 --> 00:02:07,000 -Download and use Tor! Or run a relay! +Stiahnite si a používate Tor! +Alebo nechajte bežať prenos!

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 19 Jul '16

19 Jul '16

commit 2d96e19a30bc8d8658ed31ef7a9b17f085e3157f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 19 17:16:56 2016 +0000 Update translations for tor_animation --- sk_SK.srt | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/sk_SK.srt b/sk_SK.srt index 8093319..48a252c 100644 --- a/sk_SK.srt +++ b/sk_SK.srt @@ -74,72 +74,71 @@ na internete anonymne. 17 00:00:56,560 --> 00:00:58,280 -Tor also protects our data +Tor tiež ochraňuje naše dáta 18 00:00:58,400 --> 00:01:01,900 -against corporate or government targeted -and mass surveillance. +proti korporáciám alebo hromadným +sledovaním zo strany vlády. 19 00:01:02,880 --> 00:01:07,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +Možno žijete v krajine s autoritatívnym režimom, +ktorý sa snaží kontrolovať a sledovať internet. 20 00:01:07,900 --> 00:01:11,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +Alebo možno nechcete, aby obrovské korporácie +zneužívali vaše osobné informácie. 21 00:01:12,880 --> 00:01:15,640 -Tor makes all of its users -to look the same +Tor spôsobuje, že všetci používatelia +vyzerajú rovnako 22 00:01:15,920 --> 00:01:18,800 -which confuses the observer -and makes you anonymous. +čo mätie pozorovateľov +a vás robí anonymným. 23 00:01:19,500 --> 00:01:22,980 -So, the more people use the Tor network, -the stronger it gets +Takže čím viac ľudí používa sieť Tor, tým +je silnejšia 24 00:01:23,140 --> 00:01:27,800 -as it's easier to hide in a crowd -of people who look exactly the same. +keďže je ľahšie sa skryť v dave +ľudí, ktorí vyzerajú úplne rovnako. 25 00:01:28,700 --> 00:01:31,240 -You can bypass the censorship -without being worried about +Môžete obísť cenzúru bez toho, +aby ste sa museli báť, 26 00:01:31,400 --> 00:01:34,100 -the censor knowing what you do -on the Internet. +že cenzor bude vedieť, +čo robíte na internete. 27 00:01:36,540 --> 00:01:39,440 -The ads won't follow you -everywhere for months, +Reklamy vás nebudú +mesiace sledovať len preto 28 00:01:39,640 --> 00:01:41,300 -starting when you first -clicked on a product. +že ste raz klikli +na nejaký produkt. 29 00:01:43,880 --> 00:01:47,380 -By using Tor, the sites you visit -won't even know who you are, +Používaním prehliadača Tor ani len stránky, ktoré navštívite nebudú poznať vašu identitu, 30 00:01:47,540 --> 00:01:49,760 -from what part of the world -you're visiting them, +nebudú vedieť z ktorej časti +sveta ich navštevujete, 31 00:01:49,920 --> 00:01:51,920

1 0