- tor-commits - lists.torproject.org

r24924: {website} include more languages when building the website (website/trunk)
by Runa Sandvik 21 Jul '11

21 Jul '11

Author: runa Date: 2011-07-21 15:12:53 +0000 (Thu, 21 Jul 2011) New Revision: 24924 Modified: website/trunk/Makefile.common Log: include more languages when building the website Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-07-21 10:00:37 UTC (rev 24923) +++ website/trunk/Makefile.common 2011-07-21 15:12:53 UTC (rev 24924) @@ -18,7 +18,7 @@ -D STABLETAG=$(STABLETAG) #LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=en ar es fr ru pl da it fa de fi vn cy zh-cn pt pt-br id nl +LANGS=ar ar-se bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) @@ -35,9 +35,15 @@ %.html.ar: ar/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.ar-se: ar-se/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.bms: bms/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.cy: cy/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.es: es/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -65,6 +71,9 @@ %.html.fr: fr/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.hu: hu/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.ja: ja/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -98,6 +107,9 @@ %.html.vi: vi/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.vn: vn/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.zh-cn: zh-cn/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -115,6 +127,13 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile +.deps/%.html.ar-se.d: ar-se/%.wml .deps/.stamp + tmpfile=`mktemp -t tmp.XXXXXXX` \ + lang=`dirname $<` && \ + OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ + wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ + sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ + rm -f $$tmpfile .deps/%.html.bms.d: bms/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \ @@ -192,6 +211,13 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile +.deps/%.html.hu.d: hu/%.wml .deps/.stamp + tmpfile=`mktemp -t tmp.XXXXXXX` \ + lang=`dirname $<` && \ + OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ + wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ + sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ + rm -f $$tmpfile .deps/%.html.ja.d: ja/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \ @@ -269,6 +295,13 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile +.deps/%.html.vn.d: vn/%.wml .deps/.stamp + tmpfile=`mktemp -t tmp.XXXXXXX` \ + lang=`dirname $<` && \ + OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ + wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ + sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ + rm -f $$tmpfile .deps/%.html.zh-cn.d: zh-cn/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \

1 0

[metrics-tasks/master] Avoid downloading server descriptor tarballs in #2394.
by karsten＠torproject.org 21 Jul '11

21 Jul '11

commit 7b75c704f5dad573ad6ba4f0a04cb8599b4cdb7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 21 16:01:14 2011 +0200 Avoid downloading server descriptor tarballs in #2394. --- task-2394/ParseDescriptors.java | 133 ++++++++++++++++++++++----------------- task-2394/README | 17 ++---- 2 files changed, 80 insertions(+), 70 deletions(-) diff --git a/task-2394/ParseDescriptors.java b/task-2394/ParseDescriptors.java index 2197670..641518d 100644 --- a/task-2394/ParseDescriptors.java +++ b/task-2394/ParseDescriptors.java @@ -21,13 +21,13 @@ public class ParseDescriptors { consensuses.put(filename, file); } else if (filename.endsWith("-votes")) { votes.put(filename, file); - } else if (filename.length() == 40) { + } else if (filename.endsWith("-descriptors")) { descriptors.put(filename, file); } } System.out.println("We found " + consensuses.size() - + " consensuses, " + votes.size() + " votes, and " - + descriptors.size() + " server descriptors."); + + " consensus files, " + votes.size() + " vote files, and " + + descriptors.size() + " server descriptor files."); /* Parse consensuses in an outer loop and the referenced votes and * descriptors in inner loops. Write the results to disk as soon as @@ -50,7 +50,6 @@ public class ParseDescriptors { bw.write("," + bandwidthAuthority + "bandwidth"); } bw.write("\n"); - Map<String, String> parsedDescriptors = new HashMap<String, String>(); for (File consensusFile : consensuses.values()) { System.out.println("Parsing consensus " + consensusFile.getName()); BufferedReader brC = new BufferedReader(new FileReader( @@ -58,12 +57,12 @@ public class ParseDescriptors { String lastRLine = null, lastSLine = null; String consensusTimestamp = consensusFile.getName().substring(0, "YYYY-MM-DD-hh-mm-ss".length()); - String votesFilename = consensusTimestamp + "-votes"; Map<String, Map<String, String>> measuredBandwidthsByDirSource = new HashMap<String, Map<String, String>>(); /* Parse votes first, if we have them, and extract measured * bandwidths. */ + String votesFilename = consensusTimestamp + "-votes"; if (votes.containsKey(votesFilename)) { BufferedReader brV = new BufferedReader(new FileReader( votes.get(votesFilename))); @@ -89,6 +88,74 @@ public class ParseDescriptors { brV.close(); } + /* Parse referenced server descriptors to learn about exit policies + * and reported bandwidths. */ + String descriptorsFilename = consensusTimestamp + "-descriptors"; + Map<String, String> parsedDescriptors = + new HashMap<String, String>(); + if (descriptors.containsKey(descriptorsFilename)) { + BufferedReader brD = new BufferedReader(new FileReader( + descriptors.get(descriptorsFilename))); + Set<String> defaultRejects = new HashSet<String>(); + /* Starting with 0.2.1.6-alpha, ports 465 and 587 were allowed + * in the default exit policy again (and therefore removed + * from the default reject lines). */ + Set<String> optionalRejects = new HashSet<String>(); + String lineD, address = null, fingerprint = null, + descriptorBandwidth = null; + boolean defaultPolicy = false, comparePolicies = true; + while ((lineD = brD.readLine()) != null) { + if (lineD.startsWith("router ")) { + address = lineD.split(" ")[2]; + defaultRejects.clear(); + defaultRejects.addAll(Arrays.asList(("0.0.0.0/8:*," + + "169.254.0.0/16:*,127.0.0.0/8:*,192.168.0.0/16:*," + + "10.0.0.0/8:*,172.16.0.0/12:*,$IP:*,*:25,*:119," + + "*:135-139,*:445,*:563,*:1214,*:4661-4666,*:6346-6429," + + "*:6699,*:6881-6999").split(","))); + optionalRejects.clear(); + optionalRejects.addAll(Arrays.asList( + "*:465,*:587".split(","))); + fingerprint = null; + descriptorBandwidth = null; + defaultPolicy = false; + comparePolicies = true; + } else if (lineD.startsWith("opt fingerprint ") || + lineD.startsWith("fingerprint ")) { + fingerprint = lineD.substring(lineD.startsWith("opt ") ? + "opt fingerprint".length() : "fingerprint".length()). + replaceAll(" ", "").toLowerCase(); + } else if (lineD.startsWith("bandwidth ")) { + descriptorBandwidth = lineD.split(" ")[3]; + } else if (lineD.startsWith("reject ") && comparePolicies) { + String rejectPattern = lineD.substring("reject ". + length()); + if (defaultRejects.contains(rejectPattern)) { + defaultRejects.remove(rejectPattern); + } else if (optionalRejects.contains(rejectPattern)) { + optionalRejects.remove(rejectPattern); + } else if (rejectPattern.equals(address + ":*")) { + defaultRejects.remove("$IP:*"); + } else { + comparePolicies = false; + } + } else if (lineD.startsWith("accept ") && comparePolicies) { + if (defaultRejects.isEmpty() && + lineD.equals("accept *:*")) { + defaultPolicy = true; + } + comparePolicies = false; + } else if (lineD.equals("router-signature")) { + if (address != null && fingerprint != null && + descriptorBandwidth != null) { + parsedDescriptors.put(fingerprint, descriptorBandwidth + "," + + (defaultPolicy ? "1" : "0")); + } + } + } + brD.close(); + } + /* Parse r, s, and w lines from the consensus. */ String lineC, validAfter = null; while ((lineC = brC.readLine()) != null) { @@ -110,64 +177,14 @@ public class ParseDescriptors { String consensusBandwidth = lineC.substring(lineC.indexOf( " Bandwidth=") + " Bandwidth=".length()).split(" ")[0]; - /* Parse the referenced server descriptor (if we haven't done so - * before) to learn about the relay's exit policy and reported - * bandwidth. */ + /* Look up whether we parsed this descriptor before. */ boolean parsedDescriptor = false, defaultPolicy = false; String descriptorBandwidth = null; - if (parsedDescriptors.containsKey(descriptor)) { - String parseResults = parsedDescriptors.get(descriptor); + if (parsedDescriptors.containsKey(fingerprint)) { + String parseResults = parsedDescriptors.get(fingerprint); parsedDescriptor = true; defaultPolicy = parseResults.endsWith("1"); descriptorBandwidth = parseResults.split(",")[0]; - } else if (descriptors.containsKey(descriptor)) { - parsedDescriptor = true; - BufferedReader brD = new BufferedReader(new FileReader( - descriptors.get(descriptor))); - Set<String> defaultRejects = new HashSet<String>( - Arrays.asList(("0.0.0.0/8:*,169.254.0.0/16:*," - + "127.0.0.0/8:*,192.168.0.0/16:*,10.0.0.0/8:*," - + "172.16.0.0/12:*,$IP:*,*:25,*:119,*:135-139,*:445," - + "*:563,*:1214,*:4661-4666,*:6346-6429,*:6699," - + "*:6881-6999").split(","))); - /* Starting with 0.2.1.6-alpha, ports 465 and 587 were allowed - * in the default exit policy again (and therefore removed - * from the default reject lines). */ - Set<String> optionalRejects = new HashSet<String>( - Arrays.asList("*:465,*:587".split(","))); - String lineD, address = null; - while ((lineD = brD.readLine()) != null) { - if (lineD.startsWith("router ")) { - address = lineD.split(" ")[2]; - } else if (lineD.startsWith("bandwidth ")) { - descriptorBandwidth = lineD.split(" ")[3]; - } else if (lineD.startsWith("reject ")) { - String rejectPattern = lineD.substring("reject ". - length()); - if (defaultRejects.contains(rejectPattern)) { - defaultRejects.remove(rejectPattern); - } else if (optionalRejects.contains(rejectPattern)) { - optionalRejects.remove(rejectPattern); - } else if (rejectPattern.equals(address + ":*")) { - defaultRejects.remove("$IP:*"); - } else { - break; - } - } else if (lineD.startsWith("accept ")) { - if (defaultRejects.isEmpty() && - lineD.equals("accept *:*")) { - defaultPolicy = true; - } - break; - } - } - brD.close(); - parsedDescriptors.put(descriptor, descriptorBandwidth + "," - + (defaultPolicy ? "1" : "0")); - } else { - System.out.println("We're missing descriptor " + descriptor - + ". Please make sure that all referenced server " - + "descriptors are available. Continuing anyway."); } /* Write everything we know about this relay to disk. */ diff --git a/task-2394/README b/task-2394/README index 5cb47f6..714853e 100644 --- a/task-2394/README +++ b/task-2394/README @@ -1,26 +1,19 @@ Visualize self-reported vs. measured bandwidth of relays ======================================================== - - Download consensus and votes from the metrics website, e.g., + - Download a single consensus and all referenced votes and server + descriptors from the metrics website, e.g., https://metrics.torproject.org/votes?valid-after=2011-07-13-05-00-00 https://metrics.torproject.org/consensus?valid-after=2011-07-13-05-00-00 + https://metrics.torproject.org/serverdesc?valid-after=2011-07-13-05-00-00 - - Also download the server descriptor archives containing the referenced - server descriptors from the metrics website. If the consensus was - published on the 3rd of a month or later, it's sufficient to download a - single tarball. Otherwise, download both tarballs for the current and - previous month: - - https://metrics.torproject.org/data/server-descriptors-2011-07.tar.bz2 - - - Extract the server descriptor tarball(s) into the subdirectory - descriptors/. Also copy the consensus and votes there. With the URLs + - Put all files into a new subdirectory descriptors/. With the URLs stated above, the directory would contain these files: 2011-07-13-05-00-00-consensus 2011-07-13-05-00-00-votes - server-descriptors-2011-07 + 2011-07-13-05-00-00-descriptors - Download Apache Commons Codec 1.4 or higher and put in in this directory.

1 0

[metrics-web/master] Wait, we have a ChangeLog file. Let's use it!
by karsten＠torproject.org 21 Jul '11

21 Jul '11

commit d1a80b31838d3678f48b8ce29cad3df2d847ccd8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 21 16:04:25 2011 +0200 Wait, we have a ChangeLog file. Let's use it! --- ChangeLog | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42032ca..d9829d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,10 @@ Metrics database and website change log: Changes in version 0.0.2 - 2011-??-?? - - Let users download votes from a given valid-after time. + - Let users download votes and server descriptors referenced from a + consensus by specifying its valid-after time. - Allow importing descriptors from a local Tor directory. + - Flush and close output streams of some servlets. Changes in version 0.0.1 - 2011-06-08 - Initial release

1 0

[metrics-web/master] Flush and close output streams.
by karsten＠torproject.org 21 Jul '11

21 Jul '11

commit 57a5a9994e6b62f03f1f6c7bff69637caaed066d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 21 14:46:21 2011 +0200 Flush and close output streams. Apparently, Tomcat 5 didn't care about this. But Tomcat 6 does. --- src/org/torproject/ernie/web/ConsensusServlet.java | 2 ++ .../ernie/web/ExtraInfoDescriptorServlet.java | 2 ++ .../torproject/ernie/web/GraphImageServlet.java | 1 + .../ernie/web/ServerDescriptorServlet.java | 2 ++ src/org/torproject/ernie/web/VotesServlet.java | 2 ++ 5 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/web/ConsensusServlet.java b/src/org/torproject/ernie/web/ConsensusServlet.java index eade324..d9a6ae1 100644 --- a/src/org/torproject/ernie/web/ConsensusServlet.java +++ b/src/org/torproject/ernie/web/ConsensusServlet.java @@ -96,6 +96,8 @@ public class ConsensusServlet extends HttpServlet { BufferedOutputStream output = new BufferedOutputStream( response.getOutputStream()); output.write(rawDescriptor); + output.flush(); + output.close(); } finally { /* Nothing to do here. */ } diff --git a/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java b/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java index 855801e..8ba33be 100644 --- a/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java +++ b/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java @@ -85,6 +85,8 @@ public class ExtraInfoDescriptorServlet extends HttpServlet { BufferedOutputStream output = new BufferedOutputStream( response.getOutputStream()); output.write(rawDescriptor); + output.flush(); + output.close(); } finally { /* Nothing to do here. */ } diff --git a/src/org/torproject/ernie/web/GraphImageServlet.java b/src/org/torproject/ernie/web/GraphImageServlet.java index db9eaaa..2eb2efd 100644 --- a/src/org/torproject/ernie/web/GraphImageServlet.java +++ b/src/org/torproject/ernie/web/GraphImageServlet.java @@ -96,6 +96,7 @@ public class GraphImageServlet extends HttpServlet { "inline; filename=\"" + imageFilename + "\""); output = new BufferedOutputStream(response.getOutputStream(), 1024); output.write(graphBytes, 0, graphBytes.length); + output.flush(); output.close(); } } diff --git a/src/org/torproject/ernie/web/ServerDescriptorServlet.java b/src/org/torproject/ernie/web/ServerDescriptorServlet.java index c8b45be..960bd75 100644 --- a/src/org/torproject/ernie/web/ServerDescriptorServlet.java +++ b/src/org/torproject/ernie/web/ServerDescriptorServlet.java @@ -86,6 +86,8 @@ public class ServerDescriptorServlet extends HttpServlet { BufferedOutputStream output = new BufferedOutputStream( response.getOutputStream()); output.write(rawDescriptor); + output.flush(); + output.close(); } finally { /* Nothing to do here. */ } diff --git a/src/org/torproject/ernie/web/VotesServlet.java b/src/org/torproject/ernie/web/VotesServlet.java index 3af9705..6755495 100644 --- a/src/org/torproject/ernie/web/VotesServlet.java +++ b/src/org/torproject/ernie/web/VotesServlet.java @@ -102,6 +102,8 @@ public class VotesServlet extends HttpServlet { for (byte[] rawDescriptor : rawDescriptors) { output.write(rawDescriptor); } + output.flush(); + output.close(); } finally { /* Nothing to do here. */ }

1 0

[metrics-web/master] Enable downloading all descriptors referenced by a consensus.
by karsten＠torproject.org 21 Jul '11

21 Jul '11

commit cfa54b8f076eced634d484e2cdaa4af84ab477fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 21 15:17:03 2011 +0200 Enable downloading all descriptors referenced by a consensus. --- .../ernie/web/ServerDescriptorServlet.java | 138 +++++++++++++++----- 1 files changed, 104 insertions(+), 34 deletions(-) diff --git a/src/org/torproject/ernie/web/ServerDescriptorServlet.java b/src/org/torproject/ernie/web/ServerDescriptorServlet.java index 960bd75..1db68c4 100644 --- a/src/org/torproject/ernie/web/ServerDescriptorServlet.java +++ b/src/org/torproject/ernie/web/ServerDescriptorServlet.java @@ -2,6 +2,8 @@ package org.torproject.ernie.web; import java.io.*; import java.sql.*; +import java.text.*; +import java.util.*; import java.util.logging.*; import java.util.regex.*; @@ -36,56 +38,124 @@ public class ServerDescriptorServlet extends HttpServlet { HttpServletResponse response) throws IOException, ServletException { - /* Check desc-id parameter. */ + /* Read desc-id and/or valid-after parameters. */ + String validAfterParameter = request.getParameter("valid-after"); String descIdParameter = request.getParameter("desc-id"); - if (descIdParameter == null || descIdParameter.length() < 8 || - descIdParameter.length() > 40) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } - String descId = descIdParameter.toLowerCase(); - Pattern descIdPattern = Pattern.compile("^[0-9a-f]+$"); - Matcher descIdMatcher = descIdPattern.matcher(descId); - if (!descIdMatcher.matches()) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } - /* Look up descriptor in the database. */ - String descriptor = null; - byte[] rawDescriptor = null; - try { - Connection conn = ds.getConnection(); - Statement statement = conn.createStatement(); - String query = "SELECT descriptor, rawdesc FROM descriptor " - + "WHERE descriptor LIKE '" + descId + "%'"; - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - descriptor = rs.getString(1); - rawDescriptor = rs.getBytes(2); + /* See if we were given a desc-id parameter. If so, look up this + * descriptor and return it. */ + List<byte[]> rawDescriptors = new ArrayList<byte[]>(); + String filename = null; + if (descIdParameter != null && validAfterParameter == null) { + if (descIdParameter.length() < 8 || + descIdParameter.length() > 40) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + String descId = descIdParameter.toLowerCase(); + Pattern descIdPattern = Pattern.compile("^[0-9a-f]+$"); + Matcher descIdMatcher = descIdPattern.matcher(descId); + if (!descIdMatcher.matches()) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + + /* Look up descriptor in the database. */ + try { + Connection conn = ds.getConnection(); + Statement statement = conn.createStatement(); + String query = "SELECT descriptor, rawdesc FROM descriptor " + + "WHERE descriptor LIKE '" + descId + "%'"; + ResultSet rs = statement.executeQuery(query); + if (rs.next()) { + filename = rs.getString(1); + rawDescriptors.add(rs.getBytes(2)); + } + rs.close(); + statement.close(); + conn.close(); + } catch (SQLException e) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; } - rs.close(); - statement.close(); - conn.close(); - } catch (SQLException e) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + + /* See if we were given a valid-after parameter. If so, return all + * descriptors referenced from the consensus published at that + * time. */ + } else if (descIdParameter == null && validAfterParameter != null) { + if (validAfterParameter.length() != + "yyyy-MM-dd-HH-mm-ss".length()) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + SimpleDateFormat parameterFormat = new SimpleDateFormat( + "yyyy-MM-dd-HH-mm-ss"); + parameterFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + long parsedTimestamp = -1L; + try { + parsedTimestamp = parameterFormat.parse(validAfterParameter). + getTime(); + } catch (ParseException e) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + if (parsedTimestamp < 0L) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + filename = validAfterParameter + "-descriptors"; + + /* Look up descriptors in the database. */ + SimpleDateFormat databaseFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + databaseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String databaseParameter = databaseFormat.format(parsedTimestamp); + try { + Connection conn = this.ds.getConnection(); + Statement statement = conn.createStatement(); + String query = "SELECT descriptor.rawdesc FROM statusentry " + + "JOIN descriptor ON statusentry.descriptor = " + + "descriptor.descriptor WHERE validafter = '" + + databaseParameter + "'"; + ResultSet rs = statement.executeQuery(query); + while (rs.next()) { + rawDescriptors.add(rs.getBytes(1)); + } + rs.close(); + statement.close(); + conn.close(); + } catch (SQLException e) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; + } + + /* Return an error if neither desc-id nor valid-after parameter was + * given (or both of them). */ + } else { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); return; } /* Write response. */ - if (rawDescriptor == null) { + if (rawDescriptors.size() == 0) { response.sendError(HttpServletResponse.SC_NOT_FOUND); return; } try { response.setContentType("text/plain"); + int responseLength = 0; + for (byte[] rawDescriptor : rawDescriptors) { + responseLength += rawDescriptor.length; + } response.setHeader("Content-Length", String.valueOf( - rawDescriptor.length)); + responseLength)); response.setHeader("Content-Disposition", "inline; filename=\"" - + descriptor + "\""); + + filename + "\""); BufferedOutputStream output = new BufferedOutputStream( response.getOutputStream()); - output.write(rawDescriptor); + for (byte[] rawDescriptor : rawDescriptors) { + output.write(rawDescriptor); + } output.flush(); output.close(); } finally {

1 0

[torspec/master] Spec changes for proposal 181 (client-side optimistic data)
by nickm＠torproject.org 21 Jul '11

21 Jul '11

commit 4212db3cb902a368199d96b3483f4ce15ce4cfed Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 11:08:09 2011 -0400 Spec changes for proposal 181 (client-side optimistic data) --- dir-spec.txt | 5 +++++ proposals/000-index.txt | 4 ++-- proposals/181-optimistic-data-client.txt | 3 ++- socks-extensions.txt | 13 +++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index a4dd14f..9a22323 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1207,6 +1207,11 @@ parameters governing behavior" in path-spec.txt for a series of circuit build time related consensus params. + "UseOptimisticData" -- If set to zero, clients by default + shouldn't try to send optimistic data to servers until they have + received a RELAY_CONNECTED cell. + Min: 0, Max: 1 + The authority section of a vote contains the following items, followed in turn by the authority's current key certificate: diff --git a/proposals/000-index.txt b/proposals/000-index.txt index bd952ad..97248b8 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -101,7 +101,7 @@ Proposals by number: 178 Require majority of authorities to vote for consensus parameters [OPEN] 179 TLS certificate and parameter normalization [DRAFT] 180 Pluggable transports for circumvention [OPEN] -181 Optimistic Data for Tor: Client Side [OPEN] +181 Optimistic Data for Tor: Client Side [CLOSED] 182 Credit Bucket [DRAFT] @@ -133,7 +133,6 @@ Proposals by status: 177 Abstaining from votes on individual flags [for 0.2.3.x] 178 Require majority of authorities to vote for consensus parameters [for 0.2.3.x] 180 Pluggable transports for circumvention [for 0.2.3.x] - 181 Optimistic Data for Tor: Client Side ACCEPTED: 110 Avoiding infinite length circuits [for 0.2.3.x] [in 0.2.1.3-alpha] 117 IPv6 exits [for 0.2.3.x] @@ -186,6 +185,7 @@ Proposals by status: 167 Vote on network parameters in consensus [in 0.2.2] 171 Separate streams across circuits by connection metadata [in 0.2.3.3-alpha] 174 Optimistic Data for Tor: Server Side [in 0.2.3.1-alpha] + 181 Optimistic Data for Tor: Client Side [in 0.2.3.3-alpha] SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/181-optimistic-data-client.txt b/proposals/181-optimistic-data-client.txt index 733b8a1..6d0a929 100644 --- a/proposals/181-optimistic-data-client.txt +++ b/proposals/181-optimistic-data-client.txt @@ -2,7 +2,8 @@ Filename: 181-optimistic-data-client.txt Title: Optimistic Data for Tor: Client Side Author: Ian Goldberg Created: 2-Jun-2011 -Status: Open +Status: Closed +Implemented-In: 0.2.3.3-alpha Overview: diff --git a/socks-extensions.txt b/socks-extensions.txt index f587d9c..b9f070a 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -75,6 +75,19 @@ Tor's extensions to the SOCKS protocol misconfigured. This is helpful for the many users who mistakenly try to use Tor as an HTTP proxy instead of a SOCKS proxy. +5. Optimistic data + + Tor allows SOCKS clients to send connection data before Tor has sent a + SOCKS response. When using an exit node that supports "optimistic data", + Tor will send such data to the server without waiting to see whether the + connection attempt succeeds. This behavior can save a single round-trip + time when starting connections with a protocol where the client speaks + first (like HTTP). Clients that do this must be ready to hear that + their connection has succeeded or failed _after_ they have sent the + data. + + + References: [1] http://archive.socks.permeo.com/protocol/socks4.protocol [2] http://archive.socks.permeo.com/protocol/socks4a.protocol

1 0

[tor/master] Improve log messages for optimistic data retry
by nickm＠torproject.org 21 Jul '11

21 Jul '11

commit a2bd0397ff2388a6e5a09e0cb8253f4dccf63e21 Author: Ian Goldberg <iang(a)cs.uwaterloo.ca> Date: Thu Jul 21 09:49:00 2011 -0400 Improve log messages for optimistic data retry --- src/or/connection_edge.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index a7e3c16..4d3e254 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2441,8 +2441,10 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn) if ((connection_get_inbuf_len(TO_CONN(ap_conn)) || ap_conn->sending_optimistic_data) && connection_ap_supports_optimistic_data(ap_conn)) { - log_info(LD_APP, "Sending up to %ld bytes of queued-up data", - connection_get_inbuf_len(TO_CONN(ap_conn))); + log_info(LD_APP, "Sending up to %ld + %ld bytes of queued-up data", + connection_get_inbuf_len(TO_CONN(ap_conn)), + ap_conn->sending_optimistic_data ? + generic_buffer_len(ap_conn->sending_optimistic_data) : 0); if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) { connection_mark_for_close(TO_CONN(ap_conn)); }

1 0

[tor/master] Add src/test/test{-child}.exe to gitignore. bug3626
by nickm＠torproject.org 21 Jul '11

21 Jul '11

commit 2f0fadbe8bc8085558acb654e9e549e769e7401e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 08:40:25 2011 -0400 Add src/test/test{-child}.exe to gitignore. bug3626 --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 867a97d..610965b 100644 --- a/.gitignore +++ b/.gitignore @@ -146,6 +146,8 @@ /src/test/Makefile.in /src/test/test /src/test/test-child +/src/test/test.exe +/src/test/test-child.exe # /src/tools/

1 0

r24923: {website} revert my changes so that the website builds again (website/trunk)
by Runa Sandvik 21 Jul '11

21 Jul '11

Author: runa Date: 2011-07-21 10:00:37 +0000 (Thu, 21 Jul 2011) New Revision: 24923 Modified: website/trunk/Makefile.common Log: revert my changes so that the website builds again Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-07-21 08:48:17 UTC (rev 24922) +++ website/trunk/Makefile.common 2011-07-21 10:00:37 UTC (rev 24923) @@ -18,7 +18,7 @@ -D STABLETAG=$(STABLETAG) #LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=en ar ar-sa es fr hu ru pl da it fa de fi vn cy zh-cn pt pt-br id nl +LANGS=en ar es fr ru pl da it fa de fi vn cy zh-cn pt pt-br id nl WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) @@ -35,9 +35,6 @@ %.html.ar: ar/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ -%.html.ar-sa: ar-sa/%.wml en/%.wml - lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ - %.html.bms: bms/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -56,9 +53,6 @@ %.html.fa: fa/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ -%.html.hu: hu/%.wml en/%.wml - lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ - %.html.id: id/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -121,13 +115,6 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile -.deps/%.html.ar-sa.d: ar-sa/%.wml .deps/.stamp - tmpfile=`mktemp -t tmp.XXXXXXX` \ - lang=`dirname $<` && \ - OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ - wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ - sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ - rm -f $$tmpfile .deps/%.html.bms.d: bms/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \ @@ -205,13 +192,6 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile -.deps/%.html.hu.d: hu/%.wml .deps/.stamp - tmpfile=`mktemp -t tmp.XXXXXXX` \ - lang=`dirname $<` && \ - OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ - wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ - sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ - rm -f $$tmpfile .deps/%.html.ja.d: ja/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \

1 0

r24922: {website} new languages for the website, updated translations (in website/trunk: . about about/ar-sa about/fa docs docs/ar docs/ar-sa docs/de docs/fa docs/fi docs/fr docs/pl donate/pl download download/de download/fa download/pl getinvolved getinvolved/ar-sa getinvolved/hu getinvolved/pl projects projects/ar-sa torbutton torbutton/hu)
by Runa Sandvik 21 Jul '11

21 Jul '11

Author: runa Date: 2011-07-21 08:48:17 +0000 (Thu, 21 Jul 2011) New Revision: 24922 Added: website/trunk/about/ar-sa/ website/trunk/about/ar-sa/sidenav.wmi website/trunk/about/ar-sa/translators.wml website/trunk/about/fa/sponsors.wml website/trunk/docs/ar-sa/ website/trunk/docs/ar-sa/installguide.wml website/trunk/docs/ar-sa/sidenav.wmi website/trunk/docs/fa/N900.wml website/trunk/download/fa/ website/trunk/download/fa/thankyou.wml website/trunk/getinvolved/ar-sa/ website/trunk/getinvolved/ar-sa/mirrors.wml website/trunk/getinvolved/ar-sa/sidenav.wmi website/trunk/getinvolved/hu/ website/trunk/getinvolved/hu/mirrors.wml website/trunk/getinvolved/hu/sidenav.wmi website/trunk/projects/ar-sa/ website/trunk/projects/ar-sa/puppettor.wml website/trunk/projects/ar-sa/sidenav.wmi website/trunk/torbutton/hu/ website/trunk/torbutton/hu/index.wml website/trunk/torbutton/hu/sidenav.wmi Modified: website/trunk/Makefile.common website/trunk/docs/ar/bridges.wml website/trunk/docs/ar/debian.wml website/trunk/docs/de/bridges.wml website/trunk/docs/de/tor-doc-windows.wml website/trunk/docs/fi/debian.wml website/trunk/docs/fr/bridges.wml website/trunk/docs/pl/bridges.wml website/trunk/docs/pl/debian.wml website/trunk/docs/pl/faq.wml website/trunk/donate/pl/donate.wml website/trunk/download/de/download.wml website/trunk/download/pl/download.wml website/trunk/getinvolved/pl/volunteer.wml Log: new languages for the website, updated translations Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/Makefile.common 2011-07-21 08:48:17 UTC (rev 24922) @@ -18,7 +18,7 @@ -D STABLETAG=$(STABLETAG) #LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=en ar es fr ru pl da it fa de fi vn cy zh-cn pt pt-br id nl +LANGS=en ar ar-sa es fr hu ru pl da it fa de fi vn cy zh-cn pt pt-br id nl WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) @@ -35,6 +35,9 @@ %.html.ar: ar/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.ar-sa: ar-sa/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.bms: bms/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -53,6 +56,9 @@ %.html.fa: fa/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.hu: hu/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.id: id/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -115,6 +121,13 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile +.deps/%.html.ar-sa.d: ar-sa/%.wml .deps/.stamp + tmpfile=`mktemp -t tmp.XXXXXXX` \ + lang=`dirname $<` && \ + OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ + wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ + sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ + rm -f $$tmpfile .deps/%.html.bms.d: bms/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \ @@ -192,6 +205,13 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile +.deps/%.html.hu.d: hu/%.wml .deps/.stamp + tmpfile=`mktemp -t tmp.XXXXXXX` \ + lang=`dirname $<` && \ + OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ + wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ + sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ + rm -f $$tmpfile .deps/%.html.ja.d: ja/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \ Added: website/trunk/about/ar-sa/sidenav.wmi =================================================================== --- website/trunk/about/ar-sa/sidenav.wmi (rev 0) +++ website/trunk/about/ar-sa/sidenav.wmi 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,56 @@ +## translation metadata +# Revision: $Revision: 24336 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'about/overview', + 'txt' => 'Tor Overview', + }, + {'url' => 'about/torusers', + 'txt' => 'Users of Tor', + }, + + {'url' => 'about/corepeople', + 'txt' => 'Tor People', + 'subelements' => [ + {'url' => 'about/board', + 'txt' => 'Board of Directors', + }, + {'url' => 'about/translators', + 'txt' => 'Translators', + }, + {'url' => 'about/volunteers', + 'txt' => 'Volunteers', + }, + {'url' => 'about/contributors', + 'txt' => 'Past Contributors', + }] + }, + {'url' => 'about/sponsors', + 'txt' => 'Sponsors', + }, + {'url' => 'about/financials', + 'txt' => 'Financial Reports', + }, + {'url' => 'projects/projects', + 'txt' => 'Projects', + }, + {'url' => 'docs/documentation', + 'txt' => 'Documentation', + }, + ]; +:> Added: website/trunk/about/ar-sa/translators.wml =================================================================== --- website/trunk/about/ar-sa/translators.wml (rev 0) +++ website/trunk/about/ar-sa/translators.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,45 @@ + + + + + +## translation metadata +# Revision: $Revision: 23729 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor Project: Translators" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> <a href="<page +about/overview>">About » </a> <a href="<page +about/volunteers>">Translators</a> + </div> + <div id="maincol"> + <h1>المترجمون</h1> +<dl> +<dt>Bogdan Drozdowski</dt><dd>Polish</dd> +<dt>Tiago Faria</dt><dd>Portuguese.</dd> +<dt>fredzupy</dt><dd>French</dd> +<dt>Jens Kubieziel and Oliver Knapp</dt><dd>German</dd> +<dt>Pei Hanru and bridgefish</dt><dd>Simplified Chinese</dd> +<dt>Jan Reister</dt><dd>Italian</dd> +<dt>ygrek and an anonymous translator</dt><dd>Russian</dd> +<dt>Ghazal Teheri</dt><dd>Persian</dd> +<dt>Htaike Htaike Aung</dt><dd>Burmese</dd> +<dt>Osama Khalid</dt><dd>العربية</dd> +<dt>Alexia Prichard</dt><dd>Spanish</dd> +</dl> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/about/fa/sponsors.wml =================================================================== --- website/trunk/about/fa/sponsors.wml (rev 0) +++ website/trunk/about/fa/sponsors.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,102 @@ + + + + + +## translation metadata +# Revision: $Revision: 24829 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor: Sponsors" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">خانه »</a> <a href="<page about/overview>">درباره ما +»</a> <a href="<page about/sponsors>">حامیان</a> + </div> + <div id="maincol"> + <h1> حامیان تور</h1> + <p> + پروژه تور + <a href="<page about/torusers>">تنوع کاربران</a> + به این معنی است که ما تنوع زیادی از منابع مالی داریم -- و همچنین ما مشتاق +به تنوع و حتی بیشتر شدن این حمایتها داریم! نحوه حمایتهای مالی مابر اساس +بودجه کل دریافت شده بطرز زیر تقسیم می شوند : + </p> + + <h3><i>Magnoliophyta</i> (بیش از 1 میلیون دلار )</h3> + <ul> + <li> سازمان ناشناس غیر دولتی در آمریکا (2008-2011 )</li> + <li><a href="http://www.bbg.gov/">صدا و سیما</a> (2006-2011)</li> + </ul> + + <h3><i>Liliopsida</i> (تا ۷۵۰ هزار دلار)</h3> + <ul> + <li><a href="http://www.sida.se/English/">Sida -- همکاری آژانس توسعه بین المللی +سوئد</a> (2010-2011)</li> + </ul> + + <h3><i>Asparagales</i> (تا $ 500K)</h3> + <ul> + <li><a href="http://www.internews.fr/">اینترنیوز اروپا</a> (2006-2008)</li> + <li><a href="http://nsf.gov/">بنیاد ملی علوم آمریکا از طریق دانشگاه</a> درکسل +(2،009-2011 )</li> + </ul> + + <h3><i>Alliaceae</i> (تا $ 200k)</h3> + <ul> + <li>شما و یا سازمان شما</li> + </ul> + + <h3><i>سیرها</i> (تا ۱۰۰ هزار دلار)</h3> + <ul> + <li><a href="http://www.nlnet.nl/">NLnet بنیاد</a> (2008-2009)</li> + <li><a href="http://chacs.nrl.navy.mil/">آزمایشگاه تحقیقات نیروی دریایی</a> +(2006-2010)</li> + <li>ناشناس آمریکایی ISP (2009-2011)</li> + </ul> + + <h3><i>سیرها CEPA</i> (به دلار 50k)</h3> + <ul> + <li><a href="<page donate/donate>">بیش از ۶۰۰ فرد حقیقی کمکهای مالی افرادی مثل +شما</a> (2006-2011)</li> + <li><a href="http://code.google.com/opensource/">گوگل</a> (2008-2009)</li> + <li><a href="http://code.google.com/soc/">تابستان گوگل </a> (2007-2011)</li> + <li><a href="http://www.hrw.org/"> سازمان دیده بان حقوق بشر</a> (2007)</li> + <li><a href="http://www.torfox.org/">Torfox</a> (2009)</li> + <li><a href="http://www.shinjiru.com/">Shinjiru فناوری</a> (2009-2011)</li> + </ul> + + <h3>حامیان مالی گذشته</h3> + <p>ما از حمایت توسط حامیان مالی گذشته خود که ما را درحفظ 501 (ج) (3) پروژه +تور و پیشرفت و رسیدن به اهداف بلند پروازانه این پروژه ما را یاری دادند کمال +تشکر را داریم</p> + <ul> + <li><a href="https://www.eff.org/">بنیاد جبهه الکترونیک </a> (2004-2005)</li> + <li><a href="http://chacs.nrl.navy.mil/">DARPA و ONR از طریق آزمایشگاه تحقیقات +نیروی</a> دریایی (2001-2006 )</li> + <li><a href="http://www.cyber-ta.org/">سایبر - TA پروژه</a> (2006-2008)</li> + <li>راه حل های امنیتی بل وارز (2006)</li> + <li><a href="http://www.omidyar.net/"> شبکه آنزیم گرانت امیدیار</a> (2006)</li> + <li><a +href="http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-study-secu…">NSF +از طریق دانشگاه رایس</a> (2006-2007)</li> + </ul> + <p>تشکر می کنیم از شما و همه مردم و گروه هایی که با کمک خود این پروژه را ممکن +ساختند را ساخته اند به خصوص به داوطلبانی که کمک های غیر مالی در بخشهای زیر +ارایه دادند : برنامه نویسی ، آزمایش ، مستند ، آموزش ، تحقیق ، و رله شبکه +تور + </p> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Modified: website/trunk/docs/ar/bridges.wml =================================================================== --- website/trunk/docs/ar/bridges.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/ar/bridges.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24504 $ +# Revision: $Revision: 24916 $ # Translation-Priority: 1-high #include "ar/head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" STYLESHEET="css/master-rtl.css" <div id="content" class="clearfix"> @@ -125,11 +125,11 @@ </p> <pre> Here are your bridge relays: - - bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133 - bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39 - bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82 - + + bridge 60.16.182.53:9001 + bridge 87.237.118.139:444 + bridge 60.63.97.221:443 + </pre> <p> عندما تتلقى رسالة البريد الإلكتروني، يمكنك مواصلة ضبط ڤيداليا حسب الخطوات Modified: website/trunk/docs/ar/debian.wml =================================================================== --- website/trunk/docs/ar/debian.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/ar/debian.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24851 $ +# Revision: $Revision: 24910 $ # Translation-Priority: 3-low #include "ar/head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" STYLESHEET="css/master-rtl.css" <div id="content" class="clearfix"> @@ -15,14 +15,13 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">الخيار الأول: تور على دِبيان ليني أو دِبيان -غيرالمستقرة أو دِبيان الإختبارية</a></h2> +<h2><a class="anchor" href="#debian">Option one: Tor on Debian squeeze, lenny, +Debian sid, or Debian testing</a></h2> <br /> <p> -إذا كنت تستعمل دِبيان المستقرة (ليني) أو غير المستقرة (sid) أو الإختبارية -(سكوييز)، نفد فقط الأمر <br /> <tt>apt-get install tor tor-geoipdb</tt> -بصلاحيات الجذر. +If you're using Debian, just run<br /> <tt>apt-get install tor +tor-geoipdb</tt> as root. </p> <p> @@ -42,8 +41,9 @@ <br /> <p> -<b>لا تستخدم حزم أوبنتو universe.</b> فهي لم تعد مدعومة وإصداراتها -قديمة. وهذا يعني إفتقادها للإستقرار والإصلاحات الأمنية. +<b>Do not use the packages in Ubuntu's universe.</b> In the past they have +not reliably been updated. That means you could be missing stability and +security fixes. </p> <p> @@ -53,6 +53,7 @@ /etc/debian_version</tt>. Here's a quick mapping: <ul> <li> دِبيان غير المستقرة (sid) هي "sid"</li> +<li> Debian testing is "wheezy"</li> <li> دِبيان 6.0 (سكوييز) هي "squeeze"</li> <li> دِبيان 5.0 (ليني) هي "lenny"</li> <li> Ubuntu 11.04 is "natty"</li> @@ -60,7 +61,6 @@ <li> أو 10.04 أو ترِسكال 4.0 هما "lucid"</li> <li> أوبنتو 9.10 أو ترِسكال 3.5 هما "karmic"</li> <li> أوبنتو 8.04 هي "hardy"</li> -<li> أوبنتو 6.06 هي "dapper"</li> </ul> ثم أضف هذا السطر إلى <tt>/etc/apt/sources.list</tt> الملف:<br /> Added: website/trunk/docs/ar-sa/installguide.wml =================================================================== --- website/trunk/docs/ar-sa/installguide.wml (rev 0) +++ website/trunk/docs/ar-sa/installguide.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,34 @@ + + + + + +## translation metadata +# Revision: $Revision: 24868 $ +# Translation-Priority: 2-medium +#include "head.wmi" TITLE="Tor Project: Installation Instructions" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + صفحة <a href = "<Pageindex>"> الرئيسية »</ أ> صفحة <a href =" +<Pagedocs/documentation> "> الوثائق» </ أ> صفحة <a href = +"<Pagedocs/installguide>" > دلائل التثبيت </ أ> + </div> + <div id="maincol"> + <h1>دليل تثبيت تور</h1> + <br> + + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/docs/ar-sa/sidenav.wmi =================================================================== --- website/trunk/docs/ar-sa/sidenav.wmi (rev 0) +++ website/trunk/docs/ar-sa/sidenav.wmi 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,103 @@ +## translation metadata +# Revision: $Revision: 24865 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /docs pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'docs/documentation', + 'txt' => 'Documentation Overview', + }, + { + 'url' => 'docs/installguide', + 'txt' => 'Installation Guides', + 'subelements' => [ + {'url' => 'docs/tor-doc-windows', + 'txt' => 'Installing on Windows', + }, + {'url' => 'docs/tor-doc-unix', + 'txt' => 'Installing on Linux/BSD/Unix', + }, + {'url' => 'docs/debian', + 'txt' => 'Installing Tor on Debian/Ubuntu', + }, + {'url' => 'docs/debian-vidalia', + 'txt' => 'Installing Vidalia on Debian/Ubuntu', + }, + {'url' => 'docs/tor-doc-osx', + 'txt' => 'Installing Tor on Mac OS X', + }, + {'url' => 'docs/android', + 'txt' => 'Installing Tor on Android', + }, + {'url' => 'docs/N900', + 'txt' => 'Installing Tor on Maemo/N900', + }, + {'url' => 'docs/verifying-signatures', + 'txt' => 'Verify our GPG signatures', + }, + {'url' => 'docs/tor-doc-web', + 'txt' => 'Configuring your browser to use Tor', + }], + }, + {'url' => 'docs/manual', + 'txt' => 'Manuals', + 'subelements' => [ + {'url' => 'docs/tor-doc-relay', + 'txt' => 'Configuring a Relay', + }, + {'url' => 'docs/tor-hidden-service', + 'txt' => 'Configuring a Hidden Service', + }, + {'url' => 'docs/bridges', + 'txt' => 'Configuring a Bridge Relay', + }, + {'url' => 'docs/running-a-mirror', + 'txt' => 'Configuring a Mirror', + }, + {'url' => 'docs/tor-manual', + 'txt' => 'Tor -stable Manual', + }, + {'url' => 'docs/tor-manual-dev', + 'txt' => 'Tor -alpha Manual', + }, + {'url' => 'docs/proxychain', + 'txt' => 'Configuring Tor to use a Proxy Server', + }], + }, + { + 'url' => '<wiki>', + 'txt' => 'Tor Wiki', + }, + {'url' => 'docs/faq', + 'txt' => 'General FAQ', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }, + {'url' => 'docs/faq-abuse', + 'txt' => 'Abuse FAQ', + }, + {'url' => 'docs/trademark-faq', + 'txt' => 'Trademark FAQ', + }, + {'url' => 'eff/tor-legal-faq', + 'txt' => 'Tor Legal FAQ', + }, + {'url' => 'eff/tor-dmca-response', + 'txt' => 'Tor DMCA Response', + }, + ]; +:> Modified: website/trunk/docs/de/bridges.wml =================================================================== --- website/trunk/docs/de/bridges.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/de/bridges.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24504 $ +# Revision: $Revision: 24916 $ # Translation-Priority: 1-high #include "de/head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -140,11 +140,11 @@ </p> <pre> Here are your bridge relays: - - bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133 - bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39 - bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82 - + + bridge 60.16.182.53:9001 + bridge 87.237.118.139:444 + bridge 60.63.97.221:443 + </pre> <p> Sobald du die E-Mail mit den Bridge-Informationen erhalten hast, kannst du Modified: website/trunk/docs/de/tor-doc-windows.wml =================================================================== --- website/trunk/docs/de/tor-doc-windows.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/de/tor-doc-windows.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -14,7 +14,7 @@ docs/tor-doc-windows>">Windows-Client</a> </div> <div id="maincol"> - <h1><a href="<page index>">Tor</a> als Client auf Microsoft Windows ausführen</h1> + <h1><a href="<page index>">Tor</a> als Client auf Microsoft Windows Installieren</h1> <br> <p> Added: website/trunk/docs/fa/N900.wml =================================================================== --- website/trunk/docs/fa/N900.wml (rev 0) +++ website/trunk/docs/fa/N900.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,169 @@ + + + + + +## translation metadata +# Revision: $Revision: 23689 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">خانه »</a> <a href="<page docs/documentation>">اسناد +»</a> <a href="<page docs/N900>">N900</a> + </div> + <div id="maincol"> + <a id="نرم افزار میمو"></a> + <h2><a class="anchor" href="#Maemo">نصب تور در Maemo</a></h2> + <br> + <p> + اگر شما از یک دستگاه مجهز یه نرم افزار میمو استفاده می کنید که <a +href="#N900">N900</a> + نیست، ما پیشنهاد می کنیم بسته تور را از +<a href="http://maemo.org/packages/view/tor/">نصب کنید</a> شما <a +href="http://maemo.org/packages/view/tor/">را</a> +پروژه تور این بسته را تولید نمی کند بلکه این بسته توسط جامعه میمو تولید و +بروزرسانی می شود + </p> + + <a id="N900"></a> + <h2><a class="anchor" href="#N900">نصب تور روی N900</a></h2> + <br> + <p> + دستورالعمل های زیر را باید به شما کمک کند +<a href="https://garage.maemo.org/projects/tor-status">نصب</a> کنترلر و <a +href="https://garage.maemo.org/projects/tor-status">تور تجربی </a> تور برای +تلفن نوکیا N900 بسته بندی شده است. این پیکربندی در حال حاضرتست نشده +است. مرورگر در این پیکربندی دکمه تور ندارد ونباید برای نیازهایی که از لحاظ +امنیتی مهم هستند استفاده شود. + </p> + + <p> + مدیریت نرم افزار را باز کنید: <br> <a +href="$(IMGROOT)/N900/1_app_menu.png"><img alt="N900 منو برنامه" +src="$(IMGROOT)/N900/1_app_menu-small.png"/></a> + </p> + + <p> + روی منو مدیر برنامه در بالای صفحه نمایش کلیک کنید : <br> <a +href="$(IMGROOT)/N900/2_app_manager.png"><img alt="N900 مدیر برنامه" +src="$(IMGROOT)/N900/2_app_manager-small.png"/></a> + </p> + + <p> + "کاتالوگ برنامه را انتخاب کنید: <br> <a +href="$(IMGROOT)/N900/3_app_managermenu.png"><img alt="کاتالوگ نرم افزار +N900" src="$(IMGROOT)/N900/3_app_managermenu-small.png"/></a> + </p> + + <p> + دکمه'جدید' را فشار دهید برای فعال کردن مخزن توسعه اضافی میمو - <br> <small> +توجه : این مخزن حاوی بسته های نرم افزاری آزمایش نشده است که ممکن است به +دستگاه شما آسیب +</small> برساند. + <small><br> مشاهده <a href="http://wiki.maemo.org/Extras-devel"> +مخزن توسعه اضافی</a> +را برای برای جزئیات بیشتر ببینید. شما احتمالا باید مخزن توسعه اضافی را پس +از نصب تور غیر فعال کنید .</small> <br> <a +href="$(IMGROOT)/N900/4_catalog_list.png"><img alt="N900 لیست فروشگاه" +src="$(IMGROOT)/N900/4_catalog_list-small.png"/></a> + </p> + + <p> + اطلاعات زیر را در صفحه نمایش اضافی وارد کنید : + <p> + <pre> + Catalog name: Extras devel + Web address: http://repository.maemo.org/extras-devel/ + Distribution: fremantle + Components: free non-free + </pre> + </p> + <br> اطمینان حاصل کنید که آیتم 'غیرفعال' بدون چک مارک است ، دکمه 'ذخیره' را +بزنید، و برای به روز رسانی آماده شوید. <br> <a +href="$(IMGROOT)/N900/5_new_catalog.png"><img alt="N900 جدید فروشگاه" +src="$(IMGROOT)/N900/5_new_catalog-small.png"/></a> + </p> + + <p> + 'دانلود' را فشار دهید در مدیریت اپلیکیشن : <br> <a +href="$(IMGROOT)/N900/6_app_manager.png"><img alt="مدیر N900 APP" +src="$(IMGROOT)/N900/6_app_manager-small.png"/></a> + </p> + + <p> + شبکه مورد نظر را انتخاب کنید (یا توررا جستجو کنید) : <br> <a +href="$(IMGROOT)/N900/7_app_categories.png"><img alt="دسته بندی برنامه N900" +src="$(IMGROOT)/N900/7_app_categories-small.png"/></a> + </p> + + <p> + پایین رفته و گزینه 'تور به وضعیت اپلت را انتخاب کنید <br> <a +href="$(IMGROOT)/N900/8_app_list.png"><img alt="N900 لیست برنامه" +src="$(IMGROOT)/N900/8_app_list-small.png"/></a> + </p> + + <p> + با موارد قرارداد موافقت کنید و دکمه 'ادامه' را فشار دهید: <br> <a +href="$(IMGROOT)/N900/9_disclaimer.png"><img alt="N900 قرارداد" +src="$(IMGROOT)/N900/9_disclaimer-small.png"/></a> + </p> + + <p> + وقتی نصب انجام شد ، مخازن اضافی توسعه را غیر فعال کنید و دستگاه را مجددا +راه اندازی کنید: <br> <a href="$(IMGROOT)/N900/10_success.png"><img +alt="N900 موفقیت" src="$(IMGROOT)/N900/10_success-small.png"/></a> + </p> + + <p> + پس از راه اندازی مجدد سیستم ، ، منو وضعیت را باز کنید: <br> <a +href="$(IMGROOT)/N900/11_after_rebooting.png"><img alt="N900 منو وضعیت پس از +راه اندازی مجدد" src="$(IMGROOT)/N900/11_after_rebooting-small.png"/></a> + </p> + + <p> + روتر پیاز "را از فهرست انتخاب کنید : <br> <a +href="$(IMGROOT)/N900/12_status_menu.png"><img alt="انتخاب منو وضعیت N900" +src="$(IMGROOT)/N900/12_status_menu-small.png"/></a> + </p> + + <p> + مسیر یابی پیازی را فعال و 'ذخیره' را فشار دهید : <br> <a +href="$(IMGROOT)/N900/13_enable_tor.png"><img alt="N900 فعالسازی تور" +src="$(IMGROOT)/N900/13_enable_tor-small.png"/></a> + </p> + + <p> + به آدرس زیر بروید <a href="https://check.torproject.org/">TorCheck</a> برای +تایید آن که شما در حال مسیریابی ترافیک مرورگر از طریق «تور »هستید: <br> <a +href="$(IMGROOT)/N900/14_check_tor.png"><img alt="N900 چک تور" +src="$(IMGROOT)/N900/14_check_tor-small.png"/></a> + </p> + + <p> + توجه داشته باشید که این فرایند ممکن است همیشه به شما آخرین نسخه پایدار تور +رابه شما ندهد. علاوه بر این ، مرورگر وب نوکیا دکمه تور ندارد . این به این +معنی است که در حالی که ممکن است برای دور زدن فیلترینگ مفید باشد، اما +احتمالا برای وب گردی گمنام و قوی نامناسب است. + </p> + + <hr style=";text-align:right;direction:rtl"> + + <p>اگر شما پیشنهادی برای بهبود محتوای این متن دارید ، لطفا <a href="<page +about/contact>">آن را برای ما بفرستید</a> . با تشکر از شما</p> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + + +#include "foot.wmi" Modified: website/trunk/docs/fi/debian.wml =================================================================== --- website/trunk/docs/fi/debian.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/fi/debian.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24851 $ +# Revision: $Revision: 24910 $ # Translation-Priority: 3-low #include "head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -15,13 +15,13 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">Ensimmäinen vaihtoehto: Tor Debian lenny, -Debian sid, tai Debian testing -versioissa</a></h2> +<h2><a class="anchor" href="#debian">Option one: Tor on Debian squeeze, lenny, +Debian sid, or Debian testing</a></h2> <br /> <p> -Jos käytät Debianin vakaata (lenny), epävakaata (sid) tai testausversiota -(squeeze), anna roottina komento <tt>apt-get install tor tor-geoipdb</tt>. +If you're using Debian, just run<br /> <tt>apt-get install tor +tor-geoipdb</tt> as root. </p> <p> @@ -42,9 +42,9 @@ <br /> <p> -<b>Älä käytä Ubuntun universestä löytyviä paketteja.</b> Niitä ei ylläpidetä -ja ne ovat vanhentuneita. Toisin sanoen menetät vakauden ja -turvallisuuspäivitykset. +<b>Do not use the packages in Ubuntu's universe.</b> In the past they have +not reliably been updated. That means you could be missing stability and +security fixes. </p> <p> @@ -54,6 +54,7 @@ Tässä nopea kartoitus: <ul> <li> Debian unstable (sid) on "sid"</li> +<li> Debian testing is "wheezy"</li> <li> Debian 6.0 (squeeze) on "squeeze"</li> <li> Debian 5.0 (lenny) on "lenny"</li> <li> Ubuntu 11.04 is "natty"</li> @@ -61,7 +62,6 @@ <li> Ubuntu 10.04 tai Trisquel 4.0 on "lucid"</li> <li> Ubuntu 9.10 tai Trisquel 3.5 on "karmic"</li> <li> Ubuntu 8.04 on "hardy"</li> -<li> Ubuntu 6.06 on "dapper"</li> </ul> Lisää sitten tämä rivi tiedostoon <tt>/etc/apt/sources.list<tt> koneellasi: Modified: website/trunk/docs/fr/bridges.wml =================================================================== --- website/trunk/docs/fr/bridges.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/fr/bridges.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24504 $ +# Revision: $Revision: 24916 $ # Translation-Priority: 1-high #include "head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -144,12 +144,12 @@ les ponts. Presque instantanément, vous recevrez une réponse qui comprend: </p> <pre> - Voici vos relais-ponts: - - bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133 - bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39 - bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82 - + Here are your bridge relays: + + bridge 60.16.182.53:9001 + bridge 87.237.118.139:444 + bridge 60.63.97.221:443 + </pre> <p> Une fois que vous avez reçu l'e-mail avec les informations sur les ponts, Modified: website/trunk/docs/pl/bridges.wml =================================================================== --- website/trunk/docs/pl/bridges.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/pl/bridges.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24504 $ +# Revision: $Revision: 24916 $ # Translation-Priority: 1-high #include "pl/head.wmi" TITLE="Tor Project: Bridges" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -137,11 +137,11 @@ </p> <pre> Here are your bridge relays: - - bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133 - bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39 - bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82 - + + bridge 60.16.182.53:9001 + bridge 87.237.118.139:444 + bridge 60.63.97.221:443 + </pre> <p> Po otrzymaniu takiego listu z informacją o mostkach, możesz dalej Modified: website/trunk/docs/pl/debian.wml =================================================================== --- website/trunk/docs/pl/debian.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/pl/debian.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24851 $ +# Revision: $Revision: 24910 $ # Translation-Priority: 3-low #include "pl/head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -15,14 +15,13 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">Opcja pierwsza: Tor na Debianie lenny, -Debianie sid lub Debianie testing</a></h2> +<h2><a class="anchor" href="#debian">Option one: Tor on Debian squeeze, lenny, +Debian sid, or Debian testing</a></h2> <br /> <p> -Jeśli używasz Debiana stabilnego (lenny), niestabilnego (sid), lub testowego -(squeeze), uruchom po prostu<br /><tt>apt-get install tor tor-geoipdb</tt> -jako root. +If you're using Debian, just run<br /> <tt>apt-get install tor +tor-geoipdb</tt> as root. </p> <p> @@ -42,9 +41,9 @@ <br /> <p> -<b>Nie używajcie paczek ze wszechświata Ubuntu.</b> Nikt się nimi nie -zajmuje i są przestarzałe. To oznacza, że będziecie pozbawieni poprawek -stabilności i bezpieczeństwa. +<b>Do not use the packages in Ubuntu's universe.</b> In the past they have +not reliably been updated. That means you could be missing stability and +security fixes. </p> <p> @@ -54,6 +53,7 @@ /etc/debian_version</tt>. Poniżej jest proste odwzorowanie: <ul> <li> Debian unstable (sid) to "sid"</li> +<li> Debian testing is "wheezy"</li> <li> Debian 6.0 (squeeze) to "squeeze"</li> <li> Debian 5.0 (lenny) to "lenny"</li> <li> Ubuntu 11.04 to "natty"</li> @@ -61,7 +61,6 @@ <li> Ubuntu 10.04 lub Trisquel 4.0 to "lucid"</li> <li> Ubuntu 9.10 lub Trisquel 3.5 to "karmic"</li> <li> Ubuntu 8.04 to "hardy"</li> -<li> Ubuntu 6.06 to "dapper"</li> </ul> Potem dodajcie tę linię do swojego pliku <tt>/etc/apt/sources.list</tt>:<br Modified: website/trunk/docs/pl/faq.wml =================================================================== --- website/trunk/docs/pl/faq.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/docs/pl/faq.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -33,8 +33,8 @@ <li><a href="#Funding">Co Projekt Tor zrobiłby z większymi funduszami?</a></li> <li><a href="#Metrics">Ilu ludzi używa Tora? Ile jest przekaźników lub węzłów wyjściowych?</a></li> - <li><a href="#SSLcertfingerprint">What are your SSL certificate -fingerprints?</a></li> + <li><a href="#SSLcertfingerprint">Jakie są odciski palców Waszych certyfikatów +SSL?</a></li> </ul> <p>Kompilacja i instalacja:</p> Modified: website/trunk/donate/pl/donate.wml =================================================================== --- website/trunk/donate/pl/donate.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/donate/pl/donate.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -28,8 +28,8 @@ <li><a href="#amazon">Amazon Payments</a></li> <li><a href="#google">Google Checkout</a></li> <li><a href="#givv">Givv.org</a></li> - <li class="last"><a href="#cash">checks, money orders, bank transfers, stock grants or other -more sophisticated transactions</a></li> + <li class="last"><a href="#cash">czeki, przelewy, transfery bankowe, granty w akcjach lub +poprzez inne, bardziej wyrafinowane transakcje</a></li> </ul> <p>Jeśli chcesz dokonać anonimowej dotacji, zrób to w sposób anonimowy. Skontaktuj się z nami pod adresem donations(a)torproject.org, by Modified: website/trunk/download/de/download.wml =================================================================== --- website/trunk/download/de/download.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/download/de/download.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24885 $ +# Revision: $Revision: 24908 $ # Translation-Priority: 3-low #include "de/head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> @@ -19,7 +19,7 @@ <p>...dann genügt es nicht, es nur zu installieren. Du solltest einige Gewohnheiten ändern und die Software mit deinen vorhandenen Programmen neu konfigurieren! Tor selbst ist <em>NICHT</em> alles, was du benötigst, um -deine Anonymität zu wahren. Lese die <a href="<page +deine Anonymität zu wahren. Lies die <a href="<page download/download>#warning">vollständige Liste mit Warnungen</a>. </p> </div> @@ -258,7 +258,7 @@ sicher im Internet zu surfen. Dieses Paket benötigt keine Installation. Nach dem Entpacken kann es gleich ausgeführt werden. <a href="<page projects/torbrowser>">Mehr & andere Sprachen »</a></li> -<li>Lese hier wie du <a href="<page download/download-unix>">unsere +<li>Lies hier wie du <a href="<page download/download-unix>">unsere Verzeichnisse der Tor-Software</a> nutzen kannst.</li> </ul> </td> @@ -424,10 +424,9 @@ desto weniger gefahrvoll ist es einer von vielen Tor-Nutzern zu sein. </li> -<li> Benütze nicht <a +<li> Do not use <a href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent -und Tor</a> zusammen, außer du verfügst über eine System wie <a -href="http://tails.boum.org/">TAILS</a>. +and Tor</a> together. </li> </ol> <br> Added: website/trunk/download/fa/thankyou.wml =================================================================== --- website/trunk/download/fa/thankyou.wml (rev 0) +++ website/trunk/download/fa/thankyou.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,108 @@ + + + + + ## translation metadata +# Revision: $Revision: 23689 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Thank you for downloading Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">صفحه اصلی »</a> <a href="<page +download/download>">دانلود »</a> <a href="<page download/thankyou>">با تشکر +از شما</a> + </div> + + <h1>سپاس از اینکه تور را دانلود کردید</h1> + <p><strong> +دانلود خود به طور خودکار باید در چند ثانیه آغاز شود، اما اگر نشد ، شما می +توانید از طریق لینک مستقیم دانلود کنید +<a href="#">توانید با</a> لینک مستقیم</strong> دانلود.</p> + <div id="maincol-left"> + <div class="focus clearfix"> + <h2>دستورالعمل های نصب برای سیستم عامل + Mac OS X</h2> + <div class="fakeol">1. </div> + <div class="instructions">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed lorem velit, +faucibus non suscipit sit amet, iaculis sed lorem. Morbi nec nulla id felis +dictum porta ut a lacus. Nunc vel est ut nisl tincidunt fermentum nec nec +quam. In hac habitasse platea dictumst. Aliquam sagittis bibendum rhoncus.</div> + <div class="fakeol">2. </div> + <div class="instructions">Quisque tincidunt neque condimentum mauris suscipit posuere. Nullam ac nisl +metus. Nunc vel est ut nisl tincidunt fermentum nec nec quam. In hac +habitasse platea dictumst. Aliquam sagittis bibendum rhoncus.</div> + <div class="fakeol">3. </div> + <div class="instructions">Aliquam sagittis bibendum rhoncus. Lorem ipsum dolor sit amet, consectetur +adipiscing elit. Sed lorem velit, faucibus non suscipit sit amet, iaculis +sed lorem. Morbi nec nulla id felis dictum porta ut a lacus. Cras egestas +lorem vitae arcu ullamcorper ut porttitor metus suscipit.</div> + <p class="continue"><a href="<page docs/tor-doc-osx>"> :دستورالعمل را کامل بخوانید</a> »</p> + </div> + <div class="toptwenty"> + <div class="img-shadow"> + <div class="sidenav-sub"> + <h2>نیاز به راهنمایی دارید؟</h2> + <ul> + <li class="dropdown"><a href="<page docs/installguide>">:</a> راهنمای نصب و راه اندازی را مطالعه +کنید</li> + <li class="dropdown"><a href="<page docs/faq>">پرسشهای متداول</a></li> + <li class="dropdown"><a href="http://wiki.torproject.org">Read the Tor Wiki</a></li> + <li class="dropdown"><a href="#">ایمیل پشتیبانی ما</a></li> + </ul> + </div> + </div> + +  +<div class="right"> + <div class="img-shadow"> + <div class="custom-infoblock"> + <h2>آیا نرم افزار شما بخوبی نصب شده؟</h2> + <img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="آیکون"> + <h4>استفاده از تورچک برای اطمینان از نصب </h4> + <p>به آدرس زیر بروید <a +href="http://check.torproject.org">check.torproject.org</a> تا ببینید که آیا +نصب خود کار درست انجام شده ، شما در این مرحله توسط روتر پیاز تور محافظت می +شوید.</p> + </div> + </div> + </div> + </div> + </div> + +  +<div id="sidecol-right"> + <div class="img-shadow"> + <div class="infoblock clearfix"> + <h2>با اجرای برنامه رله روی کامپیوتر خود به پروژه تور کمک کنید</h2> + <p>We’re trying to reach 5,000 relays by 2011. Help support the Tor Project by +<a href="<page docs/tor-doc-relay>">running your own</a>! It’s free and +easy!</p> + <div class="fifty left toptwenty"> + <p class="small"><em>جاری</em></p> + <p class="current-relay">3542</p> + </div> + <div class="fifty left toptwenty"> + <p class="small"><em>هدف</em></p> + <p class="target-relay">5000</p> + </div> + </div> + </div> + +  +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="bulb"> نکات مربوط به تور</h2> + <p>اگر با دانلود تور یک قدم به سمت امنیت برداشتید به شما تبریک می گوییم ، اما +به یاد داشته باشید که تور فقط می تواند موثر باشد اگر شما از آن برای برنامه +هایی که برای تورتوسعه یافته استفاده کنید</p> + </div> + </div> + +  +</div> + +  +</div> + + +#include "foot.wmi" Modified: website/trunk/download/pl/download.wml =================================================================== --- website/trunk/download/pl/download.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/download/pl/download.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24885 $ +# Revision: $Revision: 24908 $ # Translation-Priority: 3-low #include "pl/head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" <div id="content" class="clearfix"> @@ -103,8 +103,8 @@ Vidalią</strong>, która jest skonfigurowana, by być <a href="<page docs/bridges>">mostkiem</a>, aby pomagać ocenzurowanym użytkownikom w dostępie do sieci Tora.</li> -<li>The <strong>Expert Bundle</strong> contains just Tor and nothing else. -You'll need to configure Tor and all of your applications manually.</li> +<li><strong>Wersja dla Ekspertów</strong> zawiera tylko Tora i nic poza +tym. Musisz ręcznie skonfigurować Tora i wszystkie swoje aplikacje.</li> </ul> <p>Są dwie wersje każdej paczki, wydanie stabilne i alfa.Paczki stabilne są tworzone, gdy wydaje się, że cechy i kod nie będą się zmieniać przez wiele @@ -406,10 +406,9 @@ zainteresowania, tym mniej groźne jest to, że jesteś jednym z nich. </li> -<li> Nie używaj <a -href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrenta -i Tora</a> razem, chyba że używasz takigo systemu, jak <a -href="http://tails.boum.org/">TAILS</a>. +<li> Do not use <a +href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent +and Tor</a> together. </li> </ol> <br> Added: website/trunk/getinvolved/ar-sa/mirrors.wml =================================================================== --- website/trunk/getinvolved/ar-sa/mirrors.wml (rev 0) +++ website/trunk/getinvolved/ar-sa/mirrors.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,60 @@ + + + + + +## translation metadata +# Revision: $Revision: 23689 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor Project: Mirrors" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> <a href="<page +getinvolved/mirrors>">Mirrors</a> + </div> + <div id="maincol"> + <h2>تور : مرآة</h2> + <hr> + + <p> + العنوان المعروف لهذا الموقع هو <a +href="https://www.torproject.org/">https://www.torproject.org/</a>, ، ولكن +هناك عدد قليل من المرايا لهذا الموقع في أماكن اخرى. + </p> + + <p> + إذا كنت ترغب في تشغيل المرآة، يرجى زيارة الصفحة <a href = +"<Pagedocs/running-a-mirror>"> وقراءة تعليمات تشغيل المرآة </ A>. + </p> + + <table class="mirrors"> + <tr> + <th>بلد</th> + <th>منظمة</th> + <th>الولاية</th> + <th>ftp</th> + <th>http dist/</th> + <th>HTTP موقع</th> + <th>https dist/</th> + <th>https موقع</th> + <th>rsync dist/</th> + <th>rsync موقع</th> + </tr> + + #include "mirrors-table.wmi" +</table> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/getinvolved/ar-sa/sidenav.wmi =================================================================== --- website/trunk/getinvolved/ar-sa/sidenav.wmi (rev 0) +++ website/trunk/getinvolved/ar-sa/sidenav.wmi 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,32 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24370 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /getinvolved pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'getinvolved/volunteer', + 'txt' => 'Get Involved', + }, + {'url' => 'getinvolved/research', + 'txt' => 'Research', + }, + {'url' => 'donate/donate', + 'txt' => 'Donate', + }, + ]; +:> Added: website/trunk/getinvolved/hu/mirrors.wml =================================================================== --- website/trunk/getinvolved/hu/mirrors.wml (rev 0) +++ website/trunk/getinvolved/hu/mirrors.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,60 @@ + + + + + +## translation metadata +# Revision: $Revision: 23689 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor Project: Mirrors" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Kezdőlap » </a> <a href="<page +getinvolved/mirrors>">Tükrözések</a> + </div> + <div id="maincol"> + <h2>Tor: Tükrözések</h2> + <hr> + + <p> + A központi címe Tennek az oldalnak <a +href="https://www.torproject.org/">https://www.torproject.org/</a>, de +létezik több tükre ennek az oldalnak máshol is. + </p> + + <p> + Ha szeretne tükrözést végezni kérjük <a href="<page +docs/running-a-mirror>">olvassa el a tükrözési útmutatónkat</a>. + </p> + + <table class="mirrors"> + <tr> + <th>Ország</th> + <th>Szervezet</th> + <th>Állapot</th> + <th>ftp</th> + <th>http csomag/</th> + <th>http weboldal</th> + <th>http csomag/</th> + <th>http weboldal</th> + <th>rsync csomag/</th> + <th>rsync weboldal</th> + </tr> + + #include "mirrors-table.wmi" +</table> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/getinvolved/hu/sidenav.wmi =================================================================== --- website/trunk/getinvolved/hu/sidenav.wmi (rev 0) +++ website/trunk/getinvolved/hu/sidenav.wmi 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,32 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24370 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /getinvolved pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'getinvolved/volunteer', + 'txt' => 'Get Involved', + }, + {'url' => 'getinvolved/research', + 'txt' => 'Research', + }, + {'url' => 'donate/donate', + 'txt' => 'Donate', + }, + ]; +:> Modified: website/trunk/getinvolved/pl/volunteer.wml =================================================================== --- website/trunk/getinvolved/pl/volunteer.wml 2011-07-21 08:15:36 UTC (rev 24921) +++ website/trunk/getinvolved/pl/volunteer.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24819 $ +# Revision: $Revision: 24911 $ # Translation-Priority: 4-optional #include "pl/head.wmi" TITLE="Tor: Volunteer" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -345,9 +345,9 @@ <a id="project-vidalia"></a> <h3><a href="<page projects/vidalia>">Vidalia</a> (<a -href="https://svn.torproject.org/vidalia/vidalia/trunk/">kod</a>, <a -href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">śledzenie -błędów</a>)</h3> +href="https://gitweb.torproject.org/vidalia.git">code</a>, <a +href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug +tracker</a>)</h3> <p> Najczęściej używany interfejs użytkownika dla Tora. Matt Edman zaczął @@ -365,9 +365,9 @@ <a id="project-arm"></a> <h3><a href="http://www.atagar.com/arm/">Arm</a> (<a -href="https://svn.torproject.org/svn/arm/trunk/">kod</a>, <a -href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">śledzenie -błędów</a>)</h3> +href="https://gitweb.torproject.org/arm.git">code</a>, <a +href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug +tracker</a>)</h3> <p> Monitor Tora z linii poleceń. Bardzo aktywnie rozwijany przez swojego @@ -383,10 +383,9 @@ <a id="project-orbot"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a> (<a -href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/">kod</a>, -<a -href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">śledzenie -błędów</a>)</h3> +href="https://gitweb.torproject.org/orbot.git">code</a>, <a +href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug +tracker</a>)</h3> <p> Dostarcza Tora platformie Android. Był pod bardzo aktywnym rozwojem do @@ -485,9 +484,9 @@ <a id="project-gettor"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder">GetTor</a> -(<a href="https://svn.torproject.org/svn/projects/gettor/">kod</a>, <a -href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">śledzenie -błędów</a>)</h3> +(<a href="https://gitweb.torproject.org/gettor.git">code</a>, <a +href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug +tracker</a>)</h3> <p> System automatycznie odpowiadający na e-mail, dostarczający paczki Tora @@ -1104,13 +1103,13 @@ </p> <p> - Większość bardziej interesujących funkcjonalności arma jest w jego <a -href="https://svn.torproject.org/svn/arm/trunk/src/util/">narzędziach</a>, -więc nie powinno być dużo pracy z oddzieleniem jego interfejsu od jego -wnętrzności. Zamiast tego, ten projekt składałby się głównie z hakowania -interfejsu użytkownika i eksperymentowania, wypróbowując różne interfejsy, -aby znaleźć coś, co jest eleganckie i proste, ale pasuje do informacji, -które można znaleźć w aktualnej aplikacji terminalowej. + The vast majority of arm's more interesting functionality lies in its +backend <a +href="https://gitweb.torproject.org/arm.git/tree/HEAD:/src/util">utilities</a>, +so there should be little to no work decoupling the CLI from its backend. +Instead, this project would mostly be UI hacking and experimentation, trying +different interfaces to find something that's elegant and simple, but +matches the information found in the current terminal application. </p> </li> Added: website/trunk/projects/ar-sa/puppettor.wml =================================================================== --- website/trunk/projects/ar-sa/puppettor.wml (rev 0) +++ website/trunk/projects/ar-sa/puppettor.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,35 @@ + + + + + +## translation metadata +# Revision: $Revision: 23689 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> <a href="<page +projects/projects>">Projects » </a> <a href="<page +projects/projects>">Sample Project</a> + </div> + <div id="maincol"> + + <h1>عينة المشروع تور</h1> + هنا بعض المعلومات + + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/projects/ar-sa/sidenav.wmi =================================================================== --- website/trunk/projects/ar-sa/sidenav.wmi (rev 0) +++ website/trunk/projects/ar-sa/sidenav.wmi 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,55 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24436 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /projects pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'projects/projects', + 'txt' => 'Software & Services', + 'subelements' => [ + {'url' => 'torbutton/index', + 'txt' => 'TorButton', + }, + {'url' => 'projects/torbrowser', + 'txt' => 'Tor Browser Bundle', + }, + {'url' => 'projects/vidalia', + 'txt' => 'Vidalia', + }, + {'url' => 'projects/arm', + 'txt' => 'Arm', + }, + {'url' => 'https://guardianproject.info/apps/orbot/', + 'txt' => 'Orbot', + }, + {'url' => 'https://tails.boum.org/', + 'txt' => 'Tails', + }, + {'url' => 'http://torstatus.blutmagie.de/', + 'txt' => 'TorStatus', + }, + {'url' => 'https://metrics.torproject.org/', + 'txt' => 'Metrics Portal', + } + ] + }]; +:> Added: website/trunk/torbutton/hu/index.wml =================================================================== --- website/trunk/torbutton/hu/index.wml (rev 0) +++ website/trunk/torbutton/hu/index.wml 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,138 @@ + + + + + +## translation metadata +# Revision: $Revision: 24797 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Kezdőlap » </a> <a href="<page +torbutton/index>">Torbutton</a> + </div> + <div id="maincol"> + + +  +<link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/> + <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/> + <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/> + <script type="text/javascript"> + + function addSearchProvider(prov) { try { +window.external.AddSearchProvider(prov); } catch (e) { alert("Search plugins +require Firefox 2"); return; } } function addEngine(name,ext,cat,pid) { if +((typeof window.sidebar == "object") && (typeof +window.sidebar.addSearchEngine == "function")) { +window.sidebar.addSearchEngine( "http://mycroft.mozdev.org/install.php/" + +pid + "/" + name + ".src", "http://mycroft.mozdev.org/install.php/" + pid + +"/" + name + "."+ ext, name, cat ); } else { alert("Egy olyan böngészőre van +szüksége, amely támogatja a Sherlock-ot ennek a kiegészítőnek a +telepítéséhez."); } } function addOpenSearch(name,ext,cat,pid,meth) { if +((typeof window.external == "object") && ((typeof +window.external.AddSearchProvider == "unknown") || (typeof +window.external.AddSearchProvider == "function"))) { if ((typeof +window.external.AddSearchProvider == "unknown") && meth == "p") { alert("Ez +a kiegészítő POST metódust használ, ami jelenleg nem támogatott az Internet +Explorer OpenSearch megvalósításában."); } else { +window.external.AddSearchProvider( +"http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml"); } } +else { alert("Olyan böngészőre van szükésge amely támogatja az OpenSearch-öt +a kiegészítő telepítéséhez."); } } function +addOpenSearch2(name,ext,cat,pid,meth) { if ((typeof window.external == +"object") && ((typeof window.external.AddSearchProvider == "unknown") || +(typeof window.external.AddSearchProvider == "function"))) { if ((typeof +window.external.AddSearchProvider == "unknown") && meth == "p") { alert("Ez +a kiegészítő POST metódust használ, ami jelenleg nem támogatott az Internet +Explorer OpenSearch megvalósításában."); } else { +window.external.AddSearchProvider( +"http://torbutton.torproject.org/dev/search/" + name + ".xml"); } } else { +alert("Olyan böngészőre van szükésge amely támogatja az OpenSearch-öt a +kiegészítő telepítéséhez."); } } function install (aEvent) { var params = { +"Torbutton": { URL: aEvent.target.href, Hash: +aEvent.target.getAttribute("hash"), toString: function () { return this.URL; +} } }; InstallTrigger.install(params); return false; } + + + </script> + + <h2>Torbutton</h2> + <hr> <strong>Aktuális stabil verzió:</strong><version-torbutton><br/> +<strong>Aktuális alfa verzió:</strong><version-torbutton-alpha><br/> <br/> +<strong>Authors:</strong> Mike Perry & Scott Squires<br/> <br/> +<strong>Stabil verzió telepítése::</strong> Kattintson <a +href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi" +hash="<version-hash-torbutton>" onclick="return install(event);">a +telepítéshez erről a weboldalról</a>.<br/> <strong>Alfa verzió:</strong> +Kattintson <a +href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi" +hash="<version-hash-torbutton-alpha>" onclick="return install(event);">a +telepítéshez erről a weboldalról</a> <br/> <strong>Angol Google +keresés:</strong> Google kereső kiegészítők az <a href="/jsreq.html" +title="Ref: 14938 (googleCA)" +onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return +false">Google CA</a>, and <a href="/jsreq.html" title="Ref: 14938 +(googleCA)" +onClick="addOpenSearch('googleuk_web','png','General','14445','g');return +false">Google UK</a>. <br/> <strong>Past Releases:</strong> <a +href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor +Arhívum</a><br/> <br/> <strong>Fejlesztői dokumentáció:</strong> <a +href="en/design/index.html.en">Torbutton tervezés dokumentáció</a> and <a +href="en/design/MozillaBrownBag.pdf">Képek (Nincs rendszeresen +frissítve)</a><br/> <strong>Forráskód:</strong> You can <a +href="https://gitweb.torproject.org/torbutton.git">tallózza a +repository-t</a> vagy egyszerűen csomagolja ki az xpi fájlt. <br/> +<strong>Hibabejelentések:</strong> <a +href="https://trac.torproject.org/projects/tor/report/14">Torproject +Hibakövető</a><br/> <strong>Dokumentumok:</strong> <b>[</b> <a href="<page +torbutton/torbutton-faq>">GYIK</a> <b>|</b> <a +href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">változásjegyzék</a> +<b>|</b> <a +href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">licensz</a> +<b>|</b> <a +href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">készítők</a> +<b>]</b><br/> <br/> + + <p> + A Torbutton egy 1-gombos lehetőség a Firefox felhasználók részére, hogy be +és kikapcsolhassák a <a href="<page index>">Tor</a> programot. Az +állapotsorhoz ad hozzá egy panelt, ami a "Tor bekapcsolva" (zöld színben) +vagy a "Tor kikapcsolva" (piros színben) állapotot jeleníti meg. Ha a +felhasználó rákattint a panelra, meg tudja változtani állapotát. Ha a +felhasználó (vagy egy egyéb kiegészítés) átállítja a proxy beállításokat a +beállítások azonnal megjelennek ezen az állapot jelzőn. + </p> + + <p> + Ahhoz, hogy biztonságban böngészhessen a Torbutton letilt több aktív +tartalmat. Ezekről bővebb infromációt a <a href="<page +torbutton/torbutton-faq>">Torbutton Gyakori kérdések</a> oldalán találhat, +illetve további részletekről tájékozódhat a <a href="<page +torbutton/torbutton-options>">Torbutton beállítások </a> listájában is. + </p> + + <p> + Néhány felhasználó valószínűleg jobban kedveli az Eszköztár gombokat, mint +egy panelt az állapotsorban. A Torbutton lehetővé teszi, hogy egy eszköztár +gombot adjon hozzá bármelyik eszköztárhoz, aon jobb gombbal kattintva, és a +"Testreszabás..." opciót választva, majd a Torbutton ikont ráhúzva az +eszköztárra. A panel elrejthető az állapot soron. (Az Eszközök -> +Kiegészítők, Torbutton kiválasztása, Beállítások gombra kattintással.) + </p> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/torbutton/hu/sidenav.wmi =================================================================== --- website/trunk/torbutton/hu/sidenav.wmi (rev 0) +++ website/trunk/torbutton/hu/sidenav.wmi 2011-07-21 08:48:17 UTC (rev 24922) @@ -0,0 +1,36 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24370 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /torbutton pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'torbutton/index', + 'txt' => 'Torbutton', + 'subelements' => [ + {'url' => 'torbutton/torbutton-options', + 'txt' => 'Torbutton Options', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }] + }] +:>

1 0