June 2014 - tor-commits - lists.torproject.org

[metrics-db/master] Extend new CollecTor homepage.
by karsten＠torproject.org 04 Jun '14

04 Jun '14

commit 447e394f0c69124ee8254f55e3762e1b1e4efd73 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 4 17:19:42 2014 +0200 Extend new CollecTor homepage. At this point, everything relevant from the metrics website should be included. --- web/css/style.css | 31 +-- web/formats.html | 551 +++++++++++++++++++++++++++++++++++++++++++++++++++++ web/index.html | 151 +++++++++++---- 3 files changed, 673 insertions(+), 60 deletions(-) diff --git a/web/css/style.css b/web/css/style.css index 9978a5d..344d8e6 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -1,38 +1,13 @@ body { font-family: "Open Sans","lucida grande","Segoe UI",arial,verdana, "lucida sans unicode",tahoma,sans-serif; background: #fafafa; font-size: 13px; line-height: 22px; color: #222; } -h1 { font-size: 20px; font-weight: normal; text-align: center; } -h3 { color: #7D4698; position: relative } a { color: #7D4698; text-decoration: none; font-weight: bold; } -ul { list-style: none; padding: 0; margin: 0; } p { margin: 0; padding: 10px; } a[name] { padding: 0; margin: 0; } .box { max-width: 850px; width: 100%; margin: 0 auto 30px auto; padding-bottom: 30px; background: white; border: 1px solid #eee; } .box > * { margin-left: 30px; margin-right: 30px; } -.box h3 a { visibility: hidden; } -.box:hover h3 a { visibility: visible; } -.api-request { border-bottom: 1px solid #eee; position: relative } -.request-url, .request-type, .request-response { padding: 8px 10px; - vertical-align: middle } -.request-type { color: #57145F; display: inline-block; } -.request-url { color: #333; font-size: 18px; } -.request-response { position: absolute; color: #666; right: 0; } -h3 .request-response { padding: 0 !important; } -.api-urls>li:last-child { border-bottom: 0; } -.required-true, .required-false, .typeof { display: inline-block; - vertical-align: middle; padding: 5px 10px; } -.required-true { color: #1d7508; } -.required-false { color: #aaa; } -.properties { margin-top: 10px; margin-bottom: 10px; - border: 1px solid #eee; } -.properties li { padding: 5px 0; } -.properties li ul { border: 1px solid #eee; margin: 10px 10px 10px 40px; - background: white; } -.properties .properties { margin-left: 10px; } -.properties li:nth-child(even) { background: #fafafa; } -.properties p { padding: 10px 15px; } -.properties b { padding: 5px 10px; display: inline-block; - vertical-align: middle; } -.api-urls{ margin-top: 30px; margin-bottom: 30px; } +.box h2 a { visibility: hidden; } +.box:hover h2 a { visibility: visible; } +h3 .type-annotation { float: right; color: #666; } diff --git a/web/formats.html b/web/formats.html new file mode 100644 index 0000000..68fddee --- /dev/null +++ b/web/formats.html @@ -0,0 +1,551 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>CollecTor — What is in the data?</title> +<link href="css/style.css" type="text/css" rel="stylesheet"> +<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> +<link href="favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> + +<div class="box"> + +<h1><a href="index.html">CollecTor</a> —</h1> +<h2>What is in the data?</h2> + +<p> +The Tor network data provided here comes from five different sources which +are explained in more detail on this page. +You may either read through the entire page or jump to the type of data +you're most interested in: + +<ul> +<li><a href="#relay-descriptors">Tor relay descriptors</a></li> +<li><a href="#bridge-descriptors">Tor bridge descriptors</a></li> +<li><a href="#bridge-pool-assignments">BridgeDB's bridge pool +assignments</a></li> +<li><a href="#exit-lists">TorDNSEL's exit lists</a></li> +<li><a href="#torperf">Torperf's performance data</a></li> +</ul> + +<p> +Each descriptor provided here contains an <tt>@type</tt> annotation using +the format <tt>@type $descriptortype $major.$minor</tt>. +Any tool that processes these descriptors may parse files without meta +data or with an unknown descriptor type at its own risk, can safely parse +files with known descriptor type and same major version number, and should +not parse files with known descriptor type and higher major version +number. +</p> + +</div>  + +<div class="box"> + +<a name="relay-descriptors"></a> +<h2>Tor relay descriptors <a href="#relay-descriptors">#</a></h2> + +<p> +Relays and directory authorities publish relay descriptors, so that +clients can select relays for their paths through the Tor network. +All these relay descriptors are specified in the +<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">Tor +directory protocol, version 3</a> specification document (or in the +earlier protocol versions +<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec-v2.txt">2</a> or +<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/attic/dir-spec-v1.txt">1</a>). +This page shall give a quick overview of what relay descriptors are +available. +</p> + +<h3>Server descriptors +(<a href="archive/relay-descriptors/server-descriptors/">archive</a>, +<a href="recent/relay-descriptors/server-descriptors/">recent</a>) +<span class="type-annotation"><tt>@type server-descriptor 1.0</tt></span> +</h3> + +<p> +Server descriptors contain information that relays publish about +themselves. +Tor clients once downloaded this information, but now they use +microdescriptors instead. +The server descriptors in +<a href="archive/relay-descriptors/server-descriptors/">archive</a> +contain one descriptor per file, whereas the files in +<a href="recent/relay-descriptors/server-descriptors/">recent</a> +contain all descriptors collected in an hour concatenated into a single +file. +</p> + +<h3>Extra-info descriptors +(<a href="archive/relay-descriptors/extra-infos/">archive</a>, +<a href="recent/relay-descriptors/extra-infos/">recent</a>) +<span class="type-annotation"><tt>@type extra-info 1.0</tt></span> +</h3> + +<p> +Extra-info descriptors contain relay information that Tor clients do not +need in order to function. +This is self-published, like server descriptors, but not downloaded by +clients by default. +The extra-info descriptors in +<a href="archive/relay-descriptors/extra-infos/">archive</a> +contain one descriptor per file, whereas the files in +<a href="recent/relay-descriptors/extra-infos/">recent</a> +contain all descriptors collected in an hour concatenated into a single +file. +</p> + +<h3>Network status consensuses +(<a href="archive/relay-descriptors/consensuses/">archive</a>, +<a href="recent/relay-descriptors/consensuses/">recent</a>) +<span class="type-annotation"><tt>@type network-status-consensus-3 +1.0</tt></span> +</h3> + +<p> +Though Tor relays are decentralized, the directories that track the +overall network are not. +These central points are called directory authorities, and every hour they +publish a document called a consensus, or network status document. +The consensus in turn is made up of router status entries containing +flags, heuristics used for relay selection, etc. +</p> + +<h3>Network status votes +(<a href="archive/relay-descriptors/votes/">archive</a>, +<a href="recent/relay-descriptors/votes/">recent</a>) +<span class="type-annotation"><tt>@type network-status-vote-3 +1.0</tt></span> +</h3> + +<p> +The directory authorities exchange votes every hour to come up with a +common consensus. +Vote documents are by far the largest documents provided here. +</p> + +<h3>Directory key certificates +(<a href="archive/relay-descriptors/certs.xz">archive</a>) +<span class="type-annotation"><tt>@type dir-key-certificate-3 +1.0</tt></span> +</h3> + +<p> +The directory authorities sign their votes and the consensus with their +key that they publish in a key certificate. +These key certificates change once every few months, so they are only +available in the +<a href="archive/relay-descriptors/certs.xz">archive</a>. +</p> + +<h3>Microdescriptor consensuses +(<a href="archive/relay-descriptors/microdescs/">archive</a>, +<a href="recent/relay-descriptors/microdescs/">recent</a>) +<span class="type-annotation"><tt>@type +network-status-microdesc-consensus-3 1.0</tt></span> +</h3> + +<p> +Tor clients used to download all server descriptors of active relays, but +now they only download the smaller microdescriptors which are derived from +server descriptors. +The microdescriptor consensus lists all active relays and references their +currently used microdescriptor. +The tarballs in +<a href="archive/relay-descriptors/microdescs/">archive</a> +contain both microdescriptor consensuses and referenced microdescriptors +together. +</p> + +<h3>Microdescriptors +(<a href="archive/relay-descriptors/microdescs/">archive</a>, +<a href="recent/relay-descriptors/microdescs/">recent</a>) +<span class="type-annotation"><tt>@type microdescriptor 1.0</tt></span> +</h3> + +<p> +Microdescriptors are minimalistic documents that just includes the +information necessary for Tor clients to work. +The tarballs in +<a href="archive/relay-descriptors/microdescs/">archive</a> +contain both microdescriptor consensuses and referenced microdescriptors +together. +The microdescriptors in +<a href="archive/relay-descriptors/microdescs/">archive</a> +contain one descriptor per file, whereas the files in +<a href="recent/relay-descriptors/microdescs/">recent</a> +contain all descriptors collected in an hour concatenated into a single +file. +</p> + +<h3>Version 2 network statuses +(<a href="archive/relay-descriptors/statuses/">archive</a>) +<span class="type-annotation"><tt>@type network-status-2 1.0</tt></span> +</h3> + +<p> +Version 2 network statuses have been published by the directory +authorities before consensuses have been introduced. +In contrast to consensuses, each directory authority published their own +authoritative view on the network, and clients combined these documents +locally. +We stopped archiving version 2 network statuses in 2012. +</p> + +<h3>Version 1 directories +(<a href="archive/relay-descriptors/tor/">archive</a>) +<span class="type-annotation"><tt>@type directory 1.0</tt></span> +</h3> + +<p> +The first directory protocol version combined the list of active relays +with server descriptors in a single directory document. +We stopped archiving version 1 directories in 2007. +</p> + +</div>  + +<div class="box"> + +<a name="bridge-descriptors"></a> +<h2>Tor bridge descriptors <a href="#bridge-descriptors">#</a></h2> + +<p> +Bridges and the bridge authority publish bridge descriptors that are used +by censored clients to connect to the Tor network. +We cannot, however, make bridge descriptors available as we do with relay +descriptors, because that would defeat the purpose of making bridges hard +to enumerate for censors. +We therefore sanitize bridge descriptors by removing all potentially +identifying information and publish sanitized versions here. +The sanitizing steps are as follows: +</p> + +<ol> +<li><b>Replace the bridge identity with its SHA1 value:</b> Clients +can request a bridge's current descriptor by sending its identity string +to the bridge authority. +This is a feature to make bridges on dynamic IP addresses useful. +Therefore, the original identities (and anything that could be used to +derive them) need to be removed from the descriptors. +The bridge identity is replaced with its SHA1 hash value. +The idea is to have a consistent replacement that remains stable over +months or even years (without keeping a secret for a keyed hash +function).</li> +<li><b>Remove all cryptographic keys and signatures:</b> It would be +straightforward to learn about the bridge identity from the bridge's +public key. +Replacing keys by newly generated ones seemed to be unnecessary (and would +involve keeping a state over months/years), so that all cryptographic +objects have simply been removed.</li> +<li><b>Replace IP address with IP address hash:</b> Of course, IP +addresses need to be sanitized, too. +<ul><li>IPv4 addresses are replaced with <tt>10.x.x.x</tt> with +<tt>x.x.x</tt> being the 3 byte output of +<tt>H(IP address | bridge identity | secret)[:3]</tt>. +The input <tt>IP address</tt> is the 4-byte long binary representation of +the bridge's current IP address. +The <tt>bridge identity</tt> is the 20-byte long binary representation of +the bridge's long-term identity fingerprint. +The <tt>secret</tt> is a 31-byte long secure random string that changes +once per month for all descriptors and statuses published in that month. +<tt>H()</tt> is SHA-256. +The <tt>[:3]</tt> operator means that we pick the 3 most significant bytes +of the result.</li> +<li>IPv6 addresses are replaced with <tt>[fd9f:2e19:3bcf::xx:xxxx]</tt> +with <tt>xx:xxxx</tt> being the hex-formatted 3 byte output of a similar +hash function as described for IPv4 addresses. +The only differences are that the input <tt>IP address</tt> is 16 bytes +long and the <tt>secret</tt> is only 19 bytes long.</li></ul> +<li><b>Replace contact information:</b> If there is contact information in +a descriptor, the contact line is changed to +<tt>somebody</tt>.</li> +<li><b>Remove pluggable transport addresses and arguments:</b> Bridges may +provide transports in addition to the onion-routing protocol and include +information about these transports in their extra-info descriptors for +BridgeDB. +In that case, any IP addresses, TCP ports, or additional arguments are +removed, only leaving in the supported transport names.</li> +<li><b>Append descriptor digest:</b> Descriptors are often referenced by +their digest, but that is not possible anymore once their content is +changed. +As a workaround, sanitized descriptors may contain a new line +<tt>router-digest</tt> with the hex representation of the SHA-1 of the +original descriptor digest. +</ol> + +<h3>Network statuses +(<a href="archive/bridge-descriptors/">archive</a>, +<a href="recent/bridge-descriptors/statuses/">recent</a>) +<span class="type-annotation"><tt>@type bridge-network-status +1.0</tt></span> +</h3> + +<p> +Sanitized bridge network statuses are similar to version 2 relay network +statuses, but with only a <tt>published</tt> line in the header and +without any lines in the footer. +The tarballs in +<a href="archive/bridge-descriptors/">archive</a> contain all bridge +descriptors of a given month, not just network statuses. +</p> + +<h3>Server descriptors +(<a href="archive/bridge-descriptors/">archive</a>, +<a href="recent/bridge-descriptors/server-descriptors/">recent</a>) +<span class="type-annotation"><tt>@type bridge-server-descriptor +1.0</tt></span> +</h3> + +<p> +Bridge server descriptors follow the same format as relay server +descriptors, except for the sanitizing steps described above. +The tarballs in +<a href="archive/bridge-descriptors/">archive</a> contain all bridge +descriptors of a given month, not just server descriptors. +These tarballs contain one descriptor per file, whereas the +files in +<a href="recent/bridge-descriptors/server-descriptors/">recent</a> +contain all descriptors collected in an hour concatenated into a single +file to reduce the number of files. +</p> + +<h3>Extra-info descriptors +(<a href="archive/bridge-descriptors/">archive</a>, +<a href="recent/bridge-descriptors/extra-infos/">recent</a>) +<span class="type-annotation"><tt>@type bridge-extra-info 1.2</tt></span> +</h3> + +<p> +Bridge server descriptors follow the same format as relay server +descriptors, except for the sanitizing steps described above. +The format has changed over time to accomodate changes to the sanitizing +process, with earlier versions being: +</p> + +<ul> +<li><font color="#666"><tt>@type bridge-extra-info 1.0</tt> was the first +version.</font></li> +<li><font color="#666"><tt>@type bridge-extra-info 1.1</tt> added +sanitized <tt>transport</tt> lines</font>.</li> +<li><tt>@type bridge-extra-info 1.2</tt> added <tt>ntor-onion-key</tt> +lines.</li> +</ul> + +<p> +The tarballs in +<a href="archive/bridge-descriptors/">archive</a> contain all bridge +descriptors of a given month, not just extra-info descriptors. +These tarballs contain one descriptor per file, whereas the +files in +<a href="recent/bridge-descriptors/extra-infos/">recent</a> +contain all descriptors collected in an hour concatenated into a single +file to reduce the number of files. +</p> + +</div>  + +<div class="box"> + +<a name="bridge-pool-assignments"></a> +<h2>BridgeDB's bridge pool assignments +<a href="#bridge-pool-assignments">#</a></h2> + +<p> +The bridge distribution service BridgeDB publishes bridge pool assignments +describing which bridges it has assigned to which distribution pool. +BridgeDB receives bridge network statuses from the bridge authority, +assigns these bridges to persistent distribution rings, and hands them out +to bridge users. +BridgeDB periodically dumps the list of running bridges with information +about the rings, subrings, and file buckets to which they are assigned to +a local file. +The sanitized versions of these lists containing SHA-1 hashes of bridge +fingerprints instead of the original fingerprints are available for +statistical analysis. +</p> + +<h3>Bridge pool assignments +(<a href="archive/bridge-pool-assignments/">archive</a>, +<a href="recent/bridge-pool-assignments/">recent</a>) +<span class="type-annotation"><tt>@type bridge-pool-assignment +1.0</tt></span> +</h3> + +<p> +The document below shows a BridgeDB pool assignment file +from March 13, 2011. +Every such file begins with a line containing the timestamp when BridgeDB +wrote this file. +Subsequent lines start with the SHA-1 hash of a bridge fingerprint, +followed by ring, subring, and/or file bucket information. +There are currently three distributor ring types in BridgeDB: +</p> + +<ol> +<li><b>unallocated:</b> These bridges are not distributed by BridgeDB, +but are either reserved for manual distribution or are written to file +buckets for distribution via an external tool. +If a bridge in the <tt>unallocated</tt> ring is assigned to a file bucket, +this is noted by <tt>bucket=$bucketname</tt>.</li> +<li><b>email:</b> These bridges are distributed via an e-mail +autoresponder. Bridges can be assigned to subrings by their OR port or +relay flag which is defined by <tt>port=$port</tt> and/or <tt>flag=$flag</tt>. +</li> +<li><b>https:</b> These bridges are distributed via https server. +There are multiple https rings to further distribute bridges by IP address +ranges, which is denoted by <tt>ring=$ring</tt>. +Bridges in the <tt>https</tt> ring can also be assigned to subrings by +OR port or relay flag which is defined by <tt>port=$port</tt> and/or +<tt>flag=$flag</tt>.</li> +</ol> + +<pre> +bridge-pool-assignment 2011-03-13 14:38:03 +00b834117566035736fc6bd4ece950eace8e057a unallocated +00e923e7a8d87d28954fee7503e480f3a03ce4ee email port=443 flag=stable +0103bb5b00ad3102b2dbafe9ce709a0a7c1060e4 https ring=2 port=443 flag=stable +[...] +</pre> + +</div>  + +<div class="box"> + +<a name="exit-lists"></a> +<h2>TorDNSEL's exit lists <a href="#exit-lists">#</a></h2> + +<p> +The exit list service +<a href="https://www.torproject.org/tordnsel/dist/">TorDNSEL</a> +publishes exit lists containing the IP addresses of relays that it found +when exiting through them. +</p> + +<h3>Exit lists +(<a href="archive/exit-lists/">archive</a>, +<a href="recent/exit-lists/">recent</a>) +<span class="type-annotation"><tt>@type tordnsel 1.0</tt></span> +</h3> + +<p> +Tor Check makes the list of known exits and corresponding exit IP +addresses available in a specific format. +The document below shows an entry of the exit list written on +December 28, 2010 at 15:21:44 UTC. +This entry means that the relay with fingerprint <tt>63BA..</tt> which +published a descriptor at 07:35:55 and was contained in a version 2 +network status from 08:10:11 uses two different IP addresses for exiting. +The first address <tt>91.102.152.236</tt> was found in a test performed at +07:10:30. +When looking at the corresponding server descriptor, one finds that this +is also the IP address on which the relay accepts connections from inside +the Tor network. +A second test performed at 10:35:30 reveals that the relay also uses IP +address <tt>91.102.152.227</tt> for exiting. +</p> + +<pre> +ExitNode 63BA28370F543D175173E414D5450590D73E22DC +Published 2010-12-28 07:35:55 +LastStatus 2010-12-28 08:10:11 +ExitAddress 91.102.152.236 2010-12-28 07:10:30 +ExitAddress 91.102.152.227 2010-12-28 10:35:30 +</pre> + +</div>  + +<div class="box"> + +<a name="torperf"></a> +<h2>Torperf's performance data <a href="#torperf">#</a></h2> + +<p> +The performance measurement service Torperf publishes performance data +from making simple HTTP requests over the Tor network. +Torperf uses a trivial SOCKS client to download files of various sizes +over the Tor network and notes how long substeps take. +</p> + +<h3>Torperf measurement results +(<a href="archive/torperf/">archive</a>, +<a href="recent/torperf/">recent</a>) +<span class="type-annotation"><tt>@type torperf 1.0</tt></span> +</h3> + +<p> +A Torperf results file contains a single line per Torperf run with +<tt>key=value</tt> pairs. +Such a result line is sufficient to learn about 1) the Tor and Torperf +configuration, 2) measurement results, and 3) additional information that +might help explain the results. +Known keys are explained below. +</p> +<ul> +<li>Configuration +<ul> +<li><tt>SOURCE:</tt> Configured name of the data source; required.</li> +<li><tt>FILESIZE:</tt> Configured file size in bytes; required.</li> +<li>Other meta data describing the Tor or Torperf configuration, e.g., +GUARD for a custom guard choice; optional.</li> +</ul> +<li>Measurement results +<ul> +<li><tt>START:</tt> Time when the connection process starts; +required.</li> +<li><tt>SOCKET:</tt> Time when the socket was created; required.</li> +<li><tt>CONNECT:</tt> Time when the socket was connected; required.</li> +<li><tt>NEGOTIATE:</tt> Time when SOCKS 5 authentication methods have been +negotiated; required.</li> +<li><tt>REQUEST:</tt> Time when the SOCKS request was sent; required.</li> +<li><tt>RESPONSE:</tt> Time when the SOCKS response was received; +required.</li> +<li><tt>DATAREQUEST:</tt> Time when the HTTP request was written; +required.</li> +<li><tt>DATARESPONSE:</tt> Time when the first response was received; +required.</li> +<li><tt>DATACOMPLETE:</tt> Time when the payload was complete; +required.</li> +<li><tt>WRITEBYTES:</tt> Total number of bytes written; required.</li> +<li><tt>READBYTES:</tt> Total number of bytes read; required.</li> +<li><tt>DIDTIMEOUT:</tt> 1 if the request timed out, 0 otherwise; +optional.</li> +<li><tt>DATAPERCx:</tt> Time when x% of expected bytes were read for +x = { 10, 20, 30, 40, 50, 60, 70, 80, 90 }; optional.</li> +<li>Other measurement results, e.g., START_RENDCIRC, GOT_INTROCIRC, etc. +for hidden-service measurements; optional.</li> +</ul> +<li>Additional information +<ul> +<li><tt>LAUNCH:</tt> Time when the circuit was launched; optional.</li> +<li><tt>USED_AT:</tt> Time when this circuit was used; optional.</li> +<li><tt>PATH:</tt> List of relays in the circuit, separated by commas; +optional.</li> +<li><tt>BUILDTIMES:</tt> List of times when circuit hops were built, +separated by commas; optional.</li> +<li><tt>TIMEOUT:</tt> Circuit build timeout that the Tor client used when +building this circuit; optional.</li> +<li><tt>QUANTILE:</tt> Circuit build time quantile that the Tor client +uses to determine its circuit-build timeout; optional.</li> +<li><tt>CIRC_ID:</tt> Circuit identifier of the circuit used for this +measurement; optional.</li> +<li><tt>USED_BY:</tt> Stream identifier of the stream used for this +measurement; optional.</li> +<li>Other fields containing additional information; optional.</li> +</ul> +</ul> + +<p> +The files in <a href="recent/torperf/extra-infos/">recent</a> +accumulate all new Torperf measurements of a given day, which means that +they may change throughout the day. +This is different from all other files in the <a href="recent/">recent</a> +directory which do not change once they are written. +</p> + +</div>  + +</body> +</html> + diff --git a/web/index.html b/web/index.html index c687798..e4eadc2 100644 --- a/web/index.html +++ b/web/index.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> -<title>CollecTor — your friendly data-collecting service in the Tor +<title>CollecTor — Your friendly data-collecting service in the Tor network</title> <link href="css/style.css" type="text/css" rel="stylesheet"> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> @@ -11,8 +11,8 @@ network</title> <div class="box"> -<h1>CollecTor — your friendly data-collecting service in the Tor -network</h1> +<h1><a href="index.html">CollecTor</a> —</h1> +<h2>Your friendly data-collecting service in the Tor network</h2> <p> Welcome to CollecTor, your friendly data-collecting service in the Tor @@ -23,12 +23,51 @@ If you're doing research on the Tor network, or if you're developing an application that uses Tor network data, this is your place to start. </p> +<ul> +<li><a href="#formats">What is in the data?</a></li> +<li><a href="#download">Where do I get the data?</a></li> +<li><a href="#libraries">How can I parse the data?</a></li> +<li><a href="#references">What did others do with the data?</a></li> +<li><a href="#support">How can I get support?</a></li> +</ul> + +</div>  + +<div class="box"> + +<a name="formats"></a> +<h2>What is in the data? <a href="#formats">#</a></h2> + +<p> +The Tor network data provided here comes from currently five different +sources (each of which is explained in more detail on a +<a href="formats.html">separate page</a>): +</p> + +<ol> +<li>Relays and directory authorities publish +<a href="formats.html#relay-descriptors">relay descriptors</a>, so that +clients can select relays for their paths through the Tor network.</li> +<li>Bridges and the bridge authority publish +<a href="formats.html#bridge-descriptors">bridge descriptors</a> that are +used by censored clients to connect to the Tor network.</li> +<li>The bridge distribution service BridgeDB publishes +<a href="formats.html#bridge-pool-assignments">bridge pool assignments</a> +describing which bridges it has assigned to which distribution pool.</li> +<li>The exit list service TorDNSEL publishes +<a href="formats.html#exit-lists">exit lists</a> containing the IP +addresses of relays that it found when exiting through them.</li> +<li>The performance measurement service Torperf publishes +<a href="formats.html#torperf">performance data</a> from making simple +HTTP requests over the Tor network.</li> +</ol> + </div>  <div class="box"> -<a name="archive"></a> -<h3>Archive of monthly tarballs <a href="#archive">#</a></h3> +<a name="download"></a> +<h2>Where do I get the data? <a href="#download">#</a></h2> <p> We have over 10 years of Tor network data available for download in @@ -36,56 +75,104 @@ monthly tarballs. The latest tarballs are updated every few days. So, if you want to fetch data covering an extended period of time, monthly tarballs are for you. -Note that tarballs can decompress to 20 times the compressed size or even -more. +Just be careful: these tarballs can decompress to 20 times the compressed +size or even more. +Monthly tarballs can be browsed and downloaded in the +<a href="archive/"><tt>archive/</tt></a> subdirectory. </p> <p> -Monthly tarballs can be browsed and downloaded here: +If you're only interested in recently published data, we also have data +from the last 72 hours available for you. +In contrast to monthly tarballs, this data set is updated every hour. +If you have already bootstrapped your application with monthly tarballs +and want to stay up-to-date, or if you just want to take a peak at the +latest data, this is your data set. +If you're using special software to download these files, you may want to +configure it to accept gzip-compressed data to save us all some bandwidth. +The latest 72 hours of data are available in the +<a href="recent/"><tt>recent/</tt></a> subdirectory. </p> -<pre> - <a href="archive/">https://collector.torproject.org/archive/</a> -</pre> - </div>  <div class="box"> -<a name="recent"></a> -<h3>The latest 72 hours <a href="#recent">#</a></h3> +<a name="libraries"></a> +<h2>How can I parse the data? <a href="#libraries">#</a></h2> <p> -If you're only interested in recently published data, we also have data -from the last 72 hours available for you. -In contrast to monthly tarballs, this data set is updated every hour. -If you have already bootstrapped your application with monthly tarballs -and want to stay up-to-date, or if you just want to take a peak at the -latest data, this is your data set. +We developed two parsing libraries, one for Java and one for Python: </p> +<ul> +<li>If you're programming in Java, try out the +<a href="https://gitweb.torproject.org/metrics-lib.git">metrics-lib</a> +library.</li> +<li>If you're writing in Python, +<a href="https://stem.torproject.org/">Stem</a> is your library.</li> +</ul> + <p> -The latest 72 hours of data are also available here: +If you developed a parsing library for another language and want it to be +listed here, <a href="#support">please let us know</a>!</h2> </p> -<pre> - <a href="recent/">https://collector.torproject.org/recent/</a> -</pre> +</div>  + +<div class="box"> + +<a name="references"></a> +<h2>What did others do with the data? <a href="#references">#</a></h2> + +<p> +We wrote a couple of applications, and researchers wrote research papers +using the Tor network data provided here. +The following list is not at all exhaustive: +</p> + +<ul> +<li>The metrics portal shows graphs of +<a href="https://metrics.torproject.org/network.html">network growth over +time</a> and <a href="https://metrics.torproject.org/users.html">estimates +of users derived from directory activity</a>.</li> +<li>The <a href="https://exonerator.torproject.org/">ExoneraTor +service</a> allows people to look up whether a given IP address was part +of the Tor network in the past.</li> +<li>The websites <a href="https://atlas.torproject.org/">Atlas</a>, +<a href="https://globe.torproject.org/">Globe</a>, and +<a href="https://compass.torproject.org/">Compass</a> let users explore +how specific relays or bridges contribute to the Tor network. +They all use <a href="https://onionoo.torproject.org/">Onionoo</a> as +their data back-end service which in turn uses the Tor network data +provided here.</li> +<li>The <a href="https://shadow.github.io/">Shadow Simulator</a> uses +archived Tor directory data to generate network topologies that match the +real Tor network as close as possible.</li> +<li>The <a href="https://torps.github.io/">Tor Path Simulator</a> uses Tor +directory archive data to simulate the effect of changes to Tor's path +selection algorithm.</li> +</ul> + +<p> +If you wrote an application or research paper that uses Tor network data +and that is not yet listed here, <a href="#support">please let us +know</a>!</h2> +Please include a short description what your application does or what your +research was about. +</p> </div>  <div class="box"> -<a name="next"></a> -<h3>What's next? <a href="#next">#</a></h3> +<a name="support"></a> +<h2>How can I get support? <a href="#support">#</a></h2> <p> -Do you need support? -If you have any questions or feedback about the Tor network data provided -here, we'd like to hear from you! -Please send mail to the -<a href="mailto:tor-dev@lists.torproject.org">Tor development mailing -list</a>. +If you have any questions about the Tor network data provided here, we'd +like to <a href="mailto:help@rt.torproject.org">hear from you</a>! +Of course, suggestions or other feedback are welcome, too. </p> </div>

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit d381b9fbe7fdc57e39713e969ceca6853eaf51df Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 19:15:42 2014 +0000 Update translations for tails-misc_completed --- sv.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sv.po b/sv.po index d17b9f7..50f7868 100644 --- a/sv.po +++ b/sv.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# GabSeb, 2014 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 19:29+0200\n" -"PO-Revision-Date: 2014-04-30 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-29 00:14+0200\n" +"PO-Revision-Date: 2014-06-03 18:52+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -222,10 +223,6 @@ msgstr "Stäng av omedelbart" msgid "Reboot Immediately" msgstr "Starta om omedelbart" -#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 -msgid "Shutdown Helper" -msgstr "Panelprogram för nedstängning" - #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" msgstr "ej tillgängligt" @@ -247,6 +244,7 @@ msgid "" msgstr "Build information:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" msgstr "Om Tails" @@ -483,6 +481,10 @@ msgstr "i2p" msgid "Anonymous overlay network" msgstr "Anonymt overlay-nätverk" +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 +msgid "Learn more about Tails" +msgstr "Lär dig mer om Tails" + #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" msgstr "Starta om"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit 3e5a2f91e0e04a7bd036661a1029a90711af6e08 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 19:15:40 2014 +0000 Update translations for tails-misc --- sv.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sv.po b/sv.po index de7f3d5..50f7868 100644 --- a/sv.po +++ b/sv.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# GabSeb, 2014 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-03 18:52+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -482,7 +483,7 @@ msgstr "Anonymt overlay-nätverk" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" -msgstr "" +msgstr "Lär dig mer om Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit 29bd6563d0bd7d5b5979ce89fc103f5fd055fc12 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 19:15:27 2014 +0000 Update translations for tails-greeter_completed --- sv/sv.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 18b59fe..d1914b9 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# GabSeb, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-14 13:14+0200\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" +"POT-Creation-Date: 2014-05-28 22:33+0200\n" +"PO-Revision-Date: 2014-06-03 19:03+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103,13 +104,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D #: ../glade/optionswindow.glade.h:12 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Detta alternativ får Tails att likna Microsoft Windows XP. Detta kan användas för att smälta in bättre vid användning på publika platser." +msgstr "Detta alternativ får Tails att likna Microsoft Windows 8. Det kan komma till nytta på allmänna platser för att undvika att dra till sig misstankar." #: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "Aktivera Microsoft Windows XP kamouflage" +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "Aktivera Microsoft Windows 8 kamoflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit b419edcc5031ce3d9da01c9c0da68447e9e85a43 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 19:15:24 2014 +0000 Update translations for tails-greeter --- sv/sv.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index a7171a3..d1914b9 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# GabSeb, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-03 19:03+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,11 +106,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "Detta alternativ får Tails att likna Microsoft Windows 8. Det kan komma till nytta på allmänna platser för att undvika att dra till sig misstankar." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "" +msgstr "Aktivera Microsoft Windows 8 kamoflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit 530c50fdf76f828522b9b262d94ca5bd4c4d3b87 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 19:15:20 2014 +0000 Update translations for liveusb-creator_completed --- sv/sv.po | 208 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 107 insertions(+), 101 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index bb948b6..217686e 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -4,6 +4,7 @@ # # Translators: # cryptohead <cryptohead(a)gmail.com>, 2013 +# GabSeb, 2014 # Göran Uddeborg <goeran(a)uddeborg.se>, 2010 # Mikael Hiort af Ornäs <mikael.hafo(a)hotmail.com>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-28 16:00+0200\n" +"PO-Revision-Date: 2014-06-03 19:12+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,22 +27,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s installerare" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s vald" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1020 +#: ../liveusb/creator.py:1046 #, python-format msgid "%s already bootable" msgstr "%s är redan startbar" @@ -51,36 +52,36 @@ msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Behöver du hjälp? Läs </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentationen</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Behöver du hjälp? Läs </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentationen</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiera den aktuella Tails versionen till ett USB-minne eller SD-minneskort. All data på målenheten kommer att gå förlorad.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kopiera Tails som körs till en USB-sticka eller ett SD-kort. All data på mål-enheten kommer att gå förlorad.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Kopiera den aktuella Tails versionen till en redan installerad Tails enhet. Andra partitioner på enheten kommer att bevaras.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kopiera Tails som körs till en enhet där Tails redan installerats. Andra partitioner på stick kommer att bevaras.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Uppgradera en redan installerad Tails enhet från en ny ISO-avbild.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Uppgradera en redan installerad Tails enhet från en ny ISO image.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -98,16 +99,16 @@ msgid "" "persist after a reboot." msgstr "Genom att allokera extra utrymme på ditt USB-minne för beständig överlagring kan du möjliggöra lagring av data samt göra beständiga ändringar i ditt live operativsystem. Utan detta kommer ingen data du sparar att finnas kvar mellan omstarter." -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1150 ../liveusb/creator.py:1413 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Beräknar SHA1 för %s" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1361 msgid "Cannot find" msgstr "Kan inte hitta" -#: ../liveusb/creator.py:542 +#: ../liveusb/creator.py:551 #, python-format msgid "Cannot find device %s" msgstr "Hittar inte enheten %s" @@ -126,12 +127,12 @@ msgid "" "Upgrade" msgstr "Klona\n&&\nUppgradera" -#: ../liveusb/creator.py:400 +#: ../liveusb/creator.py:407 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Skapar %sMB beständig överlagring" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Enheten är inte monterad, så vi kan inte fastställa hur mycket ledigt utrymme där finns." @@ -141,11 +142,11 @@ msgstr "Enheten är inte monterad, så vi kan inte fastställa hur mycket ledigt msgid "Download %(distribution)s" msgstr "Ladda ned %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:768 msgid "Download complete!" msgstr "Hämtning färdig!" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:772 msgid "Download failed: " msgstr "Hämtning misslyckades: " @@ -154,45 +155,45 @@ msgstr "Hämtning misslyckades: " msgid "Downloading %s..." msgstr "Hämtar %s…" -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1146 msgid "Drive is a loopback, skipping MBR reset" msgstr "Enheten är en loopback, hoppar över att återställa MBR" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:822 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Anger unmount_device för \"%(device)s\"" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1226 msgid "Error probing device" msgstr "Fel vid sökning efter enheten" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Fel: Det går inte att sätta etiketten eller hämta UUID numret för din enhet. Kan inte fortsätta." -#: ../liveusb/creator.py:376 +#: ../liveusb/creator.py:383 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Fel: SHA1-summan för din Live CD är ogiltig. Du kan köra detta program med argumentet --noverify för att hoppa över denna verifieringskontroll." -#: ../liveusb/creator.py:145 +#: ../liveusb/creator.py:146 msgid "Extracting live image to the target device..." msgstr "Packar upp live-avbild till målenheten..." -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1089 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formaterar %(device)s som FAT32" -#: ../liveusb/creator.py:140 +#: ../liveusb/creator.py:141 msgid "ISO MD5 checksum passed" msgstr "ISO MD5 kontrollsumman är korrekt" -#: ../liveusb/creator.py:138 +#: ../liveusb/creator.py:139 msgid "ISO MD5 checksum verification failed" msgstr "Verifieringen av ISO MD5 kontrollsumman misslyckades" @@ -206,70 +207,70 @@ msgstr "Om du inte väljer en existerande Live ISO kommer den valda utgåvan att msgid "Install Tails" msgstr "Installera Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Installationen slutförd!" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:265 #, python-format msgid "Installation complete! (%s)" msgstr "Installationen är slutförd! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "Installationen slutförd. Tryck OK för att stänga detta program." -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." msgstr "Installerar starthanteraren..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" msgstr "Misslyckades med att skapa LiveUSB!" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1362 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Säkerställ att du packar upp hela liveusb-creator zip-filen innan du kör detta program." -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1238 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Se till att din USB-pinne är inkopplat och formaterad med filsystemet FAT" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:844 #, python-format msgid "Mount %s exists after unmounting" msgstr "Montering %s existerar efter avmontering" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "Inget ledigt utrymme på enheten %(device)s" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:811 msgid "No mount points found" msgstr "Hittade inga monteringspunkter" -#: ../liveusb/creator.py:393 +#: ../liveusb/creator.py:400 msgid "Not enough free space on device." msgstr "Inte tillräckligt med fritt utrymme på enheten." -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partitionen är FAT16; Begränsar överlagringsstorlek till 2 GB" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Partitionen är FAT32; Begränsar överlagringsstorlek till 4 GB" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:227 ../liveusb/creator.py:851 #, python-format msgid "Partitioning device %(device)s" msgstr "Partitionerar enheten %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Bestående lagring" @@ -277,53 +278,53 @@ msgstr "Bestående lagring" msgid "Persistent Storage (0 MB)" msgstr "Beständigt lagringsutrymme (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:688 ../liveusb/gui.py:717 msgid "Please confirm your device selection" msgstr "Bekräfta ditt val av enhet" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Uppdaterar utgåvor..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Utgåvor uppdaterade!" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:965 ../liveusb/creator.py:1285 #, python-format msgid "Removing %(file)s" msgstr "Tar bort %(file)s" -#: ../liveusb/creator.py:469 +#: ../liveusb/creator.py:478 msgid "Removing existing Live OS" msgstr "Tar bort existerande Live OS" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1140 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Nollställer Master Boot Record på %s" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:779 msgid "Select Live ISO" msgstr "Välj Live-ISO" -#: ../liveusb/creator.py:182 +#: ../liveusb/creator.py:183 msgid "Setting up OLPC boot file..." msgstr "Installerar OLPC startfil..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Några partitioner på målenheten %(device)s är monterade. De kommer att avmonteras innan installationen påbörjas." -#: ../liveusb/creator.py:131 +#: ../liveusb/creator.py:132 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Källtypen stöder inte verifikation af ISO MD5 kontrollsummor, hoppar över" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1174 msgid "Synchronizing data on disk..." msgstr "Synkroniserar data på disk..." @@ -331,19 +332,19 @@ msgstr "Synkroniserar data på disk..." msgid "Target Device" msgstr "Målenhet" -#: ../liveusb/gui.py:667 +#: ../liveusb/gui.py:653 msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." msgstr "Master Boot Record på din enhet är tom. Tryck på 'Installera Tails' igen för att nollställa MBR på den här enheten." -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:782 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Den valda filen kan inte läsas. Var god rätta till rättigheterna eller välj en annan fil." -#: ../liveusb/creator.py:337 +#: ../liveusb/creator.py:344 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -381,87 +382,87 @@ msgstr "Detta är förloppsfältet som visar hur långt skapandet av LiveUSB pro msgid "This is the status console, where all messages get written to." msgstr "Detta är statuskonsollen där alla meddelanden sparas." -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:905 msgid "Trying to continue anyway." msgstr "Försöker fortsätta ändå." -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:937 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Kunde inte byta etikett på volymen: %(message)s" -#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 +#: ../liveusb/creator.py:487 ../liveusb/creator.py:498 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Kunde inte chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:459 +#: ../liveusb/creator.py:468 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Kunde inte kopiera %(infile)s till %(outfile)s: %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" msgstr "Kunde inte hitta någon USB-enhet." -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" msgstr "Hittade ingen enhet som stöds." -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1066 msgid "Unable to find partition" msgstr "Kunde inte hitta partitionen" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1308 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Kunde inte läsa Win32_LogicalDisk; win32com frågan gav inte något svar" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:681 msgid "Unable to mount device" msgstr "Kunde inte montera enheten" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:799 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Kunde inte montera enheten: %(message)s" -#: ../liveusb/creator.py:494 +#: ../liveusb/creator.py:503 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Kunde inte ta bort mapp från tidigare LiveOS: %(message)s" -#: ../liveusb/creator.py:482 +#: ../liveusb/creator.py:491 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Kunde inte ta bort fil från tidigare LiveOS: %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1143 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Kunde inte återställa MBR. Det kan vara så att du inte har `syslinux` paketet installerat." -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:788 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Kunde inte använda den valda filen. Det kanske fungerar bättre om du flyttar din ISO till roten av din enhet (t.ex: C:\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:706 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Kunde inte skriva till %(device)s, hoppar över" -#: ../liveusb/creator.py:382 +#: ../liveusb/creator.py:389 msgid "Unknown ISO, skipping checksum verification" msgstr "Okänd ISO, hoppar över verifiering av kontrollsumma" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:795 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Okänt dbus undantag vid försök att montera enheten: %(message)s" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:774 ../liveusb/creator.py:916 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Okänt filsystem. Din enhet kan behöva omformateras." @@ -470,40 +471,45 @@ msgstr "Okänt filsystem. Din enhet kan behöva omformateras." msgid "Unknown release: %s" msgstr "Okänd utgåva: %s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:836 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Avmonterar \"%(udi)s\" på \"%(device)s\"" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:832 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Avmonterar monterade filsystem på \"%(device)s\"" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:902 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Enheten '%(device)s' stöds inte, anmäl detta som en bugg." -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:919 #, python-format msgid "Unsupported filesystem: %s" msgstr "Stöder inte filsystemet: %s" -#: ../liveusb/creator.py:768 +#: ../liveusb/creator.py:777 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Filsystemet stöds inte: %s\nOm du försöker att uppgradera ett manuellt installerat Tails system (dvs, det var installerat utan denna installerare) så stöds inte det: du måste ominstallera systemet, t.ex genom att välja \"Klona & installera\" istället." -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1241 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Ej stött filsystem: %s\nGör en säkerhetskopia och formatera din USB-pinne med filsystemet FAT." +#: ../liveusb/creator.py:877 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Uppdaterar egenskaper för systempartitionen %(system_partition)s" + #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "Uppgradera från ISO" @@ -512,54 +518,54 @@ msgstr "Uppgradera från ISO" msgid "Use existing Live system ISO" msgstr "Använd existerande Live-system ISO" -#: ../liveusb/creator.py:133 +#: ../liveusb/creator.py:134 msgid "Verifying ISO MD5 checksum" msgstr "Verifierar ISO MD5 kontrollsumma" -#: ../liveusb/creator.py:356 +#: ../liveusb/creator.py:363 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verifierar SHA1 kontrollsumma av LiveCD avbild..." -#: ../liveusb/creator.py:360 +#: ../liveusb/creator.py:367 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verifierar SHA256 kontrollsumma av LiveCD avbild..." -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:913 ../liveusb/creator.py:1234 msgid "Verifying filesystem..." msgstr "Verifierar filsystem…" -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:715 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Varning: Att skapa ett nytt varaktigt överlägg kommer radera ditt nuvarande." -#: ../liveusb/gui.py:681 +#: ../liveusb/gui.py:667 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Varning: Master Boot Record på din enhet matchar inte ditt systems syslinux MBR. Om du har problem med att starta från det här USB-minnet, försök att köra liveusb-creator med parametern --reset-mbr." -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Varning: Detta verktyg måste köras som en administratör. För att göra detta, högerklicka på ikonen och välj Egenskaper. Under kompatibilitets-fliken markerar du rutan \"Kör detta program som administratör\"." -#: ../liveusb/creator.py:152 +#: ../liveusb/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Skrev till enheten med %(speed)d MB/sek" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:689 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Du är på väg att installera Tails på enheten %(size)s %(vendor)s %(model)s (%(device)s). All data på den valda enheten kommer att gå förlorad. Vill du fortsätta?" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:705 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -567,17 +573,17 @@ msgid "" "unchanged. Continue?" msgstr "Du är på väg att uppgradera Tails på enheten %(parent_size)s %(vendor)s %(model)s (%(device)s). Eventuell bestående lagring på den här enheten kommer att behållas som den är. Vill du fortsätta?" -#: ../liveusb/creator.py:604 +#: ../liveusb/creator.py:613 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Du använder en äldre version av syslinux-extlinux som inte stöder ext4 filsystem." -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:773 msgid "You can try again to resume your download" msgstr "Du kan försöka igen för att återuppta din hämtning" -#: ../liveusb/creator.py:92 +#: ../liveusb/creator.py:93 msgid "You must run this application as root" msgstr "Du måste köra det här programmet som root"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit c83763866a777aac4b2f3c388c6940c5f9257b2a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 19:15:18 2014 +0000 Update translations for liveusb-creator --- sv/sv.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 99dce17..217686e 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -4,7 +4,7 @@ # # Translators: # cryptohead <cryptohead(a)gmail.com>, 2013 -# GabSeb <gabor.sebastiani(a)gmail.com>, 2014 +# GabSeb, 2014 # Göran Uddeborg <goeran(a)uddeborg.se>, 2010 # Mikael Hiort af Ornäs <mikael.hafo(a)hotmail.com>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-29 09:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-03 19:12+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Behöver du hjälp? Läs </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentationen</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -63,7 +63,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kopiera Tails som körs till en USB-sticka eller ett SD-kort. All data på mål-enheten kommer att gå förlorad.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -72,7 +72,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Kopiera Tails som körs till en enhet där Tails redan installerats. Andra partitioner på stick kommer att bevaras.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -508,7 +508,7 @@ msgstr "Ej stött filsystem: %s\nGör en säkerhetskopia och formatera din USB-p #: ../liveusb/creator.py:877 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Uppdaterar egenskaper för systempartitionen %(system_partition)s" #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit edced3828daa51945a768b3c9ab188120ecbdbd1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 18:45:02 2014 +0000 Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index fb0ddf6..5a255f9 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# GabSeb <gabor.sebastiani(a)gmail.com>, 2014 +# GabSeb, 2014 # Petomatick <petomatick(a)hotmail.com>, 2011 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-21 21:13+0000\n" -"Last-Translator: GabSeb <gabor.sebastiani(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-03 18:42+0000\n" +"Last-Translator: GabSeb\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -160,20 +160,20 @@ msgstr "" #: lib/bridgedb/strings.py:89 msgid "Get Bridges!" -msgstr "" +msgstr "Skaffa Bridges!" #: lib/bridgedb/strings.py:93 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Välj alternativ för bridge-typ:" #: lib/bridgedb/strings.py:94 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Behöver du en IPv6 adress?" #: lib/bridgedb/strings.py:95 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Behöver du %s?" #: lib/bridgedb/strings.py:99 msgid "Your browser is not displaying images properly." @@ -198,13 +198,13 @@ msgstr "" msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "När dialogen \"Tor Network\" Inställningar visas, välj \"Konfigurera\" och följ\nstegen tills du kommer till frågan:" #: lib/bridgedb/strings.py:111 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Blockerar eller filtrerar din Internetleverantör (ISP) anslutningar till Tor network?" #: lib/bridgedb/strings.py:114 msgid "" @@ -224,7 +224,7 @@ msgstr "" #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Begär IPv6 bridges" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:126

1 0

[onionoo/master] Update .gitignore.
by karsten＠torproject.org 03 Jun '14

03 Jun '14

commit 6f81a7539c96ce4b638d0c7fe83f23fa361fceeb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 3 20:39:39 2014 +0200 Update .gitignore. --- .gitignore | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4e2cb6e..f45b088 100755 --- a/.gitignore +++ b/.gitignore @@ -3,15 +3,7 @@ classes/ etc/context.xml etc/web.xml -geoip/Automatic-GeoLiteCity-Blocks.csv -geoip/GeoIPASNum2.csv -geoip/GeoIPASNum2.zip -geoip/GeoLiteCity-Blocks.csv -geoip/GeoLiteCity-Location.csv -geoip/GeoLiteCity-latest.zip -geoip/Manual-GeoLiteCity-Blocks.csv -geoip/iso3166.csv -geoip/region.csv +geoip/ in/ log onionoo.war

1 0

[onionoo/master] Move input descriptors to in/recent/.
by karsten＠torproject.org 03 Jun '14

03 Jun '14

commit 7112fb7b6a6ebbc078d53e21d8d976222734f8b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 3 10:29:33 2014 +0200 Move input descriptors to in/recent/. This allows us to exclude descriptors from the server backup by touching in/.nobackup, but without having to handle that file specifically. --- src/org/torproject/onionoo/DescriptorSource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/onionoo/DescriptorSource.java b/src/org/torproject/onionoo/DescriptorSource.java index 9fb9715..f3f88a3 100644 --- a/src/org/torproject/onionoo/DescriptorSource.java +++ b/src/org/torproject/onionoo/DescriptorSource.java @@ -78,7 +78,7 @@ class DescriptorDownloader { private String directory; - private final File inDir = new File("in"); + private final File inDir = new File("in/recent"); public DescriptorDownloader(DescriptorType descriptorType) { switch (descriptorType) { @@ -447,7 +447,7 @@ class DescriptorQueue { public class DescriptorSource { - private final File inDir = new File("in"); + private final File inDir = new File("in/recent"); private final File statusDir = new File("status");

1 0