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

[metrics-lib/master] Implement a history file to avoid reading files twice.
by karsten＠torproject.org 15 Jan '12

15 Jan '12

commit fa07b8d59739c2f1d4813c2d315ab3e11a116d0d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 15 07:32:38 2012 +0100 Implement a history file to avoid reading files twice. --- .../descriptor/RelayDescriptorReader.java | 20 +--- .../descriptor/impl/RelayDescriptorReaderImpl.java | 99 +++++++++++++++----- 2 files changed, 83 insertions(+), 36 deletions(-) diff --git a/src/org/torproject/descriptor/RelayDescriptorReader.java b/src/org/torproject/descriptor/RelayDescriptorReader.java index 11735c9..90063c3 100644 --- a/src/org/torproject/descriptor/RelayDescriptorReader.java +++ b/src/org/torproject/descriptor/RelayDescriptorReader.java @@ -13,20 +13,12 @@ public interface RelayDescriptorReader { /* Add a local directory to read relay descriptors from. */ public void addDirectory(File directory); - /* Exclude the given file from the results. */ - public void setExcludeFile(File fileToExclude); - - /* Exclude the given files from the results. */ - public void setExcludeFiles(Set<File> filesToExclude); - - /* Exclude the given file from the results if it wasn't modified since - * the given timestamp. */ - public void setExcludeFile(File fileToExclude, long lastModifiedMillis); - - /* Exclude the given files from the results if they were not modified - * since the given timestamps. Map keys are files to exclude and map - * values are last modified timestamps. */ - public void setExcludeFiles(Map<File, Long> filesToExclude); + /* Exclude files that are contained in the given history file and that + * haven't changed since they were last read. Add reads from the + * current run to the history file. Remove files that don't exist + * anymore from the history file. Lines in the history file contain the + * last modified timestamp and the absolute path of a file. */ + public void setExcludeFiles(File historyFile); /* Read the previously configured relay descriptors and make them * available via the returned blocking iterator. Whenever the reader diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java index b0e2b81..81435e0 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java @@ -3,9 +3,13 @@ package org.torproject.descriptor.impl; import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileReader; import java.io.FileInputStream; +import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -13,7 +17,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.SortedMap; import java.util.Stack; +import java.util.TreeMap; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; import org.torproject.descriptor.RelayDescriptorReader; @@ -27,32 +33,16 @@ public class RelayDescriptorReaderImpl implements RelayDescriptorReader { this.directories.add(directory); } - public void setExcludeFile(File fileToExclude) { - throw new UnsupportedOperationException("Not implemented yet."); - /* TODO Implement me. */ - } - - public void setExcludeFiles(Set<File> filesToExclude) { - throw new UnsupportedOperationException("Not implemented yet."); - /* TODO Implement me. */ - } - - public void setExcludeFile(File fileToExclude, - long lastModifiedMillis) { - throw new UnsupportedOperationException("Not implemented yet."); - /* TODO Implement me. */ - } - - public void setExcludeFiles(Map<File, Long> filesToExclude) { - throw new UnsupportedOperationException("Not implemented yet."); - /* TODO Implement me. */ + private File historyFile; + public void setExcludeFiles(File historyFile) { + this.historyFile = historyFile; } public Iterator<DescriptorFile> readDescriptors() { BlockingIteratorImpl<DescriptorFile> descriptorQueue = new BlockingIteratorImpl<DescriptorFile>(); DescriptorReader reader = new DescriptorReader(this.directories, - descriptorQueue); + descriptorQueue, this.historyFile); new Thread(reader).start(); return descriptorQueue; } @@ -60,12 +50,69 @@ public class RelayDescriptorReaderImpl implements RelayDescriptorReader { private static class DescriptorReader implements Runnable { private List<File> directories; private BlockingIteratorImpl<DescriptorFile> descriptorQueue; + private File historyFile; private DescriptorReader(List<File> directories, - BlockingIteratorImpl<DescriptorFile> descriptorQueue) { + BlockingIteratorImpl<DescriptorFile> descriptorQueue, + File historyFile) { this.directories = directories; this.descriptorQueue = descriptorQueue; + this.historyFile = historyFile; } public void run() { + this.readOldHistory(); + this.readDescriptors(); + this.writeNewHistory(); + } + private SortedMap<String, Long> + oldHistory = new TreeMap<String, Long>(), + newHistory = new TreeMap<String, Long>(); + private void readOldHistory() { + if (this.historyFile == null) { + return; + } + try { + BufferedReader br = new BufferedReader(new FileReader( + this.historyFile)); + String line; + while ((line = br.readLine()) != null) { + if (!line.contains(" ")) { + /* TODO Handle this problem? */ + continue; + } + long lastModifiedMillis = Long.parseLong(line.substring(0, + line.indexOf(" "))); + String absolutePath = line.substring(line.indexOf(" ") + 1); + this.oldHistory.put(absolutePath, lastModifiedMillis); + } + br.close(); + } catch (IOException e) { + /* TODO Handle this exception. */ + } catch (NumberFormatException e) { + /* TODO Handle this exception. */ + } + } + private void writeNewHistory() { + if (this.historyFile == null) { + return; + } + try { + if (this.historyFile.getParentFile() != null) { + this.historyFile.getParentFile().mkdirs(); + } + BufferedWriter bw = new BufferedWriter(new FileWriter( + this.historyFile)); + for (Map.Entry<String, Long> e : this.newHistory.entrySet()) { + String absolutePath = e.getKey(); + long lastModifiedMillis = e.getValue(); + bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath + + "\n"); + } + bw.close(); + } catch (IOException e) { + /* TODO Handle this exception. */ + } + } + private void readDescriptors() { for (File directory : this.directories) { try { Stack<File> files = new Stack<File>(); @@ -75,13 +122,21 @@ public class RelayDescriptorReaderImpl implements RelayDescriptorReader { if (file.isDirectory()) { files.addAll(Arrays.asList(file.listFiles())); } else { + String absolutePath = file.getAbsolutePath(); + long lastModifiedMillis = file.lastModified(); + this.newHistory.put(absolutePath, lastModifiedMillis); + if (this.oldHistory.containsKey(absolutePath) && + this.oldHistory.get(absolutePath) == + lastModifiedMillis) { + continue; + } try { List<Descriptor> parsedDescriptors = this.readFile(file); DescriptorFileImpl descriptorFile = new DescriptorFileImpl(); descriptorFile.setDirectory(directory); descriptorFile.setFile(file); - descriptorFile.setLastModified(file.lastModified()); + descriptorFile.setLastModified(lastModifiedMillis); descriptorFile.setDescriptors(parsedDescriptors); this.descriptorQueue.add(descriptorFile); } catch (DescriptorParseException e) {

1 0

[metrics-tasks/master] Add graphing code for #4906.
by karsten＠torproject.org 15 Jan '12

15 Jan '12

commit 31f7b2a72901f7484f72e87e8013f15d89f28992 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 15 06:10:23 2012 +0100 Add graphing code for #4906. --- task-4906/.gitignore | 7 +++++++ task-4906/Eval.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ task-4906/README | 19 +++++++++++++++++++ task-4906/eval.R | 22 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 0 deletions(-) diff --git a/task-4906/.gitignore b/task-4906/.gitignore new file mode 100644 index 0000000..515a3f8 --- /dev/null +++ b/task-4906/.gitignore @@ -0,0 +1,7 @@ +*.class +in/ +lib/ +Rplots.pdf +out.csv +*.png + diff --git a/task-4906/Eval.java b/task-4906/Eval.java new file mode 100644 index 0000000..1d2d702 --- /dev/null +++ b/task-4906/Eval.java @@ -0,0 +1,44 @@ +import java.io.*; +import java.util.*; +import org.torproject.descriptor.*; + +public class Eval { + public static void main(String[] args) throws IOException { + SortedMap<String, String> lines = new TreeMap<String, String>(); + File inputDirectory = new File("in"); + RelayDescriptorReader reader = + DescriptorSourceFactory.createRelayDescriptorReader(); + reader.addDirectory(inputDirectory); + Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof ExtraInfoDescriptor)) { + continue; + } + ExtraInfoDescriptor extraInfoDescriptor = + (ExtraInfoDescriptor) descriptor; + BandwidthHistory dirreqWriteHistory = + extraInfoDescriptor.getDirreqWriteHistory(); + if (dirreqWriteHistory != null) { + String nickname = extraInfoDescriptor.getNickname(); + for (Map.Entry<Long, Long> e : + dirreqWriteHistory.getBandwidthValues().entrySet()) { + long intervalEnd = e.getKey(); + long writtenDirreqBytes = e.getValue(); + String key = nickname + "," + + String.valueOf(intervalEnd / 1000L); + String value = key + "," + String.valueOf(writtenDirreqBytes); + lines.put(key, value); + } + } + } + } + BufferedWriter bw = new BufferedWriter(new FileWriter("out.csv")); + for (String line : lines.values()) { + bw.write(line + "\n"); + } + bw.close(); + } +} + diff --git a/task-4906/README b/task-4906/README new file mode 100644 index 0000000..7b1f97f --- /dev/null +++ b/task-4906/README @@ -0,0 +1,19 @@ +Download and extract extra-info descriptors published by the directory +authorities. Put them in an in/ subdirectory. + + $ grep -REil "^extra-info gabelmoo|^extra-info moria1|^extra-info tor26| + ^extra-info ides|^extra-info dannenberg|^extra-info urras| + ^extra-info maatuska|^extra-info dizum" extra-infos-20??-?? | + xargs -I{} mv {} in/ + +Put metrics-lib's descriptor.jar in lib/. + +Run the Java program. + + $ javac -cp lib/descriptor.jar Eval.java + $ java -cp .:lib/descriptor.jar Eval + +Run R. + + $ R --slave -f eval.R + diff --git a/task-4906/eval.R b/task-4906/eval.R new file mode 100644 index 0000000..393fb7e --- /dev/null +++ b/task-4906/eval.R @@ -0,0 +1,22 @@ +library(ggplot2) +d <- read.csv("out.csv", header = FALSE, + col.names = c("dirauth", "intervalend", "writtendirreqbytes")) +d <- data.frame(dirauth = d$dirauth, + date = as.Date(d$intervalend / 86400, origin = "1970-01-01 00:00:00"), + writtendirreqbytes = d$writtendirreqbytes, count = 1) +c <- aggregate(x = list(count = d$count), + by = list(dirauth = d$dirauth, date = d$date), FUN = sum) +d <- aggregate(x = list(writtendirreqbytes = d$writtendirreqbytes), + by = list(dirauth = d$dirauth, date = d$date), FUN = sum) +e <- data.frame(dirauth = d$dirauth, date = d$date, + writtendirreqbytespersec = (d$writtendirreqbytes / c$count) / 900) +ggplot(e, aes(x = date, y = writtendirreqbytespersec / 1024, + colour = dirauth)) + +geom_line() + +scale_x_date(name = "\nDate") + +scale_y_continuous(name = "KiB/s\n") + +scale_colour_hue(name = "Directory authority") + +opts(title = "Written bytes on CONN_TYPE_DIR connections\n") +ggsave("dirauth-written-dirreq-bytes.png", width = 8, height = 6, + dpi = 100) +

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 Jan '12

14 Jan '12

commit a5dfa4687c3a5089472decc4db452a3832b9dacf Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 16:15:27 2012 +0000 Update translations for vidalia_help --- zh_CN/server.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/server.po b/zh_CN/server.po index 708826c..cbfe541 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -1,13 +1,14 @@ # # Translators: # chen zhang <magnyfx(a)hotmail.com>, 2011. +# <hua5679(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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-09-27 09:11+0000\n" -"Last-Translator: magny <magnyfx(a)hotmail.com>\n" +"PO-Revision-Date: 2012-01-14 16:11+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/server.html:24 msgid "Basic Settings" -msgstr "" +msgstr "基本设置" #. type: Content of: <html><body><p> #: en/server.html:26

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 14 Jan '12

14 Jan '12

commit c96ff6ff37fbdcb98de3a8b5960b9145a8c97fee Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 16:15:03 2012 +0000 Update translations for gettor --- zh_CN/gettor.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/zh_CN/gettor.po b/zh_CN/gettor.po index 21bd486..21cb605 100644 --- a/zh_CN/gettor.po +++ b/zh_CN/gettor.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <hua5679(a)gmail.com>, 2012. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. # <szescxz(a)126.com>, 2011. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-11-29 11:13+0000\n" -"Last-Translator: szescxz <szescxz(a)126.com>\n" +"PO-Revision-Date: 2012-01-14 16:10+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -413,7 +414,7 @@ msgstr "" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "" +msgstr "什么是Tor？" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." @@ -461,11 +462,11 @@ msgstr "" #: lib/gettor/i18n.py:270 msgid "QUESTION:" -msgstr "" +msgstr "问题：" #: lib/gettor/i18n.py:272 msgid "ANSWER:" -msgstr "" +msgstr "回答：" #: lib/gettor/i18n.py:274 #, python-format

1 0

[metrics-web/master] Avoid SELECT MAX() on partitioned statusentry table.
by karsten＠torproject.org 14 Jan '12

14 Jan '12

commit 1400d7b99cd3e7ee32a58e0025ba2a56a16aa561 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jan 14 12:04:36 2012 +0100 Avoid SELECT MAX() on partitioned statusentry table. For some reason, SELECT MAX() performs a full table scan on all child tables of a partitioned table. Good thing we have a non-partitioned table containing the consensuses that has the same information. --- .../torproject/ernie/web/RouterDetailServlet.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/web/RouterDetailServlet.java b/src/org/torproject/ernie/web/RouterDetailServlet.java index 033e9e6..677c293 100644 --- a/src/org/torproject/ernie/web/RouterDetailServlet.java +++ b/src/org/torproject/ernie/web/RouterDetailServlet.java @@ -71,7 +71,7 @@ public class RouterDetailServlet extends HttpServlet { + "FROM statusentry JOIN descriptor " + "ON descriptor.descriptor = statusentry.descriptor " + "WHERE statusentry.validafter = " - + "(SELECT MAX(validafter) FROM statusentry) " + + "(SELECT MAX(validafter) FROM consensus) " + "AND statusentry.fingerprint = ?"; try {

1 0

[metrics-db/master] Always copy files to rsync/ and keep last modified time.
by karsten＠torproject.org 14 Jan '12

14 Jan '12

commit 81dd6f373afa9a0ea1af222ad900681ca632e890 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jan 14 11:29:45 2012 +0100 Always copy files to rsync/ and keep last modified time. --- src/org/torproject/ernie/db/RsyncDataProvider.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 1f0d68f..455d6dd 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -123,9 +123,6 @@ public class RsyncDataProvider { } private void copyFile(File from, File to) { - if (to.exists()) { - return; - } try { to.getParentFile().mkdirs(); FileInputStream fis = new FileInputStream(from); @@ -138,6 +135,7 @@ public class RsyncDataProvider { } bis.close(); fos.close(); + to.setLastModified(from.lastModified()); } catch (IOException e) { e.printStackTrace(); }

1 0

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

14 Jan '12

commit 471d7294d851603f9431a92011711070e36264ab Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 09:45:13 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 3 +++ values-ca/strings.xml | 3 +++ values-de/strings.xml | 3 +++ values-el/strings.xml | 3 +++ values-es/strings.xml | 3 +++ values-eu/strings.xml | 3 +++ values-fa/strings.xml | 3 +++ values-fr/strings.xml | 3 +++ values-hu/strings.xml | 3 +++ values-it/strings.xml | 3 +++ values-mk/strings.xml | 3 +++ values-nb/strings.xml | 3 +++ values-nl/strings.xml | 3 +++ values-pl/strings.xml | 3 +++ values-pt/strings.xml | 3 +++ values-ru/strings.xml | 3 +++ values-sv/strings.xml | 3 +++ values-zh/strings.xml | 3 +++ values/strings.xml | 3 +++ 19 files changed, 57 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 5be5f99..b1c2d7d 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -194,4 +194,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index e13a6ed..39c6268 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -194,4 +194,7 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index ee0977b..6ae2765 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -195,4 +195,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="hidden_service_on">Verstckte Dienste auf:</string> <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string> <string name="unable_to_start_tor">Kann Tor nicht starten:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-el/strings.xml b/values-el/strings.xml index 401482d..f44522d 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index 093878d..77d9710 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -194,4 +194,7 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="hidden_service_on">Servicio oculto en:</string> <string name="unable_to_read_hidden_service_name">No se puede leer el nombre del servicio oculto</string> <string name="unable_to_start_tor">ADVERTENCIA: No Puedo iniciar la Red Tor:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index f80e370..d02f3d6 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index b84edf5..5cd9c6d 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 56e157c..71385df 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -189,4 +189,7 @@ <string name="hidden_service_on">service caché sur :</string> <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string> <string name="unable_to_start_tor">Impossible de démarrer Tor :</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 46d1e7a..a4e1499 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on">rejtett szolgáltatás itt:</string> <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string> <string name="unable_to_start_tor">Sikertelen a Tor elindítása:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index bf48d3c..ff13966 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -189,4 +189,7 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="hidden_service_on">servizio nascosto attivo:</string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor">Impossibile avviare Tor:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index f27f24f..62283a1 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 217e5f6..55ef32c 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index fb5ed30..8b10f6b 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -194,4 +194,7 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="hidden_service_on">hidden service op:</string> <string name="unable_to_read_hidden_service_name">Kan hidden service naam niet lezen.</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 98cdcb6..1d59f18 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index e06ca97..dea597c 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index acadd9a..c11deda 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index eea56c4..dcd60a2 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 3e64485..84c3b44 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -187,4 +187,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index d4bd0ef..3aca1ee 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on">hidden service on:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> </resources>

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 14 Jan '12

14 Jan '12

commit 6acd1217757b99d8308a1596d07fc5e33ff5e363 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 04:15:23 2012 +0000 Update translations for vidalia_installer --- ko/vidalia_ko.po | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index fd3e284..ab639d0 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -1,13 +1,14 @@ # # Translators: +# <cwt967(a)naver.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2010-12-05 20:21+0000\n" -"Last-Translator: \n" +"PO-Revision-Date: 2012-01-14 04:09+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,6 +34,17 @@ msgid "" "\n" "$_CLICK" msgstr "" +"이 마법사는 Tor, Vidalia, Polipo, Torbutton의 설치를 도와줄 것입니다. \n" +"\n" +"Tor는 익명 웹 브라우징과 인스턴트 메시징, IRC 등을 도와줌으로써 인터넷을 익명으로 사용할 수 있게 해 주는 시스템입니다. Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다. \n" +"\n" +"Polopo는 Tor을 통한 웹 브라우징의 성능을 향상시키기위해서 캐싱하는 웹 프록시입니다. \n" +"\n" +"Torbutton은 익명 웹 브라우징을 빨리 활성화시키고, 비활성화시키기 위한 파이어폭스 확장 기능입니다. \n" +"\n" +"만약 이전에 Tor나 Vidalia, Polipo, Firefox를 설치했다면, 이 설치를 계속하기 전에 작동을 정지시켜 주십시오. \n" +"\n" +"$_CLICK" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" @@ -40,7 +52,7 @@ msgstr "환영합니다. ${BUNDLE_NAME} 설치 마법사" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "설치 설명서" +msgstr "${TOR_NAME} 설치 문서" msgctxt "BundleFinishText" msgid "" @@ -49,9 +61,11 @@ msgid "" "\n" "If you installed Torbutton, you will need to restart Firefox." msgstr "" -"설치가 완료됩니다. \\ n자세한 내용은 https://www.torproject.org/docs/tor-doc-windows토르를 사용하여 응용 프로그램을 구성하는 방법을 배울 수있습니다.\n" +"설치가 완료되었습니다. \n" +"\n" +"자세한 내용은 https://www.torproject.org/docs/tor-doc-windows에서 토르를 사용하여 응용 프로그램을 구성하는 방법을 배울 수있습니다.\n" "\n" -"Torbutton 설치되어있는 경우, 당신은 파이어 폭스를 다시 시작해야 할 것입니다." +"Torbutton을 설치하신 경우, Firefox를 다시 시작하십시오. " msgctxt "BundleRunNow" msgid "Run installed components now" @@ -59,7 +73,7 @@ msgstr "" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." -msgstr "" +msgstr "Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다" msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." @@ -86,7 +100,7 @@ msgstr "" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." -msgstr "" +msgstr "Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다" msgctxt "VidaliaStartup" msgid "Run At Startup" @@ -113,6 +127,7 @@ msgid "" "Tor is a system for using the Internet anonymously, helping you anonymize " "Web browsing and publishing, instant messaging, IRC, and more." msgstr "" +"Tor는 익명 웹 브라우징과 인스턴트 메시징, IRC 등을 도와줌으로써 인터넷을 익명으로 사용할 수 있게 해 주는 시스템입니다." msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 14 Jan '12

14 Jan '12

commit 280983bc20dcb8c15490e1cd2ea90cec47b362ac Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 03:45:02 2012 +0000 Update translations for bridgedb --- ko/bridgedb.po | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/ko/bridgedb.po b/ko/bridgedb.po new file mode 100644 index 0000000..6c98caf --- /dev/null +++ b/ko/bridgedb.po @@ -0,0 +1,75 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <cwt967(a)naver.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: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2012-01-14 03:36+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "여기 귀하의 브릿지 중계가 있습니다. " + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr "" + +

1 0

[orbot/master] added multiple root-detect options
by n8fr8＠torproject.org 14 Jan '12

14 Jan '12

commit c23c7b52174adf21af5c121c05b4de56d33cb167 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 19:02:55 2012 -0500 added multiple root-detect options --- .../android/service/TorServiceUtils.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index fa27c58..faf7989 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -24,7 +24,13 @@ public class TorServiceUtils implements TorServiceConstants { try { // Check if Superuser.apk exists - //File file = new File("/system/app/Superuser.apk"); + File fileSU = new File("/system/app/Superuser.apk"); + if (fileSU.exists()) + return true; + + fileSU = new File("/system/bin/su"); + if (fileSU.exists()) + return true; //Check for 'su' binary String[] cmd = {"which su"};

1 0