September 2019 - tor-commits - lists.torproject.org

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit f6ead9152b1a3d5affb189b1c7942827dfec6208 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 08:18:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ml.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml.po b/ml.po index fd6663e78..453d72d4c 100644 --- a/ml.po +++ b/ml.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-09-12 08:04+0000\n" +"Last-Translator: ameer pb <ameerpbekm(a)gmail.com>\n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 3a83f3eb6daf97eac0166ff2bde9cbd8db579f03 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 08:17:25 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ml.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ml.po b/ml.po index fd6663e78..f8aa92df3 100644 --- a/ml.po +++ b/ml.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-09-12 08:04+0000\n" +"Last-Translator: ameer pb <ameerpbekm(a)gmail.com>\n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,11 +20,11 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" -msgstr "" +msgstr "ടോർ തയ്യാറാണ് " #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." -msgstr "" +msgstr "താങ്കൾക്കു ഇപ്പോൾ ഇന്റർനെറ്റ് ഉപയോഗിക്കാം " #: config/chroot_local-includes/etc/whisperback/config.py:69 #, python-format @@ -138,19 +138,19 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" -msgstr "" +msgstr "Cancel" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:609 msgid "Add" -msgstr "" +msgstr "ചേര്‍ക്കുക" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:617 msgid "Back" -msgstr "" +msgstr "പിന്നോട്ട്" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:731 msgid "Shutdown" -msgstr "" +msgstr "Shutdown" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:736 msgid "_Start Tails" @@ -214,7 +214,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150 msgid "Confirm" -msgstr "" +msgstr "ഉറപ്പാക്കു " #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109 msgid "Confirm your administration password" @@ -222,7 +222,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129 msgid "Disable" -msgstr "" +msgstr "പ്രവർത്തനരഹിതമാക്കു " #. This string will never be displayed in the 1st version of the greeter. #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160 @@ -284,7 +284,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581 msgid "Language & Region" -msgstr "" +msgstr "ഭാഷയും പ്രദേശവും " #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617 msgid "Default Settings" @@ -447,7 +447,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83 msgid "Restart" -msgstr "" +msgstr "പുനരാരംഭിക്കുക" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87 msgid "Power Off" @@ -476,7 +476,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:54 msgid "not available" -msgstr "" +msgstr "ലഭ്യമല്ല " #. Translators: Don't translate {details}, it's a placeholder and will #. be replaced. @@ -499,7 +499,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Configure" -msgstr "" +msgstr "ക്രമപ്പെടുത്തു " #. Translators: Don't translate {beginning} or {last}, they are #. placeholders and will be replaced. @@ -585,7 +585,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154 msgid "Remove" -msgstr "" +msgstr "ഒഴിവാക്കുക" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545 msgid "Installing your additional software from persistent storage..." @@ -620,7 +620,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37 msgid "Documentation" -msgstr "" +msgstr "ഉപയോക്തൃ മാനുവൽ" #. Translators: Don't translate {package}, it's a placeholder and will be #. replaced. @@ -709,7 +709,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149 msgid "Password" -msgstr "" +msgstr "രഹസ്യവാക്കു്" #: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" @@ -763,7 +763,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" -msgstr "" +msgstr "പിശക്" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" @@ -783,7 +783,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81 msgid "Learn more" -msgstr "" +msgstr "കൂടുതൽ അറിയാൻ " #: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Tor is not ready" @@ -799,7 +799,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:35 msgid "Tor Status" -msgstr "" +msgstr "ടോർ സ്ഥിതിഗതികൾ " #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:50 msgid "Open Onion Circuits" @@ -1051,7 +1051,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "" +msgstr "ടോർ ബ്രൗസർ " #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 984c98c8309d9ef3558733464afca56ac71a8c27 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 08:15:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- ml/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ml/exonerator.properties b/ml/exonerator.properties index 8cfbcbd02..b34e94455 100644 --- a/ml/exonerator.properties +++ b/ml/exonerator.properties @@ -49,5 +49,5 @@ footer.abouttor.body.link2=contact The Tor Project, Inc. footer.aboutexonerator.heading=About ExoneraTor footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP addresses that have been part of the Tor network.  It answers the question whether there was a Tor relay running on a given IP address on a given date.  ExoneraTor may store more than one IP address per relay if relays use a different IP address for exiting to the Internet than for registering in the Tor network, and it stores whether a relay permitted transit of Tor traffic to the open Internet at that time. footer.language.name=English -footer.language.text=This page is also available in the following languages: +footer.language.text=ഈ പേജ് തുടരെ പറയുന്ന ഭാഷകളിലും ലഭ്യമാണ്

1 0

[collector/master] Archive snowflake statistics.
by karsten＠torproject.org 12 Sep '19

12 Sep '19

commit 569bb83ff5e50843079ebd1150801a8bd8efa747 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 14 08:51:29 2019 +0200 Archive snowflake statistics. Implements #29461. --- CHANGELOG.md | 2 + build.xml | 2 +- .../org/torproject/metrics/collector/Main.java | 3 + .../metrics/collector/conf/Annotation.java | 3 +- .../metrics/collector/conf/Configuration.java | 1 + .../org/torproject/metrics/collector/conf/Key.java | 8 +- .../persist/SnowflakeStatsPersistence.java | 37 ++++ .../snowflake/SnowflakeStatsDownloader.java | 191 +++++++++++++++++++++ .../metrics/collector/sync/SyncPersistence.java | 5 + src/main/resources/collector.properties | 20 +++ src/main/resources/create-tarballs.sh | 7 + src/main/resources/docs/PROTOCOL | 33 +++- .../metrics/collector/conf/ConfigurationTest.java | 2 +- .../metrics/collector/cron/CollecTorMainTest.java | 1 + .../metrics/collector/cron/SchedulerTest.java | 9 +- 15 files changed, 317 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fd0401..c537d22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ versions resolved by Ivy are the same as in Debian stretch with few exceptions. - Remove Cobertura from the build process. + - Archive snowflake statistics. + - Update to metrics-lib 2.7.0. # Changes in version 1.9.1 - 2019-05-29 diff --git a/build.xml b/build.xml index 39180c7..d1d5b70 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ <property name="release.version" value="1.9.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.6.2" /> + <property name="metricslibversion" value="2.7.0" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" > diff --git a/src/main/java/org/torproject/metrics/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java index 46e93af..6907e93 100644 --- a/src/main/java/org/torproject/metrics/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -14,6 +14,7 @@ import org.torproject.metrics.collector.exitlists.ExitListDownloader; import org.torproject.metrics.collector.indexer.CreateIndexJson; import org.torproject.metrics.collector.onionperf.OnionPerfDownloader; import org.torproject.metrics.collector.relaydescs.ArchiveWriter; +import org.torproject.metrics.collector.snowflake.SnowflakeStatsDownloader; import org.torproject.metrics.collector.webstats.SanitizeWeblogs; import org.slf4j.Logger; @@ -53,6 +54,8 @@ public class Main { collecTorMains.put(Key.RelaydescsActivated, ArchiveWriter.class); collecTorMains.put(Key.OnionPerfActivated, OnionPerfDownloader.class); collecTorMains.put(Key.WebstatsActivated, SanitizeWeblogs.class); + collecTorMains.put(Key.SnowflakeStatsActivated, + SnowflakeStatsDownloader.class); } private static Configuration conf = new Configuration(); diff --git a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java index 2e47df0..8cd3324 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java @@ -18,7 +18,8 @@ public enum Annotation { Server("@type server-descriptor 1.0\n"), Status("@type bridge-network-status 1.2\n"), OnionPerf("@type torperf 1.1\n"), - Vote("@type network-status-vote-3 1.0\n"); + Vote("@type network-status-vote-3 1.0\n"), + SnowflakeStats("@type snowflake-stats 1.0\n"); private final String annotation; private final byte[] bytes; diff --git a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java index 69d3bcd..27f5125 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -91,6 +91,7 @@ public class Configuration extends Observable implements Cloneable { || this.getBool(Key.ExitlistsActivated) || this.getBool(Key.UpdateindexActivated) || this.getBool(Key.OnionPerfActivated) + || this.getBool(Key.SnowflakeStatsActivated) || this.getBool(Key.WebstatsActivated))) { throw new ConfigurationException("Nothing is activated!\n" + "Please edit collector.properties. Exiting."); diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java index ba4bcd9..e683fe2 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -66,7 +66,13 @@ public enum Key { WebstatsActivated(Boolean.class), WebstatsLimits(Boolean.class), WebstatsOffsetMinutes(Integer.class), - WebstatsPeriodMinutes(Integer.class); + WebstatsPeriodMinutes(Integer.class), + SnowflakeStatsActivated(Boolean.class), + SnowflakeStatsOffsetMinutes(Integer.class), + SnowflakeStatsPeriodMinutes(Integer.class), + SnowflakeStatsUrl(URL.class), + SnowflakeStatsSources(SourceType[].class), + SnowflakeStatsSyncOrigins(URL[].class); private Class clazz; private static Set<String> keys; diff --git a/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java new file mode 100644 index 0000000..ee6e029 --- /dev/null +++ b/src/main/java/org/torproject/metrics/collector/persist/SnowflakeStatsPersistence.java @@ -0,0 +1,37 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.persist; + +import org.torproject.descriptor.SnowflakeStats; +import org.torproject.metrics.collector.conf.Annotation; + +import java.nio.file.Paths; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; + +public class SnowflakeStatsPersistence + extends DescriptorPersistence<SnowflakeStats> { + + private static final String SNOWFLAKES = "snowflakes"; + + public SnowflakeStatsPersistence(SnowflakeStats desc) { + super(desc, Annotation.SnowflakeStats.bytes()); + calculatePaths(); + } + + private void calculatePaths() { + DateTimeFormatter directoriesFormatter = DateTimeFormatter + .ofPattern("uuuu/MM/dd").withZone(ZoneOffset.UTC); + String[] directories = this.desc.snowflakeStatsEnd() + .format(directoriesFormatter).split("/"); + DateTimeFormatter fileFormatter = DateTimeFormatter + .ofPattern("uuuu-MM-dd-HH-mm-ss").withZone(ZoneOffset.UTC); + String fileOut = this.desc.snowflakeStatsEnd().format(fileFormatter) + + "-snowflake-stats"; + this.recentPath = Paths.get(SNOWFLAKES, fileOut).toString(); + this.storagePath = Paths.get(SNOWFLAKES, directories[0], directories[1], + directories[2], fileOut).toString(); + } +} + diff --git a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java new file mode 100644 index 0000000..4f7994e --- /dev/null +++ b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java @@ -0,0 +1,191 @@ +/* Copyright 2019 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.snowflake; + +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorParser; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.SnowflakeStats; +import org.torproject.metrics.collector.conf.Annotation; +import org.torproject.metrics.collector.conf.Configuration; +import org.torproject.metrics.collector.conf.ConfigurationException; +import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.persist.SnowflakeStatsPersistence; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeSet; + +public class SnowflakeStatsDownloader extends CollecTorMain { + + private static final Logger logger = LoggerFactory.getLogger( + SnowflakeStatsDownloader.class); + + private String recentPathName; + + /** Instantiate the snowflake-stats module using the given configuration. */ + public SnowflakeStatsDownloader(Configuration config) { + super(config); + this.mapPathDescriptors.put("recent/snowflakes", SnowflakeStats.class); + } + + @Override + public String module() { + return "SnowflakeStats"; + } + + @Override + protected String syncMarker() { + return "SnowflakeStats"; + } + + @Override + protected void startProcessing() throws ConfigurationException { + + this.recentPathName = config.getPath(Key.RecentPath).toString(); + logger.debug("Downloading snowflake stats..."); + URL url = config.getUrl(Key.SnowflakeStatsUrl); + ByteArrayOutputStream downloadedSnowflakeStats + = this.downloadFromHttpServer(url); + if (null == downloadedSnowflakeStats) { + return; + } + logger.debug("Finished downloading {}.", url); + + DescriptorParser descriptorParser = + DescriptorSourceFactory.createDescriptorParser(); + SortedSet<LocalDateTime> snowflakeStatsEnds = new TreeSet<>(); + String outputPathName = config.getPath(Key.OutputPath).toString(); + for (Descriptor descriptor : descriptorParser.parseDescriptors( + downloadedSnowflakeStats.toByteArray(), null, null)) { + if (descriptor instanceof SnowflakeStats) { + SnowflakeStats snowflakeStats = (SnowflakeStats) descriptor; + LocalDateTime snowflakeStatsEnd = snowflakeStats.snowflakeStatsEnd(); + snowflakeStatsEnds.add(snowflakeStatsEnd); + SnowflakeStatsPersistence persistence + = new SnowflakeStatsPersistence(snowflakeStats); + File tarballFile = new File(outputPathName + "/" + + persistence.getStoragePath()); + if (tarballFile.exists()) { + continue; + } + File rsyncFile = new File(this.recentPathName + "/" + + persistence.getRecentPath()); + File[] outputFiles = new File[] { tarballFile, rsyncFile }; + for (File outputFile : outputFiles) { + this.writeToFile(outputFile, Annotation.SnowflakeStats.bytes(), + snowflakeStats.getRawDescriptorBytes()); + } + } + } + if (snowflakeStatsEnds.isEmpty()) { + logger.warn("Could not parse downloaded snowflake stats."); + return; + } else if (snowflakeStatsEnds.last().isBefore(LocalDateTime.now() + .minusHours(48L))) { + logger.warn("The latest snowflake stats are older than 48 hours: {}.", + snowflakeStatsEnds.last()); + } + + this.cleanUpRsyncDirectory(); + } + + /** + * Download the given URL from an HTTP server and return a stream with + * downloaded bytes. + * + * <p>If anything goes wrong while downloading, log a warning and return + * {@code null}.</p> + * + * @param url URL to download. + * @return Stream with downloaded bytes, or {@code null} if an error has + * occurred. + */ + private ByteArrayOutputStream downloadFromHttpServer(URL url) { + ByteArrayOutputStream downloadedBytes = new ByteArrayOutputStream(); + try { + HttpURLConnection huc = (HttpURLConnection) url.openConnection(); + huc.setRequestMethod("GET"); + huc.setReadTimeout(5000); + huc.connect(); + int response = huc.getResponseCode(); + if (response != 200) { + logger.warn("Could not download {}. Response code {}", url, response); + return null; + } + try (BufferedInputStream in = new BufferedInputStream( + huc.getInputStream())) { + int len; + byte[] data = new byte[1024]; + while ((len = in.read(data, 0, 1024)) >= 0) { + downloadedBytes.write(data, 0, len); + } + } + } catch (IOException e) { + logger.warn("Failed downloading {}.", url, e); + return null; + } + return downloadedBytes; + } + + /** + * Write the given byte array(s) to the given file. + * + * <p>If the file already exists, it is overwritten. If the parent directory + * (or any of its parent directories) does not exist, it is created. If + * anything goes wrong, log a warning and return.</p> + * + * @param outputFile File to write to. + * @param bytes One or more byte arrays. + */ + private void writeToFile(File outputFile, byte[] ... bytes) { + try { + if (!outputFile.getParentFile().exists() + && !outputFile.getParentFile().mkdirs()) { + logger.warn("Could not create parent directories of {}.", outputFile); + return; + } + OutputStream os = new FileOutputStream(outputFile); + for (byte[] b : bytes) { + os.write(b); + } + os.close(); + } catch (IOException e) { + logger.warn("Could not write downloaded snowflake stats to {}", + outputFile.getAbsolutePath(), e); + } + } + + /** Delete all files from the rsync directory that have not been modified + * in the last three days. */ + public void cleanUpRsyncDirectory() { + long cutOffMillis = System.currentTimeMillis() + - 3L * 24L * 60L * 60L * 1000L; + Stack<File> allFiles = new Stack<>(); + allFiles.add(new File(recentPathName)); + while (!allFiles.isEmpty()) { + File file = allFiles.pop(); + if (file.isDirectory()) { + allFiles.addAll(Arrays.asList(file.listFiles())); + } else if (file.lastModified() < cutOffMillis) { + file.delete(); + } + } + } +} + diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index 0d344bf..4b3b7bc 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -13,6 +13,7 @@ import org.torproject.descriptor.RelayExtraInfoDescriptor; import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; import org.torproject.descriptor.RelayServerDescriptor; +import org.torproject.descriptor.SnowflakeStats; import org.torproject.descriptor.TorperfResult; import org.torproject.descriptor.WebServerAccessLog; import org.torproject.metrics.collector.conf.Configuration; @@ -29,6 +30,7 @@ import org.torproject.metrics.collector.persist.MicroConsensusPersistence; import org.torproject.metrics.collector.persist.OnionPerfPersistence; import org.torproject.metrics.collector.persist.PersistenceUtils; import org.torproject.metrics.collector.persist.ServerDescriptorPersistence; +import org.torproject.metrics.collector.persist.SnowflakeStatsPersistence; import org.torproject.metrics.collector.persist.StatusPersistence; import org.torproject.metrics.collector.persist.VotePersistence; import org.torproject.metrics.collector.persist.WebServerAccessLogPersistence; @@ -143,6 +145,9 @@ public class SyncPersistence { case "BandwidthFile": descPersist = new BandwidthFilePersistence((BandwidthFile) desc); break; + case "SnowflakeStats": + descPersist = new SnowflakeStatsPersistence((SnowflakeStats) desc); + break; default: log.trace("Invalid descriptor type {} for sync-merge.", clazz.getName()); diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 292e876..a4eed7a 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -47,6 +47,13 @@ WebstatsActivated = false WebstatsPeriodMinutes = 360 # offset in minutes since the epoch and WebstatsOffsetMinutes = 31 +# the following defines, if this module is activated +SnowflakeStatsActivated = false +# period in minutes +SnowflakeStatsPeriodMinutes = 480 +# offset in minutes since the epoch and +SnowflakeStatsOffsetMinutes = 100 + ########################################## ## All below can be changed at runtime. ##### @@ -178,3 +185,16 @@ WebstatsLocalOrigins = in/webstats # Default 'true' behaves as stated in section 4 of # https://metrics.torproject.org/web-server-logs.html WebstatsLimits = true +# +# +######## Snowflake statistics ######## +# +## Define descriptor sources +# possible values: Sync, Remote +SnowflakeStatsSources = Remote +## Retrieve files from the following instances. +## List of URLs separated by comma. +SnowflakeStatsSyncOrigins = https://collector.torproject.org +## Where to download snowflake statistics from. +SnowflakeStatsUrl = https://snowflake-broker.torproject.net/metrics +# diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index 7e4668a..50b7fdb 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -59,6 +59,8 @@ TARBALLS=( bridge-server-descriptors-$YEARTWO-$MONTHTWO bridge-extra-infos-$YEARONE-$MONTHONE bridge-extra-infos-$YEARTWO-$MONTHTWO + snowflakes-$YEARONE-$MONTHONE + snowflakes-$YEARTWO-$MONTHTWO ) TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq)) @@ -86,6 +88,8 @@ DIRECTORIES=( $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/server-descriptors/ $OUTDIR/bridge-descriptors/$YEARONE/$MONTHONE/extra-infos/ $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/extra-infos/ + $OUTDIR/snowflakes/$YEARONE/$MONTHONE/ + $OUTDIR/snowflakes/$YEARTWO/$MONTHTWO/ ) DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq)) @@ -169,4 +173,7 @@ ln -f -s -t $ARCHIVEDIR/torperf/ $TARBALLTARGETDIR/torperf-20??-??.tar.xz mkdir -p $ARCHIVEDIR/webstats/ ln -f -s -t $ARCHIVEDIR/webstats/ $TARBALLTARGETDIR/webstats-20??-??.tar +mkdir -p $ARCHIVEDIR/snowflakes/ +ln -f -s -t $ARCHIVEDIR/snowflakes/ $TARBALLTARGETDIR/snowflakes-20??-??.tar.xz + echo `date` "Finished." diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL index 58ed4dc..478f168 100644 --- a/src/main/resources/docs/PROTOCOL +++ b/src/main/resources/docs/PROTOCOL @@ -45,6 +45,7 @@ * exit-lists * relay-descriptors * torperf + * snowflakes The substructure of these folders differs depending on their content. @@ -116,6 +117,13 @@ * for bandwidths, from the file_created value if available, otherwise the timestamp. +2.5 'snowflakes' below 'archive' + + 'snowflakes' contains compressed tarballs with snowflake statistics, + named in the following way: + + 'snowflakes' DASH year DASH month DOT TAR DOT compression-type + 3.0 Index Files The index.json file and its compressed versions of various types are @@ -132,6 +140,7 @@ * exit-lists * relay-descriptors * torperf + * snowflakes 4.1 'exit-lists' and 'torperf' below 'recent' @@ -254,6 +263,16 @@ 'webstats' contains compressed log files named according to the 'Tor web server logs' specification, section 4.3 [0]. +4.5 'snowflakes' below 'recent' + + 'snowflakes' contains files named + + year DASH month DASH day DASH hour DASH minute DASH second + DASH SNOWFLAKESTATS + + Where SNOWFLAKESTATS is the string "snowflake-stats" and all time related + values are derived from the snowflake statistics interval end. + 5.0 The Tar-ball's Directory Structure and the Internal Structure The 'out' directory is the internal storage that is used for @@ -266,8 +285,9 @@ * exit-lists * relay-descriptors * torperf + * snowflakes - (There has been a fifth subdirectory 'bridge-pool-assignments' which has been + (There has been another subdirectory 'bridge-pool-assignments' which has been removed when CollecTor stopped collecting those descriptors. However, it's structure can still be found in the tarballs.) @@ -416,6 +436,17 @@ 'webstats' contains compressed log files structured and named according to the 'Tor web server logs' specification, section 4.3 [0]. +5.5 'snowflakes' below 'out' + + 'snowflakes' contains the subdirectory structure + + year SEP month SEP day + + Where the time related values are taken from the snowflake statistics + interval end. + + The files are named according to the structure in 4.5. + 6.0 The 'contrib' Folder The 'contrib' folder contains third-party contributions. diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index 4ac623e..3a69c0c 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -38,7 +38,7 @@ public class ConfigurationTest { public void testKeyCount() { assertEquals("The number of properties keys in enum Key changed." + "\n This test class should be adapted.", - 53, Key.values().length); + 59, Key.values().length); } @Test() diff --git a/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java index 78b6ac7..d0fe173 100644 --- a/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/CollecTorMainTest.java @@ -72,6 +72,7 @@ public class CollecTorMainTest { case "Exitlist": case "OnionPerf": case "Webstats": + case "SnowflakeStats": assertNotNull("Property '" + key + "' not specified in " + Main.CONF_FILE + ".", props.getProperty(key)); diff --git a/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java index e0496fb..3f20646 100644 --- a/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/metrics/collector/cron/SchedulerTest.java @@ -31,7 +31,9 @@ public class SchedulerTest { + "UpdateindexActivated=true\nUpdateindexPeriodMinutes=1\n" + "UpdateindexOffsetMinutes=0\n" + "BridgedescsActivated=true\nBridgedescsPeriodMinutes=1\n" - + "BridgedescsOffsetMinutes=0\n"; + + "BridgedescsOffsetMinutes=0\n" + + "SnowflakeStatsActivated=true\nSnowflakeStatsPeriodMinutes=1\n" + + "SnowflakeStatsOffsetMinutes=0\n"; @Test() public void testSimpleSchedule() throws Exception { @@ -42,6 +44,7 @@ public class SchedulerTest { ctms.put(Key.BridgedescsActivated, Dummy.class); ctms.put(Key.RelaydescsActivated, Dummy.class); ctms.put(Key.ExitlistsActivated, Dummy.class); + ctms.put(Key.SnowflakeStatsActivated, Dummy.class); ctms.put(Key.UpdateindexActivated, Dummy.class); Field schedulerField = Scheduler.class.getDeclaredField("scheduler"); schedulerField.setAccessible(true); @@ -74,6 +77,7 @@ public class SchedulerTest { ctms.put(Key.BridgedescsActivated, Counter.class); ctms.put(Key.RelaydescsActivated, Counter.class); ctms.put(Key.ExitlistsActivated, Counter.class); + ctms.put(Key.SnowflakeStatsActivated, Counter.class); ctms.put(Key.UpdateindexActivated, Counter.class); conf.setProperty(Key.BridgeSources.name(), "Local"); conf.setProperty(Key.RelaySources.name(), "Remote"); @@ -84,7 +88,7 @@ public class SchedulerTest { schedulerField.get(Scheduler.getInstance()); Scheduler.getInstance().scheduleModuleRuns(ctms, conf); Scheduler.getInstance().shutdownScheduler(); - assertEquals(5, Counter.count.get()); + assertEquals(6, Counter.count.get()); } @Ignore("This test takes 180 seconds, which is too long.") @@ -97,6 +101,7 @@ public class SchedulerTest { ctms.put(Key.BridgedescsActivated, Broken.class); ctms.put(Key.RelaydescsActivated, Broken.class); ctms.put(Key.ExitlistsActivated, Broken.class); + ctms.put(Key.SnowflakeStatsActivated, Broken.class); ctms.put(Key.UpdateindexActivated, Broken.class); Field schedulerField = Scheduler.class.getDeclaredField("scheduler"); schedulerField.setAccessible(true);

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 62c9b27923f71583cb6d1d94cb64f744479469f2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 07:52:31 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- ml/torcheck.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/ml/torcheck.po b/ml/torcheck.po index 34ae79bb0..4ebd1b463 100644 --- a/ml/torcheck.po +++ b/ml/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# ameer pb <ameerpbekm(a)gmail.com>, 2019 # NITHIN <nithinsn(a)protonmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 01:51+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-09-12 07:52+0000\n" +"Last-Translator: ameer pb <ameerpbekm(a)gmail.com>\n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,15 +25,15 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "ടോർ സുരക്ഷിതമായി ഉപയോഗിക്കാൻ ദയവായി <a href=\"https://www.torproject.org/\"> ടോർ വെബ്സൈറ്റ് </a> പരാമർശിക്കുന്ന വിവരങ്ങൾ വായിക്കുക . നിങ്ങൾ ഇപ്പോൾ സ്വാതന്ത്ര്യമായി അജ്ഞാതനായി ഇന്റർനെറ്റ് തിരയുക " msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "ടോർ ബ്രൗസറിന് ഒരു സുരകാശിതമായ പുതുമ വന്നിരിക്കുന്നു " msgid "" "<a href=\"https://www.torproject.org/download/\">Click here to go to the " "download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/\">ഡൌൺലോഡ് പേജിലേക് പോകുവാൻ ഇവിടെ ക്ലിക്ക് ചെയ്യുക </a>" msgid "Sorry. You are not using Tor." msgstr "ശ്രദ്ധിക്കൂ, താങ്കൾ ഇപ്പോൾ ടോർ ഉപയോഗിക്കുന്നില്ല . " @@ -42,7 +43,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "" +msgstr "നിങ്ങൾ ഒരു ടോർ ക്ലയന്റ് ഉപയോഗിക്കുവാൻ ശ്രെമിക്കുകയാണെങ്കിൽ <a href=\"https://www.torproject.org/\">ടോർ വെബ്സൈറ്റ്റിൽ</a> പ്രീതിപാദിക്കുന്ന <a href=\"https://support.torproject.org/#faq\">നേരത്തെ ചോദിച്ച ചോദ്യവും ഉത്തരവും</a> സ്രെധിക്കുക്ക ." msgid "Sorry, your query failed or an unexpected response was received." msgstr "ക്ഷമിക്കണം! താങ്കളുടെ അഭ്യർത്ഥന പിഴച്ചു അല്ലെങ്കിൽ അപ്രതീക്ഷിത പ്രതികരണം ഉണ്ടായി ." @@ -51,21 +52,21 @@ msgid "Your IP address appears to be: " msgstr "നിങ്ങളുടെ ഐ പി അഡ്രസ്സ് ആയി കാണപ്പെടുന്നത് :" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "ഈ പേജ് തുടരെ പറയുന്ന ഭാഷകളിലും ലഭ്യമാണ് " msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "ഈ എക്സിറ് റെലയെകുറിച്ച കൂടുതൽ അറിയാൻ കാണുക:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "" +msgstr "ഈ ടോർ സംരംഭം ഒരു US 501(c)(3) ലാഭം എടുക്കാത്തതും ഗവേഷണം നടത്താനും വികാസത്തിനും ഓൺലൈൻ അജ്ഞാതത്തിനും സ്വകാര്യതയ്ക്കും സമർപ്പിച്ചിട്ടുള്ളതാണ് " msgid "Learn More »" msgstr "കൂടുതൽ അറിയു" msgid "Go" -msgstr "" +msgstr "പോകുക " msgid "Donate to Support Tor" msgstr "ടോറിനു സംഭാവന നൽകി പിന്തുണക്കു" @@ -74,7 +75,7 @@ msgid "Tor Q&A Site" msgstr "ടോർ ചോദ്യോത്തരങ്ങൾ " msgid "Volunteer" -msgstr "" +msgstr "സ്വമേധയാ സേവനം അനുഷ്ഠിക്കുക " msgid "JavaScript is enabled." msgstr "ജാവാസ്ക്രിപ്ട് പ്രാപ്തമാക്കിയിരിക്കുന്നു " @@ -83,13 +84,13 @@ msgid "JavaScript is disabled." msgstr "ജാവാസ്ക്രിപ്ട് അസാധുവാക്കിയിരിക്കുന്നു " msgid "However, it does not appear to be Tor Browser." -msgstr "" +msgstr "എന്നിരുന്നാലും ഇത് ടോർ ബ്രൗസറിൽ കാണുന്നില്ല " msgid "Run a Relay" msgstr "" msgid "Stay Anonymous" -msgstr "" +msgstr "അജ്ഞാതനായി തുടരുക " msgid "Relay Search" -msgstr "" +msgstr "റിലേ തിരയുക "

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 2f9a1a7230164e9e21e824efe01fca7f771283ed Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 07:51:48 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- ml/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml/aboutdialog.dtd b/ml/aboutdialog.dtd index 623a8cd97..f15b4fea4 100644 --- a/ml/aboutdialog.dtd +++ b/ml/aboutdialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; തയ്യാറാക്കിയത് ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "ഈ & വസ്തു ഉടമയുടെ ചെറിയ പേര് :"> +<!ENTITY project.end "ഒരു ലാഭം എടുക്കാതെ നിങ്ങൾക് വേണ്ടി സ്വകാര്യതയും സ്വാതന്ത്ര്യവും നൽകുന്ന പ്രവർത്തനം "> <!ENTITY help.start "സഹായിക്കാൻ ആഗ്രഹമുണ്ടോ ?">

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 3c4adb9cad27f085b119cfb0ae0d4dc89328885d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 06:51:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- ml/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ml/aboutdialog.dtd b/ml/aboutdialog.dtd index 4045676ee..623a8cd97 100644 --- a/ml/aboutdialog.dtd +++ b/ml/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "ടോർ ശൃംഖല വളരാൻ സഹായിക്കുക !">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "അനുമതി വിവരങ്ങൾ "> +<!ENTITY tor.TrademarkStatement "റ്റോറും ഒനിയൻ ലോഗോയും ടോർ പ്രൊജക്റ്റ് ഇങ്ക് ന്റെ സമ്മതിതായകനായി പേര് പതിക്കപ്പെട്ടിട്ടുള്ളതാണ് ">

1 0

[translation/tails-perl5lib] https://gitweb.torproject.org/translation.git/commit/?h=tails-perl5lib
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit 7c5545c4575b45e5ed9742107e3ebe7476232fdb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 06:48:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-perl5lib --- ml.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ml.po b/ml.po index 0d582ff86..9f4085e17 100644 --- a/ml.po +++ b/ml.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ameer pb <ameerpbekm(a)gmail.com>, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-01-06 16:58+0100\n" -"PO-Revision-Date: 2018-03-31 13:21+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-09-12 06:48+0000\n" +"Last-Translator: ameer pb <ameerpbekm(a)gmail.com>\n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +20,16 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:193 msgid "Error" -msgstr "" +msgstr "പിശക്" #: ../lib/Tails/RunningSystem.pm:195 msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +msgstr "ടൈൽ പ്രേവര്തിക്കുന്ന ഉപകരണം കണ്ടുകിട്ടുന്നില്ല . ചിലപ്പോൾ നിങ്ങൾ ടോർ ആം തിരഞ്ഞെടുത്തിട്ടുണ്ടാകും ?" #: ../lib/Tails/RunningSystem.pm:223 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "" +msgstr "ടൈൽ പ്രേവര്തിക്കുന്ന ഡ്രൈവ് കണ്ടുകിട്ടുന്നില്ല . ചിലപ്പോൾ നിങ്ങൾ 'ടോർ ആം'തിരഞ്ഞെടുത്തിട്ടുണ്ടാകും ?"

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit f529f8510df32371b9b4d94acf4d7c9306fb840f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 06:46:04 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ml/https-everywhere.dtd | 22 +++++++++++----------- ml/ssl-observatory.dtd | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ml/https-everywhere.dtd b/ml/https-everywhere.dtd index 14faf73ef..57f7ea39f 100644 --- a/ml/https-everywhere.dtd +++ b/ml/https-everywhere.dtd @@ -1,20 +1,20 @@ <!ENTITY https-everywhere.about.title "'എല്ലായിടവും എച്.ടി.ടി.പി.എസ് ' ന്റെ വിവരങ്ങൾ "> <!ENTITY https-everywhere.about.ext_name "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ്"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.ext_description "വെബ് രഹസ്യ കോഡുകൾ ആക്കി മാറ്റുക ! തനിയെ നിരവധി സൈറ്റുകളിൽ എഛ് ടി ടി പി എസ് സുരക്ഷിതത്വം ഉപയോഗിക്കുക "> <!ENTITY https-everywhere.about.version "പതിപ്പ്"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> +<!ENTITY https-everywhere.about.rulesets_version "വേണ്ട ഭരിക്കുന്ന വിധങ്ങൾ "> <!ENTITY https-everywhere.about.add_new_rule "പുതിയ വ്യവസ്ഥ ഉണ്ടാക്കൂ "> <!ENTITY https-everywhere.menu.donate_eff_imperative "ഇ.എഫ്എഫ് ന് സംഭാവന നൽകു"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere is OFF"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere is ON"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "Encrypt All Sites Eligible is ON"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "Encrypt All Sites Eligible is OFF"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "Unencrypted requests are currently blocked"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "Unencrypted requests are currently allowed"> -<!ENTITY https-everywhere.menu.seeMore "See more"> -<!ENTITY https-everywhere.menu.seeLess "See less"> +<!ENTITY https-everywhere.menu.observatory "എസ് എസ് എൽ നിരീക്ഷണ തിരഞ്ഞെടുക്കൽ "> +<!ENTITY https-everywhere.menu.globalDisable "എഛ് ടി ടി പി എസ് എല്ലായിടത്തും എന്നുള്ളത് ഓഫ് ആണ് "> +<!ENTITY https-everywhere.menu.globalEnable "എഛ് ടി ടി പി എസ് എല്ലായിടത്തും എന്നുള്ളത് ഓൺ ആണ് "> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "എല്ലാ സൈറ്റും രഹസ്യ കോഡുകൾ ആകുന്നത് ഓൺ ആണ് "> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "എല്ലാ സൈറ്റും രഹസ്യ കോഡുകൾ ആകുന്നത് ഓഫ് ആണ് "> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "രഹസ്യ കോഡുകൾ അല്ലാത്ത അപേക്ഷകൾ നിരോധിച്ചിരിക്കുകയാണ് "> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "രഹസ്യ കോഡുകൾ അല്ലാത്ത അപേക്ഷകൾ അനുവദിച്ചിരിക്കുന്നു "> +<!ENTITY https-everywhere.menu.seeMore "കൂടുതൽ കാണുക "> +<!ENTITY https-everywhere.menu.seeLess "കുറച്ചു കാണുക "> <!ENTITY https-everywhere.menu.httpNoWhereMore "This mode blocks unencrypted content and requests"> <!ENTITY https-everywhere.menu.showCounter "Show Counter"> <!ENTITY https-everywhere.menu.viewAllRules "എല്ലാ നിയമങ്ങളെയും കാണൂ"> diff --git a/ml/ssl-observatory.dtd b/ml/ssl-observatory.dtd index 9dc80014c..cbbc478c0 100644 --- a/ml/ssl-observatory.dtd +++ b/ml/ssl-observatory.dtd @@ -86,7 +86,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.show "Show advanced options"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> +<!ENTITY ssl-observatory.prefs.title "എസ് എസ് എൽ നിരീക്ഷണ തിരഞ്ഞെടുക്കൽ "> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 12 Sep '19

12 Sep '19

commit b002d9e23dde67ce5612f357a102692841add188 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 06:45:17 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ml/LC_MESSAGES/bridgedb.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po index 9e67b43ab..afbc1ecfb 100644 --- a/ml/LC_MESSAGES/bridgedb.po +++ b/ml/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: 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: 2019-09-12 06:15+0000\n" +"PO-Revision-Date: 2019-09-12 06:36+0000\n" "Last-Translator: ameer pb <ameerpbekm(a)gmail.com>\n" "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n" "MIME-Version: 1.0\n" @@ -296,36 +296,36 @@ msgstr "കിട്ടാവുന്ന അത്രയും പ്രശ് #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "" +msgstr "ഇതാണ് നിങ്ങളുടെ ബ്രിഡ്ജുകളുടെ പട്ടിക :" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "ബ്രിഡ്ജുകൾ സ്വീകരിക്കുക " #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "" +msgstr "ദയവായി ബ്രിഡ്ജു വകഭേദങ്ങൾ തിരഞ്ഞെടുക്കുക :" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "നിങ്ങൾക് ഐ പി വി 6 മേൽവിലാസം ആവശ്യമുണ്ടോ?" #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "നിങ്ങൾക് ഒരു ആവശ്യമുണ്ടോ %s?" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "നിങ്ങളുടെ ബ്രൌസർ ചിത്രങ്ങൾ വേണ്ട രീതിയിൽ പ്രദര്ശിപ്പിക്കുന്നില്ല ." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "" +msgstr " മുകളിൽ കാണുന്ന ചിത്രത്തിൽ നിന്നും അക്ഷരങ്ങൾ ചേർക്കുക " #: bridgedb/strings.py:144 msgid "How to start using your bridges" -msgstr "" +msgstr "എങ്ങനെ ബ്രിഡ്ജുകൾ ഉപയോഗിച്ച് തുടങ്ങും " #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: bridgedb/strings.py:146 @@ -334,21 +334,21 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "" +msgstr "ടോർ ബ്രൗസേരിലേക്കു ബ്രിഡ്ജുകൾ ചേർക്കണമെങ്കിൽ , ആദ്യം ടോർ ബ്രൌസർ ഇറക്കിവെക്കുന്ന %s വെബ് സൈറ്റിലേക് പോകുക \n%s എന്നിട് അവിടെ നിന്നും ഇറക്കിവെക്കാനും ടോർ ബ്രൌസർ തുടങ്ങാനുമുള്ള \nനിർദേശങ്ങൾ പിന്തുടരുക " #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "ടോർ നെറ്വർക്കിന്റെ സജ്ജീകരണ ജാലകം വരുമ്പോൾ , കോൺഫിഗറിൽ അമർത്തുകയും ആവശ്യപ്പെടുന്ന \nനിർദേശങ്ങൾ പിന്തുടരുകയും ചെയ്യുക :" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "നിങ്ങളുടെ ഇന്റർനെറ്റ് സേവന ദാതാവ് ( ഐ എസ് പി )ടോർ ശൃംഖലയിലേക്കുള്ള ബന്ധം തടസ്സപ്പെടുത്തുകയോ \nമറ്റോ ചെയ്യുന്നുണ്ടോ?" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159 @@ -357,30 +357,30 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "അതെ എന്നും തുടരുക എന്നും അമർത്തുക . നിങ്ങളുടെ ടോർ ബ്രിഡ്ജ് സജ്ജീകരിക്കാൻ , \nബ്രിഡ്ജ് വരികൾ ടെക്സ്റ്റ് ബോക്സിലേക് പകർത്തുകയും ഒട്ടിക്കുകയും ചെയ്യുക. അവസാനമായി 'കണക്ടിൽ' അമർത്തുക, കൂടാതെ \nനിങ്ങൾ തയ്യാറായി! ഇനി നിങ്ങൾ എന്തെങ്കിലും പ്രേശ്നങ്ങൾ അഭിമുഘീകരിക്കുക ആണെങ്കിൽ, ടോർ നെറ്റ്‌വർക്ക് സെറ്റിംഗ്സ് \nഎന്ന സഹായ നിർദ്ദേശ ജാലകത്തിലെ ഹെലീപിൽ അമർത്തുക ." #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "ഈ സന്ദേശം പ്രേദര്ശിപ്പിക്കുക " #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "വാനില ബ്രിഡ്ജുകൾ അപേക്ഷിക്കുക " #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "ഐ പി വി 6 ബ്രിഡ്ജുകൾ അപേക്ഷിക്കുക " #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "ഒരു പ്ലഗ്ഗ്‌ബിൾ ട്രാൻസ്പോർട് രീതി അപേക്ഷിക്കുക " #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "ബ്രിഡ്ജ് ഡി ബി യുടെ പൊതുവായ ഒരു ഗ്നു പി ജി കീ ലഭ്യമാക്കുക "

1 0