date:20131106

[tor-commits] [ooni-probe/master] Replace txagentwithsocks in httpt template

2013-11-06 Thread art

commit 30c556c3a06fcbfd3823bef90387f8b023a2998a
Author: aagbsn aag...@extc.org
Date:   Mon Sep 16 10:40:26 2013 +0200

Replace txagentwithsocks in httpt template
---
 ooni/templates/httpt.py |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py
index 5542a85..79ac475 100644
--- a/ooni/templates/httpt.py
+++ b/ooni/templates/httpt.py
@@ -8,8 +8,10 @@ from twisted.internet.ssl import ClientContextFactory
 
 from twisted.internet import reactor
 from twisted.internet.error import ConnectionRefusedError, DNSLookupError, 
TCPTimedOutError
-
+from twisted.internet.endpoints import TCP4ClientEndpoint
 from twisted.web._newclient import Request, Response, ResponseNeverReceived
+from twisted.web.client import Agent
+from txsocksx.http import SOCKS5Agent
 
 from ooni.nettest import NetTestCase
 from ooni.utils import log
@@ -17,7 +19,7 @@ from ooni.settings import config
 
 from ooni.utils.net import BodyReceiver, StringProducer, userAgents
 
-from ooni.utils.txagentwithsocks import Agent, TrueHeaders
+from ooni.utils.txagentwithsocks import TrueHeaders
 from ooni.errors import handleAllFailures
 
 
@@ -62,8 +64,9 @@ class HTTPTest(NetTestCase):
 log.err(Warning! pyOpenSSL is not installed. https websites will 
  not work)
 
-self.control_agent = Agent(reactor, sockshost=127.0.0.1,
-socksport=config.tor.socks_port)
+self.control_agent = SOCKS5Agent(reactor,
+proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
+config.tor.socks_port))
 
 self.report['socksproxy'] = None
 sockshost, socksport = (None, None)
@@ -74,8 +77,12 @@ class HTTPTest(NetTestCase):
 except ValueError:
 raise InvalidSocksProxyOption
 socksport = int(socksport)
-
-self.agent = Agent(reactor, sockshost=sockshost, socksport=socksport)
+self.agent = SOCKS5Agent(reactor,
+proxyEndpoint=TCP4ClientEndpoint(reactor, sockshost,
+socksport))
+else:
+#XXX: pool?
+self.agent = Agent(reactor)
 
 self.report['agent'] = 'agent'
 
@@ -270,14 +277,12 @@ class HTTPTest(NetTestCase):
 # configured socks proxy
 if use_tor:
 log.debug(Using Tor for the request to %s % url)
-url = 's'+url
 agent = self.control_agent
 else:
 agent = self.agent
 
 if self.localOptions['socksproxy']:
 log.debug(Using SOCKS proxy %s for request % 
(self.localOptions['socksproxy']))
-url = 's'+url
 
 log.debug(Performing request %s %s %s % (url, method, headers))
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Fix recursion with proper arrest condition.

2013-11-06 Thread art

commit a449e74b5e56430f05187a23e1ae2af9bf7ca414
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Mon Nov 4 10:00:44 2013 +0100

Fix recursion with proper arrest condition.
---
 ooni/oonibclient.py |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index 6be7c44..1b11347 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -54,7 +54,7 @@ class OONIBClient(object):
 
 finished = defer.Deferred()
 
-def perform_request():
+def perform_request(attempts):
 uri = self.address + urn
 headers = {}
 d = self.agent.request(method, uri, bodyProducer=bodyProducer)
@@ -70,13 +70,13 @@ class OONIBClient(object):
 if attempts  self.retries:
 log.err(Lookup failed. Retrying.)
 attempts += 1
-perform_request()
+perform_request(attempts)
 else:
 log.err(Failed. Giving up.)
 finished.errback(err)
 d.addErrback(errback, attempts)
 
-perform_request()
+perform_request(attempts)
 
 return finished
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Finish adding support for using txsocksx in HTTP templat in HTTP templat in HTTP templat in HTTP template

2013-11-06 Thread art

commit 8682869d638393364f69c075db06b3814b2a1481
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Mon Sep 16 12:13:53 2013 +0200

Finish adding support for using txsocksx in HTTP templat in HTTP templat in 
HTTP templat in HTTP template

* Make sure we are using the TrueHeaders and in SOCKSAgent and Agent
---
 ooni/templates/httpt.py|9 +-
 ooni/utils/trueheaders.py  |  159 +
 ooni/utils/txagentwithsocks.py |  215 
 3 files changed, 163 insertions(+), 220 deletions(-)

diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py
index 79ac475..9a44c18 100644
--- a/ooni/templates/httpt.py
+++ b/ooni/templates/httpt.py
@@ -11,7 +11,7 @@ from twisted.internet.error import ConnectionRefusedError, 
DNSLookupError, TCPTi
 from twisted.internet.endpoints import TCP4ClientEndpoint
 from twisted.web._newclient import Request, Response, ResponseNeverReceived
 from twisted.web.client import Agent
-from txsocksx.http import SOCKS5Agent
+from ooni.utils.trueheaders import TrueHeadersAgent, TrueHeadersSOCKS5Agent
 
 from ooni.nettest import NetTestCase
 from ooni.utils import log
@@ -64,7 +64,7 @@ class HTTPTest(NetTestCase):
 log.err(Warning! pyOpenSSL is not installed. https websites will 
  not work)
 
-self.control_agent = SOCKS5Agent(reactor,
+self.control_agent = TrueHeadersSOCKS5Agent(reactor,
 proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
 config.tor.socks_port))
 
@@ -77,12 +77,11 @@ class HTTPTest(NetTestCase):
 except ValueError:
 raise InvalidSocksProxyOption
 socksport = int(socksport)
-self.agent = SOCKS5Agent(reactor,
+self.agent = TrueHeadersSOCKS5Agent(reactor,
 proxyEndpoint=TCP4ClientEndpoint(reactor, sockshost,
 socksport))
 else:
-#XXX: pool?
-self.agent = Agent(reactor)
+self.agent = TrueHeadersAgent(reactor)
 
 self.report['agent'] = 'agent'
 
diff --git a/ooni/utils/trueheaders.py b/ooni/utils/trueheaders.py
new file mode 100644
index 000..06e5c02
--- /dev/null
+++ b/ooni/utils/trueheaders.py
@@ -0,0 +1,159 @@
+# :authors: Giovanni Pellerano
+# :licence: see LICENSE
+#
+# Here we make sure that the HTTP Headers sent and received are True. By this
+# we mean that they are not normalized and that the ordering is maintained.
+
+import struct
+import itertools
+from copy import copy
+
+from zope.interface import implements
+from twisted.web import client, _newclient, http_headers
+from twisted.web._newclient import Request, RequestNotSent, 
RequestGenerationFailed, TransportProxyProducer, STATUS
+from twisted.internet import protocol, reactor
+from twisted.internet.protocol import ClientFactory, Protocol
+from twisted.internet.endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint
+from twisted.internet import interfaces, defer
+from twisted.internet.defer import Deferred, succeed, fail, maybeDeferred
+
+from txsocksx.http import SOCKS5Agent
+from txsocksx.client import SOCKS5ClientFactory
+SOCKS5ClientFactory.noisy = False
+
+from ooni.utils import log
+
+class TrueHeaders(http_headers.Headers):
+def __init__(self, rawHeaders=None):
+self._rawHeaders = dict()
+if rawHeaders is not None:
+for name, values in rawHeaders.iteritems():
+if type(values) is list:
+  self.setRawHeaders(name, values[:])
+elif type(values) is dict:
+  self._rawHeaders[name.lower()] = values
+
+def setRawHeaders(self, name, values):
+if name.lower() not in self._rawHeaders:
+  self._rawHeaders[name.lower()] = dict()
+self._rawHeaders[name.lower()]['name'] = name
+self._rawHeaders[name.lower()]['values'] = values
+
+def getDiff(self, headers, ignore=[]):
+
+
+Args:
+
+headers: a TrueHeaders object
+
+ignore: specify a list of header fields to ignore
+
+Returns:
+
+a set containing the header names that are not present in
+header_dict or not present in self.
+
+diff = set()
+field_names = []
+
+headers_a = copy(self)
+headers_b = copy(headers)
+for name in ignore:
+try:
+del headers_a._rawHeaders[name.lower()]
+except KeyError:
+pass
+try:
+del headers_b._rawHeaders[name.lower()]
+except KeyError:
+pass
+
+for k, v in itertools.chain(headers_a.getAllRawHeaders(), \
+headers_b.getAllRawHeaders()):
+field_names.append(k)
+
+for name in field_names:
+if self.getRawHeaders(name) and headers.getRawHeaders(name):
+pass
+else:
+

[tor-commits] [ooni-probe/master] Add support for using txsocksx inside of oonibclient.

2013-11-06 Thread art

commit 4bfe78a135a7393bbbdb004e278de7843f6eb1e4
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Mon Sep 16 12:28:39 2013 +0200

Add support for using txsocksx inside of oonibclient.
---
 ooni/deck.py|1 -
 ooni/oonibclient.py |8 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ooni/deck.py b/ooni/deck.py
index 98d90e0..c6adac6 100644
--- a/ooni/deck.py
+++ b/ooni/deck.py
@@ -3,7 +3,6 @@
 from ooni.nettest import NetTestLoader
 from ooni.settings import config
 from ooni.utils import log
-from ooni.utils.txagentwithsocks import Agent
 from ooni import errors as e
 
 from twisted.internet import reactor, defer
diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index 6be7c44..555d99c 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -4,8 +4,9 @@ import json
 from hashlib import sha256
 
 from twisted.internet import defer, reactor
+from twisted.internet.endpoints import TCP4ClientEndpoint
 
-from ooni.utils.txagentwithsocks import Agent
+from txsocksx.http import SOCKS5Agent
 
 from ooni.deck import Deck, InputFile
 from ooni import errors as e
@@ -46,8 +47,9 @@ class OONIBClient(object):
 
 def __init__(self, address):
 self.address = address
-self.agent = Agent(reactor, sockshost=127.0.0.1, 
-   socksport=config.tor.socks_port)
+self.agent = SOCKS5Agent(reactor,
+proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
+config.tor.socks_port))
 
 def _request(self, method, urn, genReceiver, bodyProducer=None):
 attempts = 0



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add keys for each traceroute type to report

2013-11-06 Thread art

commit 3cd285b20a2044f289be935f00df6e62b2ac5ae7
Author: aagbsn aag...@extc.org
Date:   Fri Oct 18 12:17:38 2013 +

Add keys for each traceroute type to report
---
 ooni/nettests/manipulation/traceroute.py |   22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/ooni/nettests/manipulation/traceroute.py 
b/ooni/nettests/manipulation/traceroute.py
index 42d5f8d..f04360d 100644
--- a/ooni/nettests/manipulation/traceroute.py
+++ b/ooni/nettests/manipulation/traceroute.py
@@ -37,6 +37,9 @@ class TracerouteTest(scapyt.BaseScapyTest):
 return random.randint(1024, 65535)
 
 self.get_sport = get_sport
+self.report['test_tcp_traceroute'] = {}
+self.report['test_udp_traceroute'] = {}
+self.report['test_icmp_traceroute'] = {}
 
 def max_ttl_and_timeout(self):
 max_ttl = int(self.localOptions['maxttl'])
@@ -45,13 +48,6 @@ class TracerouteTest(scapyt.BaseScapyTest):
 self.report['timeout'] = timeout
 return max_ttl, timeout
 
-
-def postProcessor(self, report):
-tcp_hops = report['test_tcp_traceroute']
-udp_hops = report['test_udp_traceroute']
-icmp_hops = report['test_icmp_traceroute']
-
-
 def test_tcp_traceroute(self):
 
 Does a traceroute to the destination by sending TCP SYN packets
@@ -60,7 +56,7 @@ class TracerouteTest(scapyt.BaseScapyTest):
 def finished(packets, port):
 log.debug(Finished running TCP traceroute test on port %s % port)
 answered, unanswered = packets
-self.report['hops_'+str(port)] = []
+self.report['test_tcp_traceroute']['hops_'+str(port)] = []
 for snd, rcv in answered:
 report = {'ttl': snd.ttl,
 'address': rcv.src,
@@ -68,7 +64,7 @@ class TracerouteTest(scapyt.BaseScapyTest):
 'sport': snd[TCP].sport
 }
 log.debug(%s: %s % (port, report))
-self.report['hops_'+str(port)].append(report)
+
self.report['test_tcp_traceroute']['hops_'+str(port)].append(report)
 
 dl = []
 max_ttl, timeout = self.max_ttl_and_timeout()
@@ -90,7 +86,7 @@ class TracerouteTest(scapyt.BaseScapyTest):
 def finished(packets, port):
 log.debug(Finished running UDP traceroute test on port %s % port)
 answered, unanswered = packets
-self.report['hops_'+str(port)] = []
+self.report['test_udp_traceroute']['hops_'+str(port)] = []
 for snd, rcv in answered:
 report = {'ttl': snd.ttl,
 'address': rcv.src,
@@ -98,7 +94,7 @@ class TracerouteTest(scapyt.BaseScapyTest):
 'sport': snd[UDP].sport
 }
 log.debug(%s: %s % (port, report))
-self.report['hops_'+str(port)].append(report)
+
self.report['test_udp_traceroute']['hops_'+str(port)].append(report)
 dl = []
 max_ttl, timeout = self.max_ttl_and_timeout()
 for port in self.dst_ports:
@@ -119,14 +115,14 @@ class TracerouteTest(scapyt.BaseScapyTest):
 def finished(packets):
 log.debug(Finished running ICMP traceroute test)
 answered, unanswered = packets
-self.report['hops'] = []
+self.report['test_icmp_traceroute']['hops'] = []
 for snd, rcv in answered:
 report = {'ttl': snd.ttl,
 'address': rcv.src,
 'rtt': rcv.time - snd.time
 }
 log.debug(%s % (report))
-self.report['hops'].append(report)
+self.report['test_icmp_traceroute']['hops'].append(report)
 dl = []
 max_ttl, timeout = self.max_ttl_and_timeout()
 packets = IP(dst=self.localOptions['backend'],



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Start adding support for using txsocksx inside of oonibclient.

2013-11-06 Thread art

commit 4e9dd2911274054b4fd467bfac53798e8d0e1987
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Mon Sep 16 13:16:12 2013 +0200

Start adding support for using txsocksx inside of oonibclient.

There is some badness happening because we use the httpo (HTTP over Tor 
Hidden
Service) as the scheme name.
---
 .../manipulation/http_header_field_manipulation.py |2 +-
 ooni/oonibclient.py|   10 --
 ooni/reporter.py   |   20 +---
 ooni/templates/httpt.py|2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ooni/nettests/manipulation/http_header_field_manipulation.py 
b/ooni/nettests/manipulation/http_header_field_manipulation.py
index 3423442..6717cc1 100644
--- a/ooni/nettests/manipulation/http_header_field_manipulation.py
+++ b/ooni/nettests/manipulation/http_header_field_manipulation.py
@@ -11,7 +11,7 @@ from twisted.python import usage
 
 from ooni.utils import log, net, randomStr
 from ooni.templates import httpt
-from ooni.utils.txagentwithsocks import TrueHeaders
+from ooni.utils.trueheaders import TrueHeaders
 
 def random_capitalization(string):
 output = 
diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index 555d99c..f05c5e7 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -46,11 +46,16 @@ class OONIBClient(object):
 retries = 3
 
 def __init__(self, address):
-self.address = address
-self.agent = SOCKS5Agent(reactor,
+if address.startswith('httpo://'):
+self.address = address.replace('httpo://', 'http://')
+self.agent = SOCKS5Agent(reactor,
 proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
 config.tor.socks_port))
 
+elif address.startswith('https://'):
+log.err(HTTPS based bouncers are currently not supported.)
+
+
 def _request(self, method, urn, genReceiver, bodyProducer=None):
 attempts = 0
 
@@ -71,6 +76,7 @@ class OONIBClient(object):
 # we have reached the retry count.
 if attempts  self.retries:
 log.err(Lookup failed. Retrying.)
+log.exception(err)
 attempts += 1
 perform_request()
 else:
diff --git a/ooni/reporter.py b/ooni/reporter.py
index b5fcce8..7566ca5 100644
--- a/ooni/reporter.py
+++ b/ooni/reporter.py
@@ -17,6 +17,8 @@ from twisted.trial import reporter
 from twisted.internet import defer, reactor
 from twisted.internet.error import ConnectionRefusedError
 from twisted.python.failure import Failure
+from twisted.internet.endpoints import TCP4ClientEndpoint
+from twisted.web.client import Agent
 
 from ooni.utils import log
 
@@ -35,7 +37,6 @@ from ooni.utils.net import BodyReceiver, StringProducer, 
userAgents
 from ooni.settings import config
 
 from ooni.tasks import ReportEntry, TaskTimedOut, ReportTracker
-
 class ReporterException(Exception):
 pass
 
@@ -289,13 +290,18 @@ class OONIBReporter(OReporter):
 # do this with some deferred kung foo or instantiate the reporter after
 # tor is started.
 
-from ooni.utils.txagentwithsocks import Agent
+from ooni.utils.trueheaders import SOCKS5Agent
 from twisted.internet import reactor
-try:
-self.agent = Agent(reactor, sockshost=127.0.0.1,
-socksport=int(config.tor.socks_port))
-except Exception, e:
-log.exception(e)
+
+if self.collectorAddress.startswith('httpo://'):
+self.collectorAddress.replace('httpo://', 'http://')
+self.agent = SOCKS5Agent(reactor,
+proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
+config.tor.socks_port))
+
+elif self.collectorAddress.startswith('https://'):
+# XXX add support for securely reporting to HTTPS collectors.
+log.err(HTTPS based collectors are currently not supported.)
 
 url = self.collectorAddress + '/report'
 
diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py
index 9a44c18..b6272e9 100644
--- a/ooni/templates/httpt.py
+++ b/ooni/templates/httpt.py
@@ -19,7 +19,7 @@ from ooni.settings import config
 
 from ooni.utils.net import BodyReceiver, StringProducer, userAgents
 
-from ooni.utils.txagentwithsocks import TrueHeaders
+from ooni.utils.trueheaders import TrueHeaders
 from ooni.errors import handleAllFailures
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Decode correct protocol

2013-11-06 Thread art

commit 7df1f620074ed933b46c9361d7969d65184b81a5
Author: aagbsn aag...@extc.org
Date:   Wed Oct 16 16:52:25 2013 +

Decode correct protocol

No wonder it didn't work.
---
 ooni/nettests/manipulation/traceroute.py |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ooni/nettests/manipulation/traceroute.py 
b/ooni/nettests/manipulation/traceroute.py
index 2db1826..42d5f8d 100644
--- a/ooni/nettests/manipulation/traceroute.py
+++ b/ooni/nettests/manipulation/traceroute.py
@@ -62,16 +62,10 @@ class TracerouteTest(scapyt.BaseScapyTest):
 answered, unanswered = packets
 self.report['hops_'+str(port)] = []
 for snd, rcv in answered:
-try:
-sport = snd[UDP].sport
-except IndexError:
-log.err(Source port for this traceroute was not found. 
This is probably a bug)
-sport = -1
-
 report = {'ttl': snd.ttl,
 'address': rcv.src,
 'rtt': rcv.time - snd.time,
-'sport': sport
+'sport': snd[TCP].sport
 }
 log.debug(%s: %s % (port, report))
 self.report['hops_'+str(port)].append(report)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Fix bug in exception printing.

2013-11-06 Thread art

commit 7dcd509e3e81789362bd07e878aac2d04b26509b
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Mon Nov 4 10:01:57 2013 +0100

Fix bug in exception printing.
---
 ooni/oonibclient.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index 1b11347..4853047 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -219,8 +219,8 @@ class OONIBClient(object):
 
 test_helper = yield self.queryBackend('POST', '/bouncer', 
 query={'test-helpers': test_helper_names})
-except Exception, e:
-log.exception(e)
+except Exception, exc:
+log.exception(exc)
 raise e.CouldNotFindTestHelper
 
 if not test_helper:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Fix unittest for true headers..

2013-11-06 Thread art

commit d7ebf5c6db9b73133915aabb3dbd9c5b283f9982
Author: Arturo FilastÃ² a...@fuffa.org
Date:   Mon Sep 16 12:26:26 2013 +0200

Fix unittest for true headers..
---
 ooni/tests/test_trueheaders.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ooni/tests/test_trueheaders.py b/ooni/tests/test_trueheaders.py
index 9ac0a27..70f8a5d 100644
--- a/ooni/tests/test_trueheaders.py
+++ b/ooni/tests/test_trueheaders.py
@@ -1,6 +1,6 @@
 from twisted.trial import unittest
 
-from ooni.utils.txagentwithsocks import TrueHeaders
+from ooni.utils.trueheaders import TrueHeaders
 
 dummy_headers_dict = {
 'Header1': ['Value1', 'Value2'],



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Use our TrueHeaders version of the SOCKS5Agent in oonibclient

2013-11-06 Thread art

commit d9a1be184d80899cd981103f653ec2802c88a364
Author: aagbsn aag...@extc.org
Date:   Thu Oct 10 14:07:22 2013 +

Use our TrueHeaders version of the SOCKS5Agent in oonibclient
---
 ooni/oonibclient.py |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index f05c5e7..889dcd9 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -6,13 +6,12 @@ from hashlib import sha256
 from twisted.internet import defer, reactor
 from twisted.internet.endpoints import TCP4ClientEndpoint
 
-from txsocksx.http import SOCKS5Agent
-
 from ooni.deck import Deck, InputFile
 from ooni import errors as e
 from ooni.settings import config
 from ooni.utils import log
 from ooni.utils.net import BodyReceiver, StringProducer, Downloader
+from ooni.utils.trueheaders import TrueHeadersSOCKS5Agent
 
 class Collector(object):
 def __init__(self, address):
@@ -48,7 +47,7 @@ class OONIBClient(object):
 def __init__(self, address):
 if address.startswith('httpo://'):
 self.address = address.replace('httpo://', 'http://')
-self.agent = SOCKS5Agent(reactor,
+self.agent = TrueHeadersSOCKS5Agent(reactor,
 proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
 config.tor.socks_port))
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] str().replace() returns a copy and does not modify in place.

2013-11-06 Thread art

commit 08d1c15424b9c85beadd00a562b25289cd4ff997
Author: aagbsn aag...@extc.org
Date:   Thu Oct 10 14:07:59 2013 +

str().replace() returns a copy and does not modify in place.
---
 ooni/reporter.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ooni/reporter.py b/ooni/reporter.py
index 7566ca5..f4521b6 100644
--- a/ooni/reporter.py
+++ b/ooni/reporter.py
@@ -290,11 +290,12 @@ class OONIBReporter(OReporter):
 # do this with some deferred kung foo or instantiate the reporter after
 # tor is started.
 
-from ooni.utils.trueheaders import SOCKS5Agent
+from txsocksx.http import SOCKS5Agent
 from twisted.internet import reactor
 
 if self.collectorAddress.startswith('httpo://'):
-self.collectorAddress.replace('httpo://', 'http://')
+self.collectorAddress = \
+self.collectorAddress.replace('httpo://', 'http://')
 self.agent = SOCKS5Agent(reactor,
 proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1',
 config.tor.socks_port))



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #230 from TheTorProject/fix/traceroute_decodes_wrong_protocol

2013-11-06 Thread art

commit bbd2e3143e8a45b3c3bbc2ba7013532b8945ee27
Merge: 221372e 3cd285b
Author: Arturo FilastÃ² hell...@users.noreply.github.com
Date:   Wed Nov 6 00:59:23 2013 -0800

Merge pull request #230 from 
TheTorProject/fix/traceroute_decodes_wrong_protocol

Decode correct protocol

 ooni/nettests/manipulation/traceroute.py |   30 ++
 1 file changed, 10 insertions(+), 20 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #208 from TheTorProject/feature/use_txsocksx

2013-11-06 Thread art

commit 221372e3ebdc1d29c55620e6045e90d05423b71b
Merge: a56c2ff 08d1c15
Author: aagbsn aag...@extc.org
Date:   Mon Nov 4 14:02:58 2013 -0800

Merge pull request #208 from TheTorProject/feature/use_txsocksx

Feature/use txsocksx

 .../manipulation/http_header_field_manipulation.py |2 +-
 ooni/oonibclient.py|   17 +-
 ooni/reporter.py   |   21 +-
 ooni/templates/httpt.py|   20 +-
 ooni/tests/test_trueheaders.py |2 +-
 ooni/utils/trueheaders.py  |  159 +++
 ooni/utils/txagentwithsocks.py |  215 
 7 files changed, 199 insertions(+), 237 deletions(-)

diff --cc ooni/oonibclient.py
index 4853047,889dcd9..5735155
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@@ -69,8 -75,9 +75,9 @@@ class OONIBClient(object)
  # we have reached the retry count.
  if attempts  self.retries:
  log.err(Lookup failed. Retrying.)
+ log.exception(err)
  attempts += 1
 -perform_request()
 +perform_request(attempts)
  else:
  log.err(Failed. Giving up.)
  finished.errback(err)
diff --cc ooni/reporter.py
index 72c6975,f4521b6..d90c259
--- a/ooni/reporter.py
+++ b/ooni/reporter.py
@@@ -17,9 -17,11 +17,11 @@@ from twisted.trial import reporte
  from twisted.internet import defer, reactor
  from twisted.internet.error import ConnectionRefusedError
  from twisted.python.failure import Failure
+ from twisted.internet.endpoints import TCP4ClientEndpoint
+ from twisted.web.client import Agent
  
  from ooni.utils import log
 -
 +from ooni.tasks import Measurement
  try:
  from scapy.packet import Packet
  except ImportError:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2013-11-06 Thread translation

commit 6d85fff383971fe421f00847f15abf1c03c73cdc
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:19:53 2013 +

Update translations for tails-misc_completed
---
 da.po |   22 +++---
 tails.pot |   22 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/da.po b/da.po
index a08b17c..5bde886 100644
--- a/da.po
+++ b/da.po
@@ -8,9 +8,9 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 12:35+0200\n
-PO-Revision-Date: 2013-10-03 09:20+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-26 23:41+0200\n
+PO-Revision-Date: 2013-11-06 09:10+\n
 Last-Translator: andersd ande...@riseup.net\n
 Language-Team: Danish 
(http://www.transifex.com/projects/p/torproject/language/da/)\n
 MIME-Version: 1.0\n
@@ -226,21 +226,21 @@ msgstr Information om denne udgave:\n%s
 msgid About Tails
 msgstr Om Tails
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
 msgid Your additional software
 msgstr Dine yderligere programmer
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr Opgraderingen fejlede. Dette kan skyldes et netvÃ¦rksproblem. 
Kontroller venligst din netvÃ¦rksforbindelse, prÃ¸v at genstarte Tails, eller 
lÃ¦s systemets log for bedre at forstÃ¥ problemet.
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
 msgid The upgrade was successful.
 msgstr Opgraderingen lykkedes.
 
@@ -405,9 +405,9 @@ msgid 
 concerns.
 msgstr TrueCrypt fjernes snart fra Tails pÃ¥ grund af bekymringer over licens 
og udvikling.
 
-#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1
-msgid Report a Bug
-msgstr Rapporter en fejl
+#: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid Report an error
+msgstr RapportÃ©r en fejl
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation
diff --git a/tails.pot b/tails.pot
index 9c0caff..d89de2b 100644
--- a/tails.pot
+++ b/tails.pot
@@ -6,9 +6,9 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 12:35+0200\n
-PO-Revision-Date: 2013-09-17 08:20+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-26 23:41+0200\n
+PO-Revision-Date: 2013-11-06 09:01+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: LANGUAGE l...@li.org\n
 MIME-Version: 1.0\n
@@ -224,21 +224,21 @@ msgstr Build information:\n%s
 msgid About Tails
 msgstr About Tails
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
 msgid Your additional software
 msgstr Your additional software
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr The upgrade failed. This might be due to a network problem. Please 
check your network connection, try to restart Tails, or read the system log to 
understand better the problem.
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
 msgid The upgrade was successful.
 msgstr The upgrade was successful.
 
@@ -403,9 +403,9 @@ msgid 
 concerns.
 msgstr TrueCrypt will soon be

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2013-11-06 Thread translation

commit eb2f2926640e22b9111a8431418c7420ad5d06dc
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:47:48 2013 +

Update translations for liveusb-creator_completed
---
 templates/liveusb-creator.pot |  239 ++---
 1 file changed, 127 insertions(+), 112 deletions(-)

diff --git a/templates/liveusb-creator.pot b/templates/liveusb-creator.pot
index 851462f..cf50de1 100644
--- a/templates/liveusb-creator.pot
+++ b/templates/liveusb-creator.pot
@@ -6,9 +6,9 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 11:21+0200\n
-PO-Revision-Date: 2013-09-09 09:44+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-17 13:19+0200\n
+PO-Revision-Date: 2013-11-06 09:28+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: LANGUAGE l...@li.org\n
 MIME-Version: 1.0\n
@@ -17,66 +17,71 @@ msgstr 
 Language: en\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149
+#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
-msgid %(distribution)s LiveUSB Creator
-msgstr %(distribution)s LiveUSB Creator
+msgid %(distribution)s installer
+msgstr %(distribution)s installer
 
-#: ../liveusb/gui.py:776
+#: ../liveusb/gui.py:803
 #, python-format
 msgid %(filename)s selected
 msgstr %(filename)s selected
 
-#: ../liveusb/creator.py:1004
+#: ../liveusb/gui.py:440
+#, python-format
+msgid %(vendor)s %(model)s (%(details)s) - %(device)s
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
+
+#: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
 msgstr %s already bootable
 
-#: ../liveusb/launcher_ui.py:156
+#: ../liveusb/launcher_ui.py:165
 msgid 
 !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\n
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
+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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
-#: ../liveusb/launcher_ui.py:151
+#: ../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
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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. All data on the 
target drive will be

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2013-11-06 Thread translation

commit 8e793a60bd93395ada00cb0f16d545ce8815c38a
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:49:54 2013 +

Update translations for tails-misc
---
 he.po |   24 
 ja.po |6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/he.po b/he.po
index fb930b6..9800f79 100644
--- a/he.po
+++ b/he.po
@@ -9,8 +9,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 09:40+\n
+Last-Translator: GenghisKhan genghisk...@gmx.ca\n
 Language-Team: Hebrew 
(http://www.transifex.com/projects/p/torproject/language/he/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -72,19 +72,19 @@ msgstr 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:296
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:298
 msgid Unknown Trust
-msgstr 
+msgstr ×××× ×× ××××¢
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:300
 msgid Marginal Trust
-msgstr 
+msgstr ×××× ××¢××
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:302
 msgid Full Trust
-msgstr 
+msgstr ×××× ×××
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:304
 msgid Ultimate Trust
-msgstr 
+msgstr ×××× ×××××
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:357
 msgid Name
@@ -187,15 +187,15 @@ msgstr ×¤×× ×©× GnuPG:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:844
 msgid Other messages provided by GnuPG:
-msgstr 
+msgstr ××××¢××ª ×××¨××ª ××©×¨ ××¡××¤×§××ª ×¢× ××× GnuPG:
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
 msgid Shutdown Immediately
-msgstr 
+msgstr ××× ××××ª×¨
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:35
 msgid Reboot Immediately
-msgstr 
+msgstr ××ª×× ××××ª×¨
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72
 msgid Shutdown Helper
@@ -357,7 +357,7 @@ msgstr ××ª××× ××¢×ª ××ª ×××¤××¤× ××× 
××××...
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94
 msgid This may take a while, so please be patient.
-msgstr 
+msgstr ×× ×¢×©×× ××§××ª ××× ××, ×× ×× × ×××¢××¨ ××¡××× 
××ª.
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112
 msgid Failed to setup chroot.
@@ -406,7 +406,7 @@ msgstr 
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid Report an error
-msgstr 
+msgstr ×××× ×¢× ×©××××
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation
@@ -442,7 +442,7 @@ msgstr 
 
 #: 
../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
 msgid Browse the World Wide Web without anonymity
-msgstr 
+msgstr ××¤××£ ××¨×©×ª ××××× ×¢×××××ª ××× ×× ×× ×××××ª
 
 #: 
../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3
 msgid Unsafe Web Browser
diff --git a/ja.po b/ja.po
index 5207b49..aff3cba 100644
--- a/ja.po
+++ b/ja.po
@@ -10,8 +10,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 09:30+\n
+Last-Translator: Masaki Saito rezoo...@gmail.com\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -404,7 +404,7 @@ msgstr 
TrueCryptã¯ãã©ã¤ã»ã³ã¹ã¨éçºä¸ã®æ¸å¿µã®ããã«ãã¾ã
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid Report an error
-msgstr 
+msgstr ã¨ã©ã¼ãå ±å
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed

2013-11-06 Thread translation

commit 1a062f1ce29d21bec93fdac4c5b73ca878370f1d
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:49:43 2013 +

Update translations for torbirdy_completed
---
 he/torbirdy.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd
index be5d9c9..04098dc 100644
--- a/he/torbirdy.dtd
+++ b/he/torbirdy.dtd
@@ -12,10 +12,10 @@
 !ENTITY torbirdy.prefs.save.button ×©×××¨
 !ENTITY torbirdy.prefs.save.key s
 !ENTITY torbirdy.prefs.cancel.button ×××××
-!ENTITY torbirdy.prefs.extra1.button ×××¨× ×××¨××¨×ª ××××
-!ENTITY torbirdy.prefs.extra1.key d
-!ENTITY torbirdy.prefs.extra2.button ××× ××××¨××ª Proxy
-!ENTITY torbirdy.prefs.extra2.key g
+!ENTITY torbirdy.prefs.extra2.button ×©×××¨ ××¨××¨××ª ××××
+!ENTITY torbirdy.prefs.extra2.key d
+!ENTITY torbirdy.prefs.testproxy.button ××× ××××¨××ª Proxy
+!ENTITY torbirdy.prefs.testproxy.key n
 !ENTITY torbirdy.prefs.proxy.label ×¤×¨××§×¡×
 !ENTITY torbirdy.prefs.privacy.label ×¤×¨××××ª
 !ENTITY torbirdy.prefs.enigmail.label Enigmail
@@ -30,22 +30,22 @@
 !ENTITY torbirdy.prefs.socks_host.key h
 !ENTITY torbirdy.prefs.socks_port.label ×¤××¨×:
 !ENTITY torbirdy.prefs.socks_port.key p
-!ENTITY torbirdy.prefs.torification.label ×©×§××£ Torification (××××¨×: 
× ××¨×© transproxy ×××ª×× ×× × ×ª× Tor)
+!ENTITY torbirdy.prefs.torification.label âTorification ×©×§××£ 
(××××¨×: × ××¨×© transproxy ×××ª×× ×× × ×ª× Tor)
 !ENTITY torbirdy.prefs.torification.key t
 !ENTITY torbirdy.prefs.global ×××××××
-!ENTITY torbirdy.prefs.imap.label ××¤×©×¨ ×ª×××× ×××××¤×ª ××××¨ 
×¢× ××× ××©×¨×ª ×××©××× ××ª ××¡×× IMAP [××¨××¨×ª ××××: ×× 
×××¨×]
+!ENTITY torbirdy.prefs.imap.label ××¤×©×¨ ×ª××××ª ××××¤×ª ××××´× 
×¢×××¨ ××©××× ××ª IMAP [××¨××¨×ª ××××: ×× ×××¨×]
 !ENTITY torbirdy.prefs.imap.key p
-!ENTITY torbirdy.prefs.startup_folder.label ××¢×ª ××¤×¢××, ×××¨ 
××ª××§×××ª ×××××¨ ×©× ×¤×ª×× ×××¨×× × [××¨××¨×ª ××××: ×× 
×××¨×]
+!ENTITY torbirdy.prefs.startup_folder.label ×××¨ ××ª ×ª××§×××ª 
×××××¨ ××××¨×× × ××©×¨ × ×××¨× [××¨××¨×ª ××××: ×× 
×××¨×]
 !ENTITY torbirdy.prefs.startup_folder.key l
 !ENTITY torbirdy.prefs.timezone.label ×× ×ª×§××¢ ××ª ×××××¨ ×××× 
×©× Thunderbird ×UTC [××¨××¨×ª ××××: ×§××¢ ×UTC]
 !ENTITY torbirdy.prefs.timezone.key z
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.label ×× ×ª×©×× ××ª ×××× 
××¤×ª× ×××§×× ××ª×× ××××¢××ª ×××¦×¤× ××ª [××¨××¨×ª ××××: 
××©×]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
-!ENTITY torbirdy.prefs.confirmemail.label ×××× ××¤× × ×©×××× 
×××©×¨ ×× ×××××× ×××¤×¢× [××¨××¨×ª ××××: ×× ×ª××××]
+!ENTITY torbirdy.prefs.confirmemail.label ×××× ××¤× × ×©××××ª 
××××´× ×××©×¨ Enigmail ×××¤×¢× [××¨××¨×ª ××××: ×× ×ª××××]
 !ENTITY torbirdy.prefs.confirmemail.key c
-!ENTITY torbirdy.prefs.emailwizard.label ××¤×¢× ××ª ××©×£ ××××¨××ª 
×××××¨ ×©× ×ª'×× ××¨×××¨× [××¨××¨×ª ××××: ××××]
+!ENTITY torbirdy.prefs.emailwizard.label ××¤×¢× ××ª ××©×£ ××××¨××ª 
×××××´× ×©× Thunderbird [××¨××¨×ª ××××: ×× ×××¨×]
 !ENTITY torbirdy.prefs.emailwizard.key w
-!ENTITY torbirdy.prefs.automatic.label ××××§ ×¢×××¨ ××××¢××ª 
×××©××ª ××××××××ª ×¢×××¨ ×× ×××©××× ××ª [××¨××¨×ª 
××××: ×× ×××¨××ª]
+!ENTITY torbirdy.prefs.automatic.label ××××§ ×¢×××¨ ××××¢××ª 
×××©××ª ××××××××ª ×¢×××¨ ×× ×××©××× ××ª [××¨××¨×ª 
××××: ×× ×××¨×]
 !ENTITY torbirdy.prefs.automatic.key f
 !ENTITY torbirdy.prefs.renegotiation.label ××¨×©× ×××××¨××ª 
××©×¨×ª×× ×©××× × ×ª××××× ×SSL/TLS ×¢× ×××××© ××©× ×××ª× 
×××××× [××¨××¨×ª ××××: ×× ×××¨×©××ª]
 !ENTITY torbirdy.prefs.renegotiation.key r

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2013-11-06 Thread translation

commit 910fff837dfdd49911008166ae6708e420bf0b2f
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:49:36 2013 +

Update translations for tails-persistence-setup_completed
---
 ja/ja.po  |   56 +++--
 templates/tails-persistence-setup.pot |   54 +--
 2 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 285dbec..9245c65 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # plazmism gomid...@live.jp, 2013
-# msaito rezoo...@gmail.com, 2013
+# Masaki Saito rezoo...@gmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2013-09-29 14:53+0200\n
-PO-Revision-Date: 2013-11-04 14:20+\n
-Last-Translator: msaito rezoo...@gmail.com\n
+POT-Creation-Date: 2013-10-26 23:24+0200\n
+PO-Revision-Date: 2013-11-06 09:40+\n
+Last-Translator: Masaki Saito rezoo...@gmail.com\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -116,77 +116,77 @@ msgid 
 Symlink into $HOME every file or directory found in the `dotfiles' directory
 msgstr 
`ããããã¡ã¤ã«'ãã£ã¬ã¯ããªã§è¦ã¤ãã£ã$HOMEã®åãã¡ã¤ã«ããã£ã¬ã¯ããªã¸ã®ã·ã³ããªãã¯ãªã³ã¯
 
-#: ../lib/Tails/Persistence/Setup.pm:257
+#: ../lib/Tails/Persistence/Setup.pm:258
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
 msgstr 
Tailsãåä½ãã¦ããããã¤ã¹ãçºè¦åºæ¥ã¾ããã§ãããããããã¦`toram'
 ãªãã·ã§ã³ãä½¿ã£ã¦ã¯ãã¾ãããï¼
 
-#: ../lib/Tails/Persistence/Setup.pm:276
+#: ../lib/Tails/Persistence/Setup.pm:277
 msgid Setup Tails persistent volume
 msgstr Talisã®æ°¸ç¶çããªã¥ã¼ã ãã»ããã¢ãã
 
-#: ../lib/Tails/Persistence/Setup.pm:420
+#: ../lib/Tails/Persistence/Setup.pm:443
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr ããã¤ã¹ %s ã«ã¯ãã§ã«æ°¸ç¶çããªã¥ã¼ã 
ãããã¾ãã
 
-#: ../lib/Tails/Persistence/Setup.pm:428
+#: ../lib/Tails/Persistence/Setup.pm:451
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr ããã¤ã¹ %s ã«ã¯ååãªæªå²ãå½ã¦é 
åãããã¾ããã
 
-#: ../lib/Tails/Persistence/Setup.pm:436 ../lib/Tails/Persistence/Setup.pm:450
+#: ../lib/Tails/Persistence/Setup.pm:459 ../lib/Tails/Persistence/Setup.pm:473
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr ããã¤ã¹ %s ã«ã¯æ°¸ç¶çããªã¥ã¼ã ãããã¾ããã
 
-#: ../lib/Tails/Persistence/Setup.pm:442
+#: ../lib/Tails/Persistence/Setup.pm:465
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr ä½¿ç¨ä¸ã®éã¯æ°¸ç¶çããªã¥ã¼ã 
ãåé¤åºæ¥ã¾ãããæ°¸ç¶ããªãã«ãã¦Tailsãåèµ·åãã¹ãã§ãã
 
-#: ../lib/Tails/Persistence/Setup.pm:461
+#: ../lib/Tails/Persistence/Setup.pm:484
 msgid Persistence volume is not unlocked.
 msgstr æ°¸ç¶çããªã¥ã¼ã ãã¢ã³ããã¯ããã¦ãã¾ããã
 
-#: ../lib/Tails/Persistence/Setup.pm:466
+#: ../lib/Tails/Persistence/Setup.pm:489
 msgid Persistence volume is not mounted.
 msgstr æ°¸ç¶çããªã¥ã¼ã ããã¦ã³ãããã¦ãã¾ããã
 
-#: ../lib/Tails/Persistence/Setup.pm:471
+#: ../lib/Tails/Persistence/Setup.pm:494
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr æ°¸ç¶çããªã¥ã¼ã 
ãèªã¿è¾¼ã¿å¯è½ã§ã¯ããã¾ããããã¼ããã·ã§ã³ãæææ¨©ã«åé¡ãããããããã¾ããã
 
-#: ../lib/Tails/Persistence/Setup.pm:476
+#: ../lib/Tails/Persistence/Setup.pm:499
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr æ°¸ç¶çããªã¥ã¼ã 
ãæ¸ãè¾¼ã¿å¯è½ã§ã¯ããã¾ããããªã¼ããªã³ãªã¼ã§ãã¦ã³ããããå¯è½æ§ãããã¾ãã
 
-#: ../lib/Tails/Persistence/Setup.pm:485
+#: ../lib/Tails/Persistence/Setup.pm:508
 #, perl-format
-msgid Tails is running from non-USB device %s.
-msgstr Tailsã¯éUSBæ©å¨ %sããèµ·åãã¦ãã¾ãã
+msgid Tails is running from non-USB / non-SDIO device %s.
+msgstr Tailsã¯ç¾å¨ãUSBã¾ãã¯SDIOã§ãªãããã¤ã¹ %s 
ããåä½ãã¦ãã¾ãã
 
-#: ../lib/Tails/Persistence/Setup.pm:491
+#: ../lib/Tails/Persistence/Setup.pm:514
 #, perl-format
 msgid Device %s is optical.
 msgstr ããã¤ã¹ %sã¯åå¦æ©å¨ã§ãã
 
-#: ../lib/Tails/Persistence/Setup.pm:498
+#: ../lib/Tails/Persistence/Setup.pm:521
 #, perl-format
 msgid Device %s was not created using Tails USB installer.
 msgstr ããã¤ã¹ %sã¯Tails USB 
installerãç¨ãã¦ä½æããã¾ããã§ããã
 
-#: ../lib/Tails/Persistence/Setup.pm:532
+#:

[tor-commits] [translation/torbirdy] Update translations for torbirdy

2013-11-06 Thread translation

commit dc3b0101896c1a32c9c767c51ed85e5aaa76d9d3
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:49:40 2013 +

Update translations for torbirdy
---
 he/torbirdy.dtd |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd
index f51c498..04098dc 100644
--- a/he/torbirdy.dtd
+++ b/he/torbirdy.dtd
@@ -12,10 +12,10 @@
 !ENTITY torbirdy.prefs.save.button ×©×××¨
 !ENTITY torbirdy.prefs.save.key s
 !ENTITY torbirdy.prefs.cancel.button ×××××
-!ENTITY torbirdy.prefs.extra2.button ×××¨× ×××¨××¨×ª ××××
+!ENTITY torbirdy.prefs.extra2.button ×©×××¨ ××¨××¨××ª ××××
 !ENTITY torbirdy.prefs.extra2.key d
 !ENTITY torbirdy.prefs.testproxy.button ××× ××××¨××ª Proxy
-!ENTITY torbirdy.prefs.testproxy.key 
+!ENTITY torbirdy.prefs.testproxy.key n
 !ENTITY torbirdy.prefs.proxy.label ×¤×¨××§×¡×
 !ENTITY torbirdy.prefs.privacy.label ×¤×¨××××ª
 !ENTITY torbirdy.prefs.enigmail.label Enigmail
@@ -30,22 +30,22 @@
 !ENTITY torbirdy.prefs.socks_host.key h
 !ENTITY torbirdy.prefs.socks_port.label ×¤××¨×:
 !ENTITY torbirdy.prefs.socks_port.key p
-!ENTITY torbirdy.prefs.torification.label ×©×§××£ Torification (××××¨×: 
× ××¨×© transproxy ×××ª×× ×× × ×ª× Tor)
+!ENTITY torbirdy.prefs.torification.label âTorification ×©×§××£ 
(××××¨×: × ××¨×© transproxy ×××ª×× ×× × ×ª× Tor)
 !ENTITY torbirdy.prefs.torification.key t
 !ENTITY torbirdy.prefs.global ×××××××
-!ENTITY torbirdy.prefs.imap.label ××¤×©×¨ ×ª×××× ×××××¤×ª ××××¨ 
×¢× ××× ××©×¨×ª ×××©××× ××ª ××¡×× IMAP [××¨××¨×ª ××××: ×× 
×××¨×]
+!ENTITY torbirdy.prefs.imap.label ××¤×©×¨ ×ª××××ª ××××¤×ª ××××´× 
×¢×××¨ ××©××× ××ª IMAP [××¨××¨×ª ××××: ×× ×××¨×]
 !ENTITY torbirdy.prefs.imap.key p
-!ENTITY torbirdy.prefs.startup_folder.label 
+!ENTITY torbirdy.prefs.startup_folder.label ×××¨ ××ª ×ª××§×××ª 
×××××¨ ××××¨×× × ××©×¨ × ×××¨× [××¨××¨×ª ××××: ×× 
×××¨×]
 !ENTITY torbirdy.prefs.startup_folder.key l
 !ENTITY torbirdy.prefs.timezone.label ×× ×ª×§××¢ ××ª ×××××¨ ×××× 
×©× Thunderbird ×UTC [××¨××¨×ª ××××: ×§××¢ ×UTC]
 !ENTITY torbirdy.prefs.timezone.key z
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.label ×× ×ª×©×× ××ª ×××× 
××¤×ª× ×××§×× ××ª×× ××××¢××ª ×××¦×¤× ××ª [××¨××¨×ª ××××: 
××©×]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
-!ENTITY torbirdy.prefs.confirmemail.label ×××× ××¤× × ×©×××× 
×××©×¨ ×× ×××××× ×××¤×¢× [××¨××¨×ª ××××: ×× ×ª××××]
+!ENTITY torbirdy.prefs.confirmemail.label ×××× ××¤× × ×©××××ª 
××××´× ×××©×¨ Enigmail ×××¤×¢× [××¨××¨×ª ××××: ×× ×ª××××]
 !ENTITY torbirdy.prefs.confirmemail.key c
-!ENTITY torbirdy.prefs.emailwizard.label ××¤×¢× ××ª ××©×£ ××××¨××ª 
×××××¨ ×©× ×ª'×× ××¨×××¨× [××¨××¨×ª ××××: ××××]
+!ENTITY torbirdy.prefs.emailwizard.label ××¤×¢× ××ª ××©×£ ××××¨××ª 
×××××´× ×©× Thunderbird [××¨××¨×ª ××××: ×× ×××¨×]
 !ENTITY torbirdy.prefs.emailwizard.key w
-!ENTITY torbirdy.prefs.automatic.label ××××§ ×¢×××¨ ××××¢××ª 
×××©××ª ××××××××ª ×¢×××¨ ×× ×××©××× ××ª [××¨××¨×ª 
××××: ×× ×××¨××ª]
+!ENTITY torbirdy.prefs.automatic.label ××××§ ×¢×××¨ ××××¢××ª 
×××©××ª ××××××××ª ×¢×××¨ ×× ×××©××× ××ª [××¨××¨×ª 
××××: ×× ×××¨×]
 !ENTITY torbirdy.prefs.automatic.key f
 !ENTITY torbirdy.prefs.renegotiation.label ××¨×©× ×××××¨××ª 
××©×¨×ª×× ×©××× × ×ª××××× ×SSL/TLS ×¢× ×××××© ××©× ×××ª× 
×××××× [××¨××¨×ª ××××: ×× ×××¨×©××ª]
 !ENTITY torbirdy.prefs.renegotiation.key r

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2013-11-06 Thread translation

commit 3510a9aa4944de59a94dd853cecdd46abe235323
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:49:56 2013 +

Update translations for tails-misc_completed
---
 ja.po |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ja.po b/ja.po
index bd72d07..aff3cba 100644
--- a/ja.po
+++ b/ja.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # plazmism gomid...@live.jp, 2013
-# msaito rezoo...@gmail.com, 2013
+# Masaki Saito rezoo...@gmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-09-09 12:35+0200\n
-PO-Revision-Date: 2013-11-04 14:20+\n
-Last-Translator: msaito rezoo...@gmail.com\n
+POT-Creation-Date: 2013-10-26 23:41+0200\n
+PO-Revision-Date: 2013-11-06 09:30+\n
+Last-Translator: Masaki Saito rezoo...@gmail.com\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -223,21 +223,21 @@ msgstr ãã«ãæå ±:\n%s
 msgid About Tails
 msgstr Tailsã«ã¤ãã¦
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
 msgid Your additional software
 msgstr è¿½å ã½ããã¦ã§ã¢
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr 
ã¢ããã°ã¬ã¼ãã«å¤±æãã¾ãããããã¯ãããããããã¯ã¼ã¯ä¸ã®åé¡ã«ãããã®ã§ãããããã¯ã¼ã¯ã®è¨å®ãç¢ºèªããå¾ã«Tailsãåèµ·åããããã·ã¹ãã
 ãã°ãåç§ãã¦ãã ããã
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
 msgid The upgrade was successful.
 msgstr ã¢ããã°ã¬ã¼ãæåã
 
@@ -402,9 +402,9 @@ msgid 
 concerns.
 msgstr 
TrueCryptã¯ãã©ã¤ã»ã³ã¹ã¨éçºä¸ã®æ¸å¿µã®ããã«ãã¾ããªãTailsããåãé¤ããã¾ãã
 
-#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1
-msgid Report a Bug
-msgstr ãã°ãå ±åãã
+#: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid Report an error
+msgstr ã¨ã©ã¼ãå ±å
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2013-11-06 Thread translation

commit 38156928159a051dac05dda8b780bc48bdf9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:50:00 2013 +

Update translations for abouttor-homepage_completed
---
 ja/aboutTor.dtd |   73 +++
 1 file changed, 73 insertions(+)

diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
new file mode 100644
index 000..1f96caf
--- /dev/null
+++ b/ja/aboutTor.dtd
@@ -0,0 +1,73 @@
+!--
+   - Copyright (c) 2013, The Tor Project, Inc.
+   - See LICENSE for licensing information.
+   - vim: set sw=2 sts=2 ts=8 et syntax=xml:
+  --
+
+!ENTITY aboutTor.title Torã«ã¤ãã¦
+
+!ENTITY aboutTor.outOfDateTorOn.label 
ãããããã®ãã©ã¦ã¶ã¯å¤ããã¼ã¸ã§ã³ã§ãã
+!ENTITY aboutTor.outOfDateTorOff.label 
ã¾ãããã®ãã©ã¦ã¶ã¯å¤ããã¼ã¸ã§ã³ã§ãã
+!ENTITY aboutTor.outOfDate2.label ãªããªã³ãã¯ãªãã¯ãã¦ãTor 
Browser Bundleã®ã¢ãããã¼ãããã¦ã³ãã¼ããé¸æ
+
+!ENTITY aboutTor.check.label 
Torã®ãããã¯ã¼ã¯è¨å®ããã¹ããã
+
+!ENTITY aboutTor.success.label ããã§ã¨ããããã¾ã!
+!ENTITY aboutTor.success2.label 
ãã®ãã©ã¦ã¶ã¯Torãä½¿ç¨ããããã«è¨å®ããã¦ãã¾ãã
+!ENTITY aboutTor.success3.label 
ç¾å¨èªç±ã«å¿åã§ã¤ã³ã¿ã¼ãããããã©ã¦ãºåºæ¥ã¾ãã
+!ENTITY aboutTor.failure.label ä½ããããããã§ã!
+!ENTITY aboutTor.failure2.label 
Torã¯ãã®ãã©ã¦ã¶ã§ã¯åä½ãã¾ããã
+!ENTITY aboutTor.failure3prefix.label 
ãµãã¼ãã«ã¤ãã¦ã¯ããåãåãããã ããã
+!ENTITY aboutTor.failure3Link h...@rt.torproject.org
+!ENTITY aboutTor.failure3suffix.label .
+
+!ENTITY aboutTor.search.label æ¤ç´¢
+
+!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -Search securely with Startpage.
+   - or:
+   -Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for securely and
+   - the search engine (Startpage or DuckDuckGo).
+  --
+!ENTITY aboutTor.searchSPPost.link https://startpage.com/rth/search;
+!ENTITY aboutTor.searchDDGPost.link https://duckduckgo.com/html/;
+!ENTITY aboutTor.searchSP.privacy.beforeLink.label æ¤ç´¢
+!ENTITY aboutTor.searchDDG.privacy.beforeLink.label æ¤ç´¢
+!ENTITY aboutTor.searchSP.privacy.label å®å¨ã«
+!ENTITY aboutTor.searchDDG.privacy.label å®å¨ã«
+!ENTITY aboutTor.searchSP.privacy.link 
https://startpage.com/eng/protect-privacy.html;
+!ENTITY aboutTor.searchDDG.privacy.link https://duckduckgo.com/privacy.html;
+!ENTITY aboutTor.searchSP.privacy.afterLink.label amp;nbsp;
+!ENTITY aboutTor.searchDDG.privacy.afterLink.label amp;nbsp;
+!ENTITY aboutTor.searchSP.search.beforeLink.label ä¸ç·ã«
+!ENTITY aboutTor.searchDDG.search.beforeLink.label ä¸ç·ã«
+!ENTITY aboutTor.searchSP.search.label ã¹ã¿ã¼ããã¼ã¸
+!ENTITY aboutTor.searchDDG.search.label DuckDuckGo
+!ENTITY aboutTor.searchSP.search.link https://startpage.com/;
+!ENTITY aboutTor.searchDDG.search.link https://duckduckgo.com/;
+!ENTITY aboutTor.searchSP.search.afterLink.label .
+!ENTITY aboutTor.searchDDG.search.afterLink.label .
+
+!ENTITY aboutTor.torInfo1.label è¿½å æå ±: 
+!ENTITY aboutTor.torInfo2.label å½ã¨IPã¢ãã¬ã¹:
+!ENTITY aboutTor.torInfo3.label åºå£ãã¼ã:
+!ENTITY aboutTor.torInfo4.label 
ãã®ãµã¼ãã¯ããã¸ã¿ã¼ã®ããããæå 
±ãè¨é²ãã¾ããã
+!ENTITY aboutTor.whatnextQuestion.label æ¬¡ã¯ãªãã§ããï¼
+!ENTITY aboutTor.whatnextAnswer.label Torã 
ããå¿åã«ãã©ã¦ãºããã®ã«å¿
è¦ã¨ããããã§ã¯ããã¾ãã! ããªãã®èº«åãå®å
¨ã«ä¿ã¤ã«ã¯ããã©ã¦ã¸ã³ã°ã®ç¿æ£ã®ä¸é¨ãå¤ããå¿
è¦ãããããããã¾ããã
+!ENTITY aboutTor.whatnext.label 
å¿åæ§ãä¿ã¤ãã¨ã«ã¤ãã¦ã®ãã³ã
+!ENTITY aboutTor.whatnext.link 
https://www.torproject.org/download/download.html.en#warning;
+!ENTITY aboutTor.helpInfo1.label ããªãã¯å©ãããã¾ã!
+!ENTITY aboutTor.helpInfo2.label 
Torãããã¯ã¼ã¯ãããé«éã§ããå¼·åã«ãããã¨ãããããããå¤ãã®ããæ¹ãããã¾ãã
+!ENTITY aboutTor.helpInfo3.label Torãªã¬ã¼ãã¼ããèµ·å Â»
+!ENTITY aboutTor.helpInfo3.link 
https://www.torproject.org/docs/tor-doc-relay.html.en;
+!ENTITY aboutTor.helpInfo4.label ãã©ã³ãã£ã¢ãå¿é¡ãã
+!ENTITY aboutTor.helpInfo4.link 
https://www.torproject.org/getinvolved/volunteer.html.en;
+!ENTITY aboutTor.helpInfo5.label å¯ä»ããã
+!ENTITY aboutTor.helpInfo5.link 
https://www.torproject.org/donate/donate.html.en;
+
+!ENTITY aboutTor.footer.label Tor 
Projectã¯ãªã³ã©ã¤ã³ã®å¿åæ§ã¨ãã©ã¤ãã·ã¼ã®ç 
ç©¶ã¨éçºãæè²ãå°éã«è¡ãã¢ã¡ãªã«åè¡å½ã®501(c)(3)ã«åºã¥ãéå¶å©å£ä½ã§ãã
+!ENTITY aboutTor.learnMore.label

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2013-11-06 Thread translation

commit 048d523535319d47840e384830821403a85d4855
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 09:49:58 2013 +

Update translations for abouttor-homepage
---
 ja/aboutTor.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
index 2527ca3..1f96caf 100644
--- a/ja/aboutTor.dtd
+++ b/ja/aboutTor.dtd
@@ -38,7 +38,7 @@
 !ENTITY aboutTor.searchDDG.privacy.beforeLink.label æ¤ç´¢
 !ENTITY aboutTor.searchSP.privacy.label å®å¨ã«
 !ENTITY aboutTor.searchDDG.privacy.label å®å¨ã«
-!ENTITY aboutTor.searchSP.privacy.link 
+!ENTITY aboutTor.searchSP.privacy.link 
https://startpage.com/eng/protect-privacy.html;
 !ENTITY aboutTor.searchDDG.privacy.link https://duckduckgo.com/privacy.html;
 !ENTITY aboutTor.searchSP.privacy.afterLink.label amp;nbsp;
 !ENTITY aboutTor.searchDDG.privacy.afterLink.label amp;nbsp;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/vidalia_completed] Update translations for vidalia_completed

2013-11-06 Thread translation

commit 104546106a71f214fcc6e1c9a434577d25179586
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 10:15:17 2013 +

Update translations for vidalia_completed
---
 he/qt_he.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/qt_he.po b/he/qt_he.po
index 23a6ea1..838ece3 100644
--- a/he/qt_he.po
+++ b/he/qt_he.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2008-08-20 03:25+\n
-PO-Revision-Date: 2013-09-20 09:00+\n
+PO-Revision-Date: 2013-11-06 09:50+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Hebrew 
(http://www.transifex.com/projects/p/torproject/language/he/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit c9f57ff7e9359be6da1c4e8e2e5994535f6989bb
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 10:16:00 2013 +

Update translations for liveusb-creator
---
 ja/ja.po |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 7c1c5f4..fe3ce86 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -12,8 +12,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 09:28+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 10:10+\n
+Last-Translator: plazmism gomid...@live.jp\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -24,7 +24,7 @@ msgstr 
 #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
 msgid %(distribution)s installer
-msgstr 
+msgstr %(distribution)s ã¤ã³ã¹ãã¼ã©ã¼
 
 #: ../liveusb/gui.py:803
 #, python-format
@@ -34,7 +34,7 @@ msgstr %(filename)sãé¸æããã¾ãã
 #: ../liveusb/gui.py:440
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
-msgstr 
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 
 #: ../liveusb/creator.py:1020
 #, python-format
@@ -48,7 +48,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
-msgstr 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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;\ãå°ãã§ããï¼ /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\ããèªã¿ãã
 ãããspan style=\ text-decoration: underline; 
color:#ff;\ããã¥ã¡ã³ã/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:160
 msgid 
@@ -57,7 +57,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 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;\åä½ä¸ã® Tails 
ãUSBã¡ã¢ãªãSDã«ã¼ãã«ã³ãã¼ãã¦ãã 
ãããã¿ã¼ã²ããã®ããã¤ã¹ä¸ã®ãã¹ã¦ã®ãã¼ã¿ãå¤±ããã¾ãã/span/p/body/html
 
 #: ../liveusb/launcher_ui.py:162
 msgid 
@@ -66,7 +66,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 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;\åä½ä¸ã® Tails ãã¤ã³ã¹ãã¼ã«æ¸ã¿ã® Tails 
ããã¤ã¹ã«ã³ãã¼ãã¦ãã 
ãããã¡ã¢ãªä¸ã§è¦ã¤ãããã®ä»ã®ãã¼ãã£ã·ã§ã³ã¯ä¿åããã¾ãã/span/p/body/html
 
 #:

[tor-commits] [translation/vidalia] Update translations for vidalia

2013-11-06 Thread translation

commit e4fcc91c13b26b4db54394c90ea102ed7fcb4041
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 10:15:12 2013 +

Update translations for vidalia
---
 he/qt_he.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/qt_he.po b/he/qt_he.po
index 23a6ea1..838ece3 100644
--- a/he/qt_he.po
+++ b/he/qt_he.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2008-08-20 03:25+\n
-PO-Revision-Date: 2013-09-20 09:00+\n
+PO-Revision-Date: 2013-11-06 09:50+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Hebrew 
(http://www.transifex.com/projects/p/torproject/language/he/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

2013-11-06 Thread erinn

commit 80fa9ed81cbd848822f0fb68a72232c3834d2f32
Merge: 569f21d 8e02d3a
Author: Erinn Clark er...@torproject.org
Date:   Wed Nov 6 09:43:56 2013 -0200

Merge branch 'maint-2.4'

 build-scripts/recommended-versions |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/master] update recommended-versions for 3.0-beta-1 and remove old PT bundle version

2013-11-06 Thread erinn

commit 8e02d3a955df0da5c39d03313c9b7a21bb89d4cc
Author: Erinn Clark er...@torproject.org
Date:   Wed Nov 6 09:43:35 2013 -0200

update recommended-versions for 3.0-beta-1 and remove old PT bundle version
---
 build-scripts/recommended-versions |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index d9c0323..3d2cb2d 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -2,13 +2,10 @@
 2.3.25-14-MacOS,
 2.3.25-14-Windows,
 2.3.25-14-Linux,
-2.4.17-beta-2-MacOS,
-2.4.17-beta-2-Windows,
-2.4.17-beta-2-Linux,
 2.4.17-rc-1-MacOS,
 2.4.17-rc-1-Windows,
 2.4.17-rc-1-Linux,
-3.0-alpha-4-Linux,
-3.0-alpha-4-MacOS,
-3.0-alpha-4-Windows
+3.0-beta-1-Linux,
+3.0-beta-1-MacOS,
+3.0-beta-1-Windows
 ]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 6c7107160b05820c8212cbe280d7a54f6fe0c0bf
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 12:15:57 2013 +

Update translations for liveusb-creator
---
 cs/cs.po |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cs/cs.po b/cs/cs.po
index df630c1..b617da1 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -14,8 +14,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 09:28+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 12:00+\n
+Last-Translator: Radog bensch.ra...@gmail.com\n
 Language-Team: Czech 
(http://www.transifex.com/projects/p/torproject/language/cs/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -26,7 +26,7 @@ msgstr 
 #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
 msgid %(distribution)s installer
-msgstr 
+msgstr %(distribution)s instalÃ¡tor
 
 #: ../liveusb/gui.py:803
 #, python-format
@@ -36,7 +36,7 @@ msgstr %(filename)s zvolen
 #: ../liveusb/gui.py:440
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
-msgstr 
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 
 #: ../liveusb/creator.py:1020
 #, python-format
@@ -50,7 +50,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
-msgstr 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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;\PotÅebujete pomoc? PÅeÄtÄte si /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentaci/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:160
 msgid 
@@ -59,7 +59,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 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;\ZkopÃrujte Tails na USB disk nebo SD kartu. VÅ¡echna data z 
danÃ©ho zaÅÃzenÃ budou smazÃ¡na./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:162
 msgid 
@@ -68,7 +68,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 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;\ZkopÃruje prÃ¡vÄ spuÅ¡tÄnÃ½ Tails na disk s jiÅ¾ 
nainstalovanÃ½m Tails. OstatnÃ oddÃli dÃsku budou 
zachovÃ¡ny./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:164
 msgid 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy] Update translations for torbirdy

2013-11-06 Thread translation

commit 52252677d562738fcd4a551df006630fc0430779
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 13:46:04 2013 +

Update translations for torbirdy
---
 hi/torbirdy.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd
index 95d1c55..dc4bab7 100644
--- a/hi/torbirdy.dtd
+++ b/hi/torbirdy.dtd
@@ -31,7 +31,7 @@
 !ENTITY torbirdy.prefs.socks_port.label à¤ªà¥à¤°à¥à¤/à¤¦à¥à¤µà¤¾à¤° :
 !ENTITY torbirdy.prefs.socks_port.key P/à¤ª
 !ENTITY torbirdy.prefs.torification.label 
-!ENTITY torbirdy.prefs.torification.key 
+!ENTITY torbirdy.prefs.torification.key à¤à¥ 
 !ENTITY torbirdy.prefs.global à¤µà¤¿à¤¶à¥à¤µà¥à¤¯
 !ENTITY torbirdy.prefs.imap.label IMAP à¤à¤¾à¤¤à¥ à¤à¥ à¤²à¤¿à¤¯à¥ push 
email à¤¸à¤®à¤°à¥à¤¥à¤¨ à¤à¥ à¤¸à¤à¥à¤·à¤® à¤à¤°à¥à¤ 
[à¤¡à¤¿à¤«à¤¼à¥à¤²à¥à¤: à¤à¤à¥à¤·à¤®]
 !ENTITY torbirdy.prefs.imap.key P/à¤ª

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit f15f17992ca3308ef6cc4c885eaf24c4ebe3fb55
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 14:46:01 2013 +

Update translations for liveusb-creator
---
 ja/ja.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index fe3ce86..27ef399 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -7,13 +7,14 @@
 # plazmism gomid...@live.jp, 2013
 # Hajime Taira hta...@redhat.com, 2010
 # hyuugabaru hyu_gab...@yahoo.co.jp, 2009
+# takaf m465c3iiw...@gmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 10:10+\n
-Last-Translator: plazmism gomid...@live.jp\n
+PO-Revision-Date: 2013-11-06 14:30+\n
+Last-Translator: takaf m465c3iiw...@gmail.com\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -277,7 +278,7 @@ msgstr æ°¸ç¶çã¹ãã¬ã¼ã¸ (0 MB)
 
 #: ../liveusb/gui.py:697 ../liveusb/gui.py:726
 msgid Please confirm your device selection
-msgstr 
+msgstr ããã¤ã¹ã®é¸æãç¢ºèªãã¦ãã ããã
 
 #: ../liveusb/gui.py:462
 msgid Refreshing releases...

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2013-11-06 Thread translation

commit 05bf30b455609e0659c6dac2679f70eb15ea2201
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 14:46:06 2013 +

Update translations for liveusb-creator_completed
---
 ja/ja.po |  242 +-
 1 file changed, 129 insertions(+), 113 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 296133c..27ef399 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -7,13 +7,14 @@
 # plazmism gomid...@live.jp, 2013
 # Hajime Taira hta...@redhat.com, 2010
 # hyuugabaru hyu_gab...@yahoo.co.jp, 2009
+# takaf m465c3iiw...@gmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 11:21+0200\n
-PO-Revision-Date: 2013-09-09 10:00+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-17 13:19+0200\n
+PO-Revision-Date: 2013-11-06 14:30+\n
+Last-Translator: takaf m465c3iiw...@gmail.com\n
 Language-Team: Japanese 
(http://www.transifex.com/projects/p/torproject/language/ja/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -21,66 +22,71 @@ msgstr 
 Language: ja\n
 Plural-Forms: nplurals=1; plural=0;\n
 
-#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149
+#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
-msgid %(distribution)s LiveUSB Creator
-msgstr %(distribution)s LiveUSBä½æè
+msgid %(distribution)s installer
+msgstr %(distribution)s ã¤ã³ã¹ãã¼ã©ã¼
 
-#: ../liveusb/gui.py:776
+#: ../liveusb/gui.py:803
 #, python-format
 msgid %(filename)s selected
 msgstr %(filename)sãé¸æããã¾ãã
 
-#: ../liveusb/creator.py:1004
+#: ../liveusb/gui.py:440
+#, python-format
+msgid %(vendor)s %(model)s (%(details)s) - %(device)s
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
+
+#: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
 msgstr %sã¯ãã§ã«ãã¼ãå¯è½ã§ã
 
-#: ../liveusb/launcher_ui.py:156
+#: ../liveusb/launcher_ui.py:165
 msgid 
 !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\n
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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;\å©ããå¿è¦ã§ããï¼/spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\ããã¥ã¡ã³ã/span/aspan style=\ 
font-size:10pt;\ããèªã¿ãã ããã/span/p/body/html
+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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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;\ãå°ãã§ããï¼ /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\ããèªã¿ãã
 ãããspan style=\ text-decoration: underline; 
color:#ff;\ããã¥ã¡ã³ã/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
-#: ../liveusb/launcher_ui.py:151
+#: ../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
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2013-11-06 Thread translation

commit dd0ede0863dbf4ab8b1e1bb5c9a62cdee1292928
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 15:46:06 2013 +

Update translations for tails-persistence-setup_completed
---
 es/es.po |   57 +
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/es/es.po b/es/es.po
index 0547aeb..8fc87dc 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mm2herr ma_her...@yahoo.com.mx, 2013
 # strel, 2013
 # strel, 2012-2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-29 14:53+0200\n
-PO-Revision-Date: 2013-10-02 01:00+\n
-Last-Translator: strel\n
+Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
+POT-Creation-Date: 2013-10-26 23:24+0200\n
+PO-Revision-Date: 2013-11-06 15:30+\n
+Last-Translator: mm2herr ma_her...@yahoo.com.mx\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -116,77 +117,77 @@ msgid 
 Symlink into $HOME every file or directory found in the `dotfiles' directory
 msgstr Crear enlaces simbÃ³licos (symlinks) en $HOME para todos los archivos 
o carpetas que se encuentren en la carpeta 'dotfiles'
 
-#: ../lib/Tails/Persistence/Setup.pm:257
+#: ../lib/Tails/Persistence/Setup.pm:258
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
 msgstr No se pudo encontrar el dispositivo desde el que Tails estÃ¡ 
ejecutÃ¡ndose. Â¿UtilizÃ³ quizÃ¡ la opciÃ³n 'toram'?
 
-#: ../lib/Tails/Persistence/Setup.pm:276
+#: ../lib/Tails/Persistence/Setup.pm:277
 msgid Setup Tails persistent volume
 msgstr Establecer el volumen persistente de Tails
 
-#: ../lib/Tails/Persistence/Setup.pm:420
+#: ../lib/Tails/Persistence/Setup.pm:443
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr El dispositivo %s ya tiene un volumen persistente.
 
-#: ../lib/Tails/Persistence/Setup.pm:428
+#: ../lib/Tails/Persistence/Setup.pm:451
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr El dispositivo %s no tiene suficiente espacio sin asignar.
 
-#: ../lib/Tails/Persistence/Setup.pm:436 ../lib/Tails/Persistence/Setup.pm:450
+#: ../lib/Tails/Persistence/Setup.pm:459 ../lib/Tails/Persistence/Setup.pm:473
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr El dispositivo %s no tiene un volumen persistente.
 
-#: ../lib/Tails/Persistence/Setup.pm:442
+#: ../lib/Tails/Persistence/Setup.pm:465
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr No se puede eliminar el volumen persistente mientras estÃ¡ en uso. 
Debe reiniciar Tails sin persistencia.
 
-#: ../lib/Tails/Persistence/Setup.pm:461
+#: ../lib/Tails/Persistence/Setup.pm:484
 msgid Persistence volume is not unlocked.
 msgstr El volumen persistente no estÃ¡ desbloqueado.
 
-#: ../lib/Tails/Persistence/Setup.pm:466
+#: ../lib/Tails/Persistence/Setup.pm:489
 msgid Persistence volume is not mounted.
 msgstr El volumen persistente no estÃ¡ montado.
 
-#: ../lib/Tails/Persistence/Setup.pm:471
+#: ../lib/Tails/Persistence/Setup.pm:494
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr El volumen persistente no se pudo leer. Â¿Problemas de permisos o de 
propietarios?
 
-#: ../lib/Tails/Persistence/Setup.pm:476
+#: ../lib/Tails/Persistence/Setup.pm:499
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr El volumen persistente no se puede escribir. Â¿EstÃ¡ quizÃ¡ montado en 
modo sÃ³lo-lectura (read-only)?
 
-#: ../lib/Tails/Persistence/Setup.pm:485
+#: ../lib/Tails/Persistence/Setup.pm:508
 #, perl-format
-msgid Tails is running from non-USB device %s.
-msgstr Tails estÃ¡ ejecutÃ¡ndose desde un dispositivo no-USB %s.
+msgid Tails is running from non-USB / non-SDIO device %s.
+msgstr Tails se estÃ¡ ejecutando desde un dispositivo %s que no es USB / 
SDIO.
 
-#: ../lib/Tails/Persistence/Setup.pm:491
+#: ../lib/Tails/Persistence/Setup.pm:514
 #, perl-format
 msgid Device %s is optical.
 msgstr El dispositivo %s es Ã³ptico
 
-#: ../lib/Tails/Persistence/Setup.pm:498
+#: ../lib/Tails/Persistence/Setup.pm:521
 #, perl-format
 msgid Device %s was not created using Tails USB installer.
 msgstr El dispositivo %s no fue creado usando el instalador USB de Tails.
 
-#: ../lib/Tails/Persistence/Setup.pm:532
+#: ../lib/Tails/Persistence/Setup.pm:555
 msgid Error
 msgstr Error
 
-#: ../lib/Tails/Persistence/Setup.pm:839
+#: ../lib/Tails/Persistence/Setup.pm:872
 msgid Persistence wizard - Finished
 msgstr Asistente de persistencia - Finalizado
 
-#: ../lib/Tails/Persistence/Setup.pm:842
+#: ../lib/Tails/Persistence/Setup.pm:875
 msgid 
 Any changes you have made

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2013-11-06 Thread translation

commit b3dbe98f8a32f88f671628b63700b8a3287306a5
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 15:46:04 2013 +

Update translations for tails-persistence-setup
---
 es/es.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/es/es.po b/es/es.po
index b2b4e8c..8fc87dc 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mm2herr ma_her...@yahoo.com.mx, 2013
 # strel, 2013
 # strel, 2012-2013
 msgid 
@@ -10,8 +11,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-10-26 23:24+0200\n
-PO-Revision-Date: 2013-11-06 09:25+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 15:30+\n
+Last-Translator: mm2herr ma_her...@yahoo.com.mx\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -166,7 +167,7 @@ msgstr El volumen persistente no se puede escribir. 
Â¿EstÃ¡ quizÃ¡ montado en m
 #: ../lib/Tails/Persistence/Setup.pm:508
 #, perl-format
 msgid Tails is running from non-USB / non-SDIO device %s.
-msgstr 
+msgstr Tails se estÃ¡ ejecutando desde un dispositivo %s que no es USB / 
SDIO.
 
 #: ../lib/Tails/Persistence/Setup.pm:514
 #, perl-format
@@ -253,11 +254,11 @@ msgstr La particiÃ³n persistente de Tails serÃ¡ montada.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
 msgid Correcting permissions of the persistent volume.
-msgstr 
+msgstr Corrigiendo permisos del volumen persistente.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286
 msgid The permissions of the persistent volume will be corrected.
-msgstr 
+msgstr Los permisos del volumen persistente serÃ¡n corregidos.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:308
 msgid Creating...

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 4857319939be6edb709c5d4e264e23555b997a1b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 15:45:58 2013 +

Update translations for liveusb-creator
---
 es/es.po |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/es/es.po b/es/es.po
index d969cf6..fda49dc 100644
--- a/es/es.po
+++ b/es/es.po
@@ -5,6 +5,7 @@
 # Translators:
 # AdriÃ¡n SandÃ asandi.sa...@gmail.com, 2013
 # Carlos Capote carloscap...@masticable.org, 2012
+# mm2herr ma_her...@yahoo.com.mx, 2013
 # strel, 2013
 # strel, 2012-2013
 msgid 
@@ -12,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 09:28+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 15:40+\n
+Last-Translator: mm2herr ma_her...@yahoo.com.mx\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -48,7 +49,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
-msgstr 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 
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;\Necesita ayuda? Lea la siguiente /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentacion/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:160
 msgid 
@@ -277,7 +278,7 @@ msgstr Almacenamiento persistente (0 MB)
 
 #: ../liveusb/gui.py:697 ../liveusb/gui.py:726
 msgid Please confirm your device selection
-msgstr 
+msgstr Por favor confirme su dispositivo
 
 #: ../liveusb/gui.py:462
 msgid Refreshing releases...
@@ -314,7 +315,7 @@ msgstr Configurando un fichero de arranque OLPC (One 
Laptop Per Child)...
 msgid 
 Some partitions of the target device %(device)s are mounted. They will be 
 unmounted before starting the installation process.
-msgstr 
+msgstr Algunas particiones de su dispositivo %(device)s se han montado. 
SerÃ¡n desmontadas antes de iniciar con el proceso de instalaciÃ³n.
 
 #: ../liveusb/creator.py:131
 msgid 
@@ -381,7 +382,7 @@ msgstr Esta es la consola de estado, donde salen escritos 
todos los mensajes.
 
 #: ../liveusb/creator.py:879
 msgid Trying to continue anyway.
-msgstr 
+msgstr Tratando de continuar de cualquier manera.
 
 #: ../liveusb/creator.py:911
 #, python-format
@@ -404,7 +405,7 @@ msgstr No fue posible encontrar alguna unidad USB
 
 #: ../liveusb/creator.py:1200
 msgid Unable to find any supported device
-msgstr 
+msgstr No es posible localizar un dispositivo vÃ¡lido.
 
 #: ../liveusb/creator.py:1040
 msgid Unable to find partition
@@ -481,7 +482,7 @@ msgstr Desmontando los sistemas de ficheros montados sobre 
'%(device)s'
 #: ../liveusb/creator.py:876
 #, python-format
 msgid Unsupported device '%(device)s', please report a bug.
-msgstr 
+msgstr Dispositivo '%(device)s' no vÃ¡lido, por favor reporte un fallo.
 
 #: ../liveusb/creator.py:770 ../liveusb/creator.py:893
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2013-11-06 Thread translation

commit 5318f8347d2e2f1dd698fa7233450cf5b587fda5
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 15:46:23 2013 +

Update translations for tails-misc_completed
---
 es.po |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/es.po b/es.po
index e1dee56..30aaec2 100644
--- a/es.po
+++ b/es.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# strel strel...@gmail.com, 2013
+# mm2herr ma_her...@yahoo.com.mx, 2013
+# strel, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 12:35+0200\n
-PO-Revision-Date: 2013-09-17 13:12+\n
-Last-Translator: strel strel...@gmail.com\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-26 23:41+0200\n
+PO-Revision-Date: 2013-11-06 15:30+\n
+Last-Translator: mm2herr ma_her...@yahoo.com.mx\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -225,21 +226,21 @@ msgstr InformaciÃ³n de versiÃ³n del paquete (build):\n%s
 msgid About Tails
 msgstr Acerca de Tails
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
 msgid Your additional software
 msgstr Su software adicional
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr La actualizaciÃ³n fallÃ³. Esto puede ser debido a un problema de la 
red. Por favor, compruebe su conexiÃ³n de red, intente reiniciar Tails, o lea 
el registro ('log') del sistema para comprender mejor el problema.
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
 msgid The upgrade was successful.
 msgstr La actualizaciÃ³n se realizÃ³ con Ã©xito.
 
@@ -404,9 +405,9 @@ msgid 
 concerns.
 msgstr TrueCrypt pronto serÃ¡ eliminado de Taills debido a custiones de 
licencia y desarrollo.
 
-#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1
-msgid Report a Bug
-msgstr Informar de un fallo
+#: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid Report an error
+msgstr Informar un error
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2013-11-06 Thread translation

commit 2621214fcf998c836603f6ffacdd99d44fbfd968
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 15:46:21 2013 +

Update translations for tails-misc
---
 es.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/es.po b/es.po
index 1c600ef..30aaec2 100644
--- a/es.po
+++ b/es.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mm2herr ma_her...@yahoo.com.mx, 2013
 # strel, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 15:30+\n
+Last-Translator: mm2herr ma_her...@yahoo.com.mx\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -406,7 +407,7 @@ msgstr TrueCrypt pronto serÃ¡ eliminado de Taills debido a 
custiones de licenci
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid Report an error
-msgstr 
+msgstr Informar un error
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 990cd585e48d98849a16096f6e85b24cd720953b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 16:15:56 2013 +

Update translations for liveusb-creator
---
 es/es.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/es.po b/es/es.po
index fda49dc..dadf0c6 100644
--- a/es/es.po
+++ b/es/es.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 15:40+\n
+PO-Revision-Date: 2013-11-06 15:50+\n
 Last-Translator: mm2herr ma_her...@yahoo.com.mx\n
 Language-Team: Spanish 
(http://www.transifex.com/projects/p/torproject/language/es/)\n
 MIME-Version: 1.0\n
@@ -556,7 +556,7 @@ msgstr Escrito al dispositivo a %(speed)d MB/sec
 msgid 
 You are going to install Tails on the %(size)s %(vendor)s %(model)s device 
 (%(device)s). All data on the selected drive will be lost. Continue?
-msgstr 
+msgstr EstÃ¡ a punto de instalar Tails en un dispositivo (%(device)s) 
%(vendor)s %(model)s %(size)s. Toda la informaciÃ³n en el volumen seleccionado 
se perderÃ¡. Desea continuar?
 
 #: ../liveusb/gui.py:715
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [flashproxy/master] update nodejs Makefile for restructured source tree

2013-11-06 Thread infinity0

commit 1d8421790b48c4928d535f42d58d6ce15918268f
Author: Ximin Luo infini...@gmx.com
Date:   Wed Nov 6 16:38:50 2013 +

update nodejs Makefile for restructured source tree
---
 proxy/modules/nodejs/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/modules/nodejs/Makefile b/proxy/modules/nodejs/Makefile
index e4a11d4..8daf62e 100644
--- a/proxy/modules/nodejs/Makefile
+++ b/proxy/modules/nodejs/Makefile
@@ -1,4 +1,4 @@
 .PHONY: prepublish
 prepublish: flashproxy.js
-flashproxy.js: ../../proxy/flashproxy.js
+flashproxy.js: ../../flashproxy.js
cp -f $ $@



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [flashproxy/master] allow some proxy defaults to be defined from an external script file.

2013-11-06 Thread infinity0

commit f0e9b3647c6df72c2b1f71a3cbe180150d1b67a9
Author: Ximin Luo infini...@gmx.com
Date:   Wed Nov 6 16:14:10 2013 +

allow some proxy defaults to be defined from an external script file.
- one can imagine scenarios where it's inconvenient to give query params to 
embed.html or other wrapper; this helps flexibility in those cases
---
 proxy/embed.html|   11 +++
 proxy/flashproxy.js |   10 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/proxy/embed.html b/proxy/embed.html
index 53b5bf5..d475adb 100644
--- a/proxy/embed.html
+++ b/proxy/embed.html
@@ -3,6 +3,17 @@
 head
 meta charset=utf-8
 meta http-equiv=refresh content=86400
+script type=text/javascript 
+/*
+   You can tweak the behaviour of the proxy by giving URL query parameters 
to
+   this embedding document. If you wish to override the default values 
even in
+   the absense of those parameters, you may set them below.
+
+   See the main code of the proxy for details on which URL query parameters
+   are available, as well as which defaults you can override.
+*/
+//var DEFAULT_FACILITATOR_URL = https://fp-facilitator.org/;;
+/script
 style type=text/css
 html {
width: 100%;
diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js
index cb2ac9e..87b083e 100644
--- a/proxy/flashproxy.js
+++ b/proxy/flashproxy.js
@@ -62,16 +62,16 @@
  * http://autobahn.ws/testsuite/reports/clients/index.html
  */
 
-var DEFAULT_FACILITATOR_URL = https://fp-facilitator.org/;;
+var DEFAULT_FACILITATOR_URL = DEFAULT_FACILITATOR_URL || 
https://fp-facilitator.org/;;
 
-var DEFAULT_MAX_NUM_PROXY_PAIRS = 10;
+var DEFAULT_MAX_NUM_PROXY_PAIRS = DEFAULT_MAX_NUM_PROXY_PAIRS || 10;
 
-var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = 60.0;
-var DEFAULT_FACILITATOR_POLL_INTERVAL = 3600.0;
+var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = 
DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL || 60.0;
+var DEFAULT_FACILITATOR_POLL_INTERVAL = DEFAULT_FACILITATOR_POLL_INTERVAL || 
3600.0;
 var MIN_FACILITATOR_POLL_INTERVAL = 10.0;
 
 /* Bytes per second. Set to undefined to disable limit. */
-var DEFAULT_RATE_LIMIT = undefined;
+var DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined;
 var MIN_RATE_LIMIT = 10 * 1024;
 var RATE_LIMIT_HISTORY = 5.0;
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] r26411: {website} revert mttp's changes. (website/trunk/docs/en)

2013-11-06 Thread Andrew Lewman

Author: phobos
Date: 2013-11-06 17:06:14 + (Wed, 06 Nov 2013)
New Revision: 26411

Modified:
   website/trunk/docs/en/verifying-signatures.wml
Log:
revert mttp's changes.


Modified: website/trunk/docs/en/verifying-signatures.wml
===
--- website/trunk/docs/en/verifying-signatures.wml  2013-11-05 22:20:17 UTC 
(rev 26410)
+++ website/trunk/docs/en/verifying-signatures.wml  2013-11-06 17:06:14 UTC 
(rev 26411)
@@ -48,19 +48,19 @@
 
 h3Where do I get the signatures and the keys that made them?/h3
 hr
-pEach file on a 
href=/web/20130929222100/https://www.torproject.org/download/download.html.en;our
 download
+pEach file on a href=page download/downloadour download
 page/a is accompanied by a file with the same name as the
 package and the extension .asc. These .asc files are GPG
 signatures. They allow you to verify the file you've downloaded
 is exactly the one that we intended you to get. For example,
 tor-browser-2.3.25-13_en-US.exe is accompanied by
 tor-browser-2.3.25-13_en-US.exe.asc. For a list
-of which developer signs which package, see our a 
href=/web/20130929222100/https://www.torproject.org/docs/signing-keys.html.en;signing
 keys/a page./p
+of which developer signs which package, see our a href=page 
docs/signing-keyssigning keys/a page./p
 h3Windows/h3
 hr
 pYou need to have GnuPG installed before
 you can verify signatures. Download it from a
-
href=/web/20130929222100/http://gpg4win.org/download.html;http://gpg4win.org/download.html/a./p
+
href=http://gpg4win.org/download.html;http://gpg4win.org/download.html/a./p
 pOnce it's installed, use GnuPG to import the key that signed your
 package. Since GnuPG for Windows is a command-line tool, you will need
 to use icmd.exe/i. Unless you edit your PATH environment variable,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] r26412: {website} add the correct . (website/trunk/docs/en)

2013-11-06 Thread Andrew Lewman

Author: phobos
Date: 2013-11-06 17:11:31 + (Wed, 06 Nov 2013)
New Revision: 26412

Modified:
   website/trunk/docs/en/verifying-signatures.wml
Log:
add the correct .


Modified: website/trunk/docs/en/verifying-signatures.wml
===
--- website/trunk/docs/en/verifying-signatures.wml  2013-11-06 17:06:14 UTC 
(rev 26411)
+++ website/trunk/docs/en/verifying-signatures.wml  2013-11-06 17:11:31 UTC 
(rev 26412)
@@ -55,7 +55,7 @@
 is exactly the one that we intended you to get. For example,
 tor-browser-2.3.25-13_en-US.exe is accompanied by
 tor-browser-2.3.25-13_en-US.exe.asc. For a list
-of which developer signs which package, see our a href=page 
docs/signing-keyssigning keys/a page./p
+of which developer signs which package, see our a href=page 
docs/signing-keyssigning keys/a page./p
 h3Windows/h3
 hr
 pYou need to have GnuPG installed before

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2013-11-06 Thread translation

commit 659885cddc974226af7cfd53ea177789422f4871
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:16:03 2013 +

Update translations for tails-persistence-setup
---
 sv/sv.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index b3b88db..ffc5883 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -10,8 +10,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-10-26 23:24+0200\n
-PO-Revision-Date: 2013-11-06 09:25+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 17:10+\n
+Last-Translator: WinterFairy winterfa...@riseup.net\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
@@ -166,7 +166,7 @@ msgstr SkrivÃ¥tkomst till den bestÃ¥ende lagringen saknas. 
Kanske den Ã¤r skriv
 #: ../lib/Tails/Persistence/Setup.pm:508
 #, perl-format
 msgid Tails is running from non-USB / non-SDIO device %s.
-msgstr 
+msgstr Tails kÃ¶rs frÃ¥n icke-USB / icke-SDIO enheten %s.
 
 #: ../lib/Tails/Persistence/Setup.pm:514
 #, perl-format
@@ -253,11 +253,11 @@ msgstr Tails partition med bestÃ¥ende lagring kommer att 
monteras.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
 msgid Correcting permissions of the persistent volume.
-msgstr 
+msgstr RÃ¤ttar till behÃ¶righeterna pÃ¥ den bestÃ¥ende lagringen.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286
 msgid The permissions of the persistent volume will be corrected.
-msgstr 
+msgstr BehÃ¶righeterna pÃ¥ den bestÃ¥ende lagringen kommer att rÃ¤ttas till.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:308
 msgid Creating...

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 6bd92adc4dd6df453b298f81aaa15a64b238b61c
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:15:57 2013 +

Update translations for liveusb-creator
---
 sv/sv.po |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index ac2a834..a7f1b93 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -12,8 +12,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 09:28+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 17:14+\n
+Last-Translator: WinterFairy winterfa...@riseup.net\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
@@ -24,7 +24,7 @@ msgstr 
 #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
 msgid %(distribution)s installer
-msgstr 
+msgstr %(distribution)s installerare
 
 #: ../liveusb/gui.py:803
 #, python-format
@@ -34,7 +34,7 @@ msgstr %(filename)s vald.
 #: ../liveusb/gui.py:440
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
-msgstr 
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 
 #: ../liveusb/creator.py:1020
 #, python-format
@@ -48,7 +48,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
-msgstr 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentationen/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:160
 msgid 
@@ -57,7 +57,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 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
 
 #: ../liveusb/launcher_ui.py:162
 msgid 
@@ -66,7 +66,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 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 behÃ¥llas./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:164
 msgid 
@@ -75,7 +75,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody style=\

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2013-11-06 Thread translation

commit 98cf5d62a1a7c1afe1d22df3afd8fe1884f53675
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:16:00 2013 +

Update translations for liveusb-creator_completed
---
 sv/sv.po |  255 +-
 1 file changed, 135 insertions(+), 120 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 8bb7a5d..a7f1b93 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -10,10 +10,10 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 11:21+0200\n
-PO-Revision-Date: 2013-09-09 10:00+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-17 13:19+0200\n
+PO-Revision-Date: 2013-11-06 17:14+\n
+Last-Translator: WinterFairy winterfa...@riseup.net\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
@@ -21,66 +21,71 @@ msgstr 
 Language: sv\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149
+#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
-msgid %(distribution)s LiveUSB Creator
-msgstr %(distribution)s LiveUSB skapare
+msgid %(distribution)s installer
+msgstr %(distribution)s installerare
 
-#: ../liveusb/gui.py:776
+#: ../liveusb/gui.py:803
 #, python-format
 msgid %(filename)s selected
 msgstr %(filename)s vald.
 
-#: ../liveusb/creator.py:1004
+#: ../liveusb/gui.py:440
+#, python-format
+msgid %(vendor)s %(model)s (%(details)s) - %(device)s
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
+
+#: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
 msgstr %s Ã¤r redan bootbar
 
-#: ../liveusb/launcher_ui.py:156
+#: ../liveusb/launcher_ui.py:165
 msgid 
 !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\n
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentationen/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
+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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\\np, li { 
white-space: pre-wrap; }\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\\np 
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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentationen/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
-#: ../liveusb/launcher_ui.py:151
+#: ../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
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2013-11-06 Thread translation

commit bca340fb31204b9101416a6282dceb9804c86b81
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:16:23 2013 +

Update translations for tails-misc_completed
---
 sv.po |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sv.po b/sv.po
index f304a8a..4e1c389 100644
--- a/sv.po
+++ b/sv.po
@@ -7,9 +7,9 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 12:35+0200\n
-PO-Revision-Date: 2013-09-17 13:12+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-26 23:41+0200\n
+PO-Revision-Date: 2013-11-06 16:50+\n
 Last-Translator: WinterFairy winterfa...@riseup.net\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -225,21 +225,21 @@ msgstr Build information:\n%s
 msgid About Tails
 msgstr Om Tails
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
 msgid Your additional software
 msgstr Din tillvalda mjukvara
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr Uppdateringen misslyckades. Detta kan bero pÃ¥ ett nÃ¤tverksproblem. 
Kontrollera din nÃ¤tverksanslutning, fÃ¶rsÃ¶k starta om Tails, eller lÃ¤s 
systemloggen fÃ¶r att fÃ¶rstÃ¥ problemet bÃ¤ttre.
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
 msgid The upgrade was successful.
 msgstr Uppgraderingen lyckades.
 
@@ -404,9 +404,9 @@ msgid 
 concerns.
 msgstr TrueCrypt kommer snart att tas bort frÃ¥n Tails pÃ¥ grund av oro Ã¶ver 
dess licens och utveckling.
 
-#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1
-msgid Report a Bug
-msgstr Bugg-anmÃ¤lan
+#: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid Report an error
+msgstr FelanmÃ¤lan
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2013-11-06 Thread translation

commit 4847c473754a8982e9f0d8b8c6d0dfee3a4a2480
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:16:21 2013 +

Update translations for tails-misc
---
 sv.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv.po b/sv.po
index b41ed93..4e1c389 100644
--- a/sv.po
+++ b/sv.po
@@ -9,8 +9,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 16:50+\n
+Last-Translator: WinterFairy winterfa...@riseup.net\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
@@ -406,7 +406,7 @@ msgstr TrueCrypt kommer snart att tas bort frÃ¥n Tails pÃ¥ 
grund av oro Ã¶ver d
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid Report an error
-msgstr 
+msgstr FelanmÃ¤lan
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2013-11-06 Thread translation

commit 1375ece75e02416d4df7bffb3578ad44d7b38f96
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:16:05 2013 +

Update translations for tails-persistence-setup_completed
---
 sv/sv.po |   54 +++---
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index af6a1a4..ffc5883 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -8,9 +8,9 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-29 14:53+0200\n
-PO-Revision-Date: 2013-09-30 11:48+\n
+Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
+POT-Creation-Date: 2013-10-26 23:24+0200\n
+PO-Revision-Date: 2013-11-06 17:10+\n
 Last-Translator: WinterFairy winterfa...@riseup.net\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -116,77 +116,77 @@ msgid 
 Symlink into $HOME every file or directory found in the `dotfiles' directory
 msgstr LÃ¤nka in i $HOME varje fil och katalog som finns i `dotfiles' 
katalogen
 
-#: ../lib/Tails/Persistence/Setup.pm:257
+#: ../lib/Tails/Persistence/Setup.pm:258
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
 msgstr Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram'?
 
-#: ../lib/Tails/Persistence/Setup.pm:276
+#: ../lib/Tails/Persistence/Setup.pm:277
 msgid Setup Tails persistent volume
 msgstr Konfigurera bestÃ¥ende lagring fÃ¶r Tails
 
-#: ../lib/Tails/Persistence/Setup.pm:420
+#: ../lib/Tails/Persistence/Setup.pm:443
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr Enhet %s innehÃ¥ller redan en partition med bestÃ¥ende lagring.
 
-#: ../lib/Tails/Persistence/Setup.pm:428
+#: ../lib/Tails/Persistence/Setup.pm:451
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr Enhet %s saknar tillrÃ¤ckligt med opartitionerat utrymme.
 
-#: ../lib/Tails/Persistence/Setup.pm:436 ../lib/Tails/Persistence/Setup.pm:450
+#: ../lib/Tails/Persistence/Setup.pm:459 ../lib/Tails/Persistence/Setup.pm:473
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr Enhet %s innehÃ¥ller ingen partition fÃ¶r bestÃ¥ende lagring.
 
-#: ../lib/Tails/Persistence/Setup.pm:442
+#: ../lib/Tails/Persistence/Setup.pm:465
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr Partitionen med bestÃ¥ende lagring kan inte tas bort nÃ¤r den 
anvÃ¤nds. Starta om Tails utan bestÃ¥ende lagring.
 
-#: ../lib/Tails/Persistence/Setup.pm:461
+#: ../lib/Tails/Persistence/Setup.pm:484
 msgid Persistence volume is not unlocked.
 msgstr Partitionen med bestÃ¥ende lagring Ã¤r inte upplÃ¥st.
 
-#: ../lib/Tails/Persistence/Setup.pm:466
+#: ../lib/Tails/Persistence/Setup.pm:489
 msgid Persistence volume is not mounted.
 msgstr Partitionen med bestÃ¥ende lagring Ã¤r inte monterad.
 
-#: ../lib/Tails/Persistence/Setup.pm:471
+#: ../lib/Tails/Persistence/Setup.pm:494
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr Kunde inte lÃ¤sa ifrÃ¥n den bestÃ¥ende lagringen. Saknas nÃ¶dvÃ¤ndiga 
rÃ¤ttigheter?
 
-#: ../lib/Tails/Persistence/Setup.pm:476
+#: ../lib/Tails/Persistence/Setup.pm:499
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr SkrivÃ¥tkomst till den bestÃ¥ende lagringen saknas. Kanske den Ã¤r 
skrivskyddad?
 
-#: ../lib/Tails/Persistence/Setup.pm:485
+#: ../lib/Tails/Persistence/Setup.pm:508
 #, perl-format
-msgid Tails is running from non-USB device %s.
-msgstr Tails kÃ¶rs ifrÃ¥n icke-USB enheten %s.
+msgid Tails is running from non-USB / non-SDIO device %s.
+msgstr Tails kÃ¶rs frÃ¥n icke-USB / icke-SDIO enheten %s.
 
-#: ../lib/Tails/Persistence/Setup.pm:491
+#: ../lib/Tails/Persistence/Setup.pm:514
 #, perl-format
 msgid Device %s is optical.
 msgstr Enheten %s Ã¤r optisk.
 
-#: ../lib/Tails/Persistence/Setup.pm:498
+#: ../lib/Tails/Persistence/Setup.pm:521
 #, perl-format
 msgid Device %s was not created using Tails USB installer.
 msgstr Enheten %s skapades inte med Tails USB installerare.
 
-#: ../lib/Tails/Persistence/Setup.pm:532
+#: ../lib/Tails/Persistence/Setup.pm:555
 msgid Error
 msgstr Fel
 
-#: ../lib/Tails/Persistence/Setup.pm:839
+#: ../lib/Tails/Persistence/Setup.pm:872
 msgid Persistence wizard - Finished
 msgstr Guiden avslutad
 
-#: ../lib/Tails/Persistence/Setup.pm:842
+#: ../lib/Tails/Persistence/Setup.pm:875
 msgid 
 Any changes you have made will only take effect after restarting Tails.\n
 \n
@@ -251,11 +251,19 @@ msgstr Monterar Tails partition med bestÃ¥ende lagring.
 msgid The Tails persistence partition will be mounted.
 msgstr Tails partition med bestÃ¥ende lagring kommer att monteras.
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:296
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
+msgid Correcting

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 95eccb8d3e2ec93db46275a28ef1331b623fba86
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:45:57 2013 +

Update translations for liveusb-creator
---
 sv/sv.po |   52 ++--
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index a7f1b93..0ca1583 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 17:14+\n
+PO-Revision-Date: 2013-11-06 17:40+\n
 Last-Translator: WinterFairy winterfa...@riseup.net\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -29,7 +29,7 @@ msgstr %(distribution)s installerare
 #: ../liveusb/gui.py:803
 #, python-format
 msgid %(filename)s selected
-msgstr %(filename)s vald.
+msgstr %(filename)s vald
 
 #: ../liveusb/gui.py:440
 #, python-format
@@ -39,7 +39,7 @@ msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 #: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
-msgstr %s Ã¤r redan bootbar
+msgstr %s Ã¤r redan startbar
 
 #: ../liveusb/launcher_ui.py:165
 msgid 
@@ -91,7 +91,7 @@ msgid 
 will be able to store data and make permanent modifications to your live 
 operating system.  Without it, you will not be able to save data that will 
 persist after a reboot.
-msgstr Genom att allokera extra utrymme pÃ¥ din USB-sticka 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.
+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
 #, python-format
@@ -142,11 +142,11 @@ msgstr Ladda ned %(distribution)s
 
 #: ../liveusb/gui.py:777
 msgid Download complete!
-msgstr HÃ¤mtat fÃ¤rdigt!
+msgstr HÃ¤mtning fÃ¤rdig!
 
 #: ../liveusb/gui.py:781
 msgid Download failed: 
-msgstr Misslyckades hÃ¤mta: 
+msgstr HÃ¤mtning misslyckades: 
 
 #: ../liveusb/gui.py:88
 #, python-format
@@ -189,11 +189,11 @@ msgstr Formaterar %(device)s som FAT32
 
 #: ../liveusb/creator.py:140
 msgid ISO MD5 checksum passed
-msgstr ISO MD5 checksummeverifiering lyckades
+msgstr ISO MD5 kontrollsumman Ã¤r korrekt
 
 #: ../liveusb/creator.py:138
 msgid ISO MD5 checksum verification failed
-msgstr ISO MD5 checksummeverifiering misslyckades
+msgstr Verifieringen av ISO MD5 kontrollsumman misslyckades
 
 #: ../liveusb/dialog.py:165
 msgid 
@@ -216,7 +216,7 @@ msgstr Installationen slutfÃ¶rd. Tryck OK fÃ¶r att stÃ¤nga 
detta program.
 
 #: ../liveusb/creator.py:916 ../liveusb/creator.py:1239
 msgid Installing bootloader...
-msgstr Installerar bootloader...
+msgstr Installerar starthanteraren...
 
 #: ../liveusb/gui.py:284
 msgid LiveUSB creation failed!
@@ -299,7 +299,7 @@ msgstr Tar bort existerande Live OS
 #: ../liveusb/creator.py:1112
 #, python-format
 msgid Resetting Master Boot Record of %s
-msgstr ÃterstÃ¤ller Master Boot Record pÃ¥ %s
+msgstr NollstÃ¤ller Master Boot Record pÃ¥ %s
 
 #: ../liveusb/gui.py:788
 msgid Select Live ISO
@@ -307,7 +307,7 @@ msgstr VÃ¤lj Live-ISO
 
 #: ../liveusb/creator.py:182
 msgid Setting up OLPC boot file...
-msgstr SÃ¤tter upp OLPC boot fil...
+msgstr Installerar OLPC startfil...
 
 #: ../liveusb/creator.py:716
 #, python-format
@@ -319,7 +319,7 @@ msgstr NÃ¥gra partitioner pÃ¥ mÃ¥lenheten %(device)s Ã¤r 
monterade. De kommer a
 #: ../liveusb/creator.py:131
 msgid 
 Source type does not support verification of ISO MD5 checksum, skipping
-msgstr KÃ¤lltypen stÃ¶der inte verifikation af ISO MD5 checksummor, hoppar 
Ã¶ver
+msgstr KÃ¤lltypen stÃ¶der inte verifikation af ISO MD5 kontrollsummor, hoppar 
Ã¶ver
 
 #: ../liveusb/creator.py:1146
 msgid Synchronizing data on disk...
@@ -333,7 +333,7 @@ msgstr MÃ¥lenhet
 msgid 
 The Master Boot Record on your device is blank. Pressing 'Create Live USB' 
 again will reset the MBR on this device.
-msgstr Master Boot Record pÃ¥ din enhet Ã¤r tom. Tryck pÃ¥ 'Skapa Live USB' 
igen fÃ¶r att Ã¥terstÃ¤lla MBR pÃ¥ den hÃ¤r enheten.
+msgstr Master Boot Record pÃ¥ din enhet Ã¤r tom. Tryck pÃ¥ 'Skapa Live USB' 
igen fÃ¶r att nollstÃ¤lla MBR pÃ¥ den hÃ¤r enheten.
 
 #: ../liveusb/gui.py:791
 msgid 
@@ -361,13 +361,13 @@ msgid 
 optionally downloading a release (if an existing one wasn't selected),  
 extracting the ISO to the USB device, creating the persistent overlay, and 
 installing the bootloader.
-msgstr Den hÃ¤r knappen startar processen fÃ¶r att skapa en LiveUSB. Detta 
innbÃ¤r nedladdning av en utgÃ¥va (om inte en redan existerande valts), 
uppackning av ISO-filen till en USB

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2013-11-06 Thread translation

commit d9cebab67e854fcfe4b61dcfbb6837edd3a8cfd9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 17:46:00 2013 +

Update translations for liveusb-creator_completed
---
 sv/sv.po |   52 ++--
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index a7f1b93..0ca1583 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 17:14+\n
+PO-Revision-Date: 2013-11-06 17:40+\n
 Last-Translator: WinterFairy winterfa...@riseup.net\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -29,7 +29,7 @@ msgstr %(distribution)s installerare
 #: ../liveusb/gui.py:803
 #, python-format
 msgid %(filename)s selected
-msgstr %(filename)s vald.
+msgstr %(filename)s vald
 
 #: ../liveusb/gui.py:440
 #, python-format
@@ -39,7 +39,7 @@ msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 #: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
-msgstr %s Ã¤r redan bootbar
+msgstr %s Ã¤r redan startbar
 
 #: ../liveusb/launcher_ui.py:165
 msgid 
@@ -91,7 +91,7 @@ msgid 
 will be able to store data and make permanent modifications to your live 
 operating system.  Without it, you will not be able to save data that will 
 persist after a reboot.
-msgstr Genom att allokera extra utrymme pÃ¥ din USB-sticka 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.
+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
 #, python-format
@@ -142,11 +142,11 @@ msgstr Ladda ned %(distribution)s
 
 #: ../liveusb/gui.py:777
 msgid Download complete!
-msgstr HÃ¤mtat fÃ¤rdigt!
+msgstr HÃ¤mtning fÃ¤rdig!
 
 #: ../liveusb/gui.py:781
 msgid Download failed: 
-msgstr Misslyckades hÃ¤mta: 
+msgstr HÃ¤mtning misslyckades: 
 
 #: ../liveusb/gui.py:88
 #, python-format
@@ -189,11 +189,11 @@ msgstr Formaterar %(device)s som FAT32
 
 #: ../liveusb/creator.py:140
 msgid ISO MD5 checksum passed
-msgstr ISO MD5 checksummeverifiering lyckades
+msgstr ISO MD5 kontrollsumman Ã¤r korrekt
 
 #: ../liveusb/creator.py:138
 msgid ISO MD5 checksum verification failed
-msgstr ISO MD5 checksummeverifiering misslyckades
+msgstr Verifieringen av ISO MD5 kontrollsumman misslyckades
 
 #: ../liveusb/dialog.py:165
 msgid 
@@ -216,7 +216,7 @@ msgstr Installationen slutfÃ¶rd. Tryck OK fÃ¶r att stÃ¤nga 
detta program.
 
 #: ../liveusb/creator.py:916 ../liveusb/creator.py:1239
 msgid Installing bootloader...
-msgstr Installerar bootloader...
+msgstr Installerar starthanteraren...
 
 #: ../liveusb/gui.py:284
 msgid LiveUSB creation failed!
@@ -299,7 +299,7 @@ msgstr Tar bort existerande Live OS
 #: ../liveusb/creator.py:1112
 #, python-format
 msgid Resetting Master Boot Record of %s
-msgstr ÃterstÃ¤ller Master Boot Record pÃ¥ %s
+msgstr NollstÃ¤ller Master Boot Record pÃ¥ %s
 
 #: ../liveusb/gui.py:788
 msgid Select Live ISO
@@ -307,7 +307,7 @@ msgstr VÃ¤lj Live-ISO
 
 #: ../liveusb/creator.py:182
 msgid Setting up OLPC boot file...
-msgstr SÃ¤tter upp OLPC boot fil...
+msgstr Installerar OLPC startfil...
 
 #: ../liveusb/creator.py:716
 #, python-format
@@ -319,7 +319,7 @@ msgstr NÃ¥gra partitioner pÃ¥ mÃ¥lenheten %(device)s Ã¤r 
monterade. De kommer a
 #: ../liveusb/creator.py:131
 msgid 
 Source type does not support verification of ISO MD5 checksum, skipping
-msgstr KÃ¤lltypen stÃ¶der inte verifikation af ISO MD5 checksummor, hoppar 
Ã¶ver
+msgstr KÃ¤lltypen stÃ¶der inte verifikation af ISO MD5 kontrollsummor, hoppar 
Ã¶ver
 
 #: ../liveusb/creator.py:1146
 msgid Synchronizing data on disk...
@@ -333,7 +333,7 @@ msgstr MÃ¥lenhet
 msgid 
 The Master Boot Record on your device is blank. Pressing 'Create Live USB' 
 again will reset the MBR on this device.
-msgstr Master Boot Record pÃ¥ din enhet Ã¤r tom. Tryck pÃ¥ 'Skapa Live USB' 
igen fÃ¶r att Ã¥terstÃ¤lla MBR pÃ¥ den hÃ¤r enheten.
+msgstr Master Boot Record pÃ¥ din enhet Ã¤r tom. Tryck pÃ¥ 'Skapa Live USB' 
igen fÃ¶r att nollstÃ¤lla MBR pÃ¥ den hÃ¤r enheten.
 
 #: ../liveusb/gui.py:791
 msgid 
@@ -361,13 +361,13 @@ msgid 
 optionally downloading a release (if an existing one wasn't selected),  
 extracting the ISO to the USB device, creating the persistent overlay, and 
 installing the bootloader.
-msgstr Den hÃ¤r knappen startar processen fÃ¶r att skapa en LiveUSB. Detta 
innbÃ¤r nedladdning av en utgÃ¥va (om inte en redan existerande valts), 
uppackning av ISO-filen

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 9a2b423f77ec79f727489a55db245bcff2e2aa3b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 18:15:56 2013 +

Update translations for liveusb-creator
---
 sv/sv.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 0ca1583..c08379d 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 17:40+\n
+PO-Revision-Date: 2013-11-06 17:50+\n
 Last-Translator: WinterFairy winterfa...@riseup.net\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -555,7 +555,7 @@ msgstr Skrev till enheten med %(speed)d MB/sek
 msgid 
 You are going to install Tails on the %(size)s %(vendor)s %(model)s device 
 (%(device)s). All data on the selected drive will be lost. Continue?
-msgstr Du Ã¤r pÃ¥ vÃ¤g att installera Tails pÃ¥ enheten %(size)s %(vendor)s 
%(model)s (%(device)s). Alla data pÃ¥ den valda enheten kommer att gÃ¥ 
fÃ¶rlorad. Vill du fortsÃ¤tta?
+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:715
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2013-11-06 Thread translation

commit 6fb773bad2c983bb5ff599a007a2437832171a5b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 18:16:00 2013 +

Update translations for liveusb-creator_completed
---
 sv/sv.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 0ca1583..c08379d 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 17:40+\n
+PO-Revision-Date: 2013-11-06 17:50+\n
 Last-Translator: WinterFairy winterfa...@riseup.net\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -555,7 +555,7 @@ msgstr Skrev till enheten med %(speed)d MB/sek
 msgid 
 You are going to install Tails on the %(size)s %(vendor)s %(model)s device 
 (%(device)s). All data on the selected drive will be lost. Continue?
-msgstr Du Ã¤r pÃ¥ vÃ¤g att installera Tails pÃ¥ enheten %(size)s %(vendor)s 
%(model)s (%(device)s). Alla data pÃ¥ den valda enheten kommer att gÃ¥ 
fÃ¶rlorad. Vill du fortsÃ¤tta?
+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:715
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/maint-2.4] add back old version of TBB 3.0 until Mike fixes the update mechanism

2013-11-06 Thread erinn

commit cadb6dc2d665867b2d4ddf09011739d859edae25
Author: Erinn Clark er...@torproject.org
Date:   Wed Nov 6 16:34:15 2013 -0200

add back old version of TBB 3.0 until Mike fixes the update mechanism
---
 build-scripts/recommended-versions |3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index 3d2cb2d..fc84f09 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -5,6 +5,9 @@
 2.4.17-rc-1-MacOS,
 2.4.17-rc-1-Windows,
 2.4.17-rc-1-Linux,
+3.0-alpha-4-Linux,
+3.0-alpha-4-MacOS,
+3.0-alpha-4-Windows,
 3.0-beta-1-Linux,
 3.0-beta-1-MacOS,
 3.0-beta-1-Windows

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/master] add back old version of TBB 3.0 until Mike fixes the update mechanism

2013-11-06 Thread erinn

commit cadb6dc2d665867b2d4ddf09011739d859edae25
Author: Erinn Clark er...@torproject.org
Date:   Wed Nov 6 16:34:15 2013 -0200

add back old version of TBB 3.0 until Mike fixes the update mechanism
---
 build-scripts/recommended-versions |3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index 3d2cb2d..fc84f09 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -5,6 +5,9 @@
 2.4.17-rc-1-MacOS,
 2.4.17-rc-1-Windows,
 2.4.17-rc-1-Linux,
+3.0-alpha-4-Linux,
+3.0-alpha-4-MacOS,
+3.0-alpha-4-Windows,
 3.0-beta-1-Linux,
 3.0-beta-1-MacOS,
 3.0-beta-1-Windows



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

2013-11-06 Thread erinn

commit b76cac416eaab4db7e5186b549fd35e7b6a22c54
Merge: 80fa9ed cadb6dc
Author: Erinn Clark er...@torproject.org
Date:   Wed Nov 6 16:34:42 2013 -0200

Merge branch 'maint-2.4'

 build-scripts/recommended-versions |3 +++
 1 file changed, 3 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 676f205ec825f4c49190ac69719004a66674ec0b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 19:45:57 2013 +

Update translations for liveusb-creator
---
 pl/pl.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pl/pl.po b/pl/pl.po
index c276b7d..ada634c 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -14,8 +14,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 09:28+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 19:43+\n
+Last-Translator: sebx\n
 Language-Team: Polish 
(http://www.transifex.com/projects/p/torproject/language/pl/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -26,7 +26,7 @@ msgstr 
 #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
 msgid %(distribution)s installer
-msgstr 
+msgstr %(distribution)s instalator
 
 #: ../liveusb/gui.py:803
 #, python-format
@@ -36,7 +36,7 @@ msgstr Wybrano %(filename)s
 #: ../liveusb/gui.py:440
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
-msgstr 
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 
 #: ../liveusb/creator.py:1020
 #, python-format
@@ -50,7 +50,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
-msgstr 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 
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;\Potrzebujesz pomocy? Czytaj /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentacjÄ/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:160
 msgid 
@@ -59,7 +59,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 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;\Kopiuj 
obecnie uruchomiony Tails na USB lub kartÄ SD. Wszystkie dane na wybranym 
dysku zostanÄ utracone./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:162
 msgid 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2013-11-06 Thread translation

commit a44139ab693c9879118525c320d6c58bf517cd18
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 20:16:02 2013 +

Update translations for tails-persistence-setup_completed
---
 pl/pl.po |   58 +-
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/pl/pl.po b/pl/pl.po
index 19c709b..5e9ff5d 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # bogdrozd bo...@gazeta.pl, 2013
-# sebx sebastia...@rocketmail.com, 2013
+# sebx, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-29 14:53+0200\n
-PO-Revision-Date: 2013-10-27 20:00+\n
-Last-Translator: sebx sebastia...@rocketmail.com\n
+Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
+POT-Creation-Date: 2013-10-26 23:24+0200\n
+PO-Revision-Date: 2013-11-06 20:13+\n
+Last-Translator: sebx\n
 Language-Team: Polish 
(http://www.transifex.com/projects/p/torproject/language/pl/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -116,77 +116,77 @@ msgid 
 Symlink into $HOME every file or directory found in the `dotfiles' directory
 msgstr ZrÃ³b dowiÄzania w $HOME do kaÅ¼dego pliku lub katalogu znajdujÄcego 
siÄ w katalogu `dotfiles'
 
-#: ../lib/Tails/Persistence/Setup.pm:257
+#: ../lib/Tails/Persistence/Setup.pm:258
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
 msgstr Nie moÅ¼na znaleÅºÄ urzÄdzenia, z ktÃ³rego dziaÅa Tails. MoÅ¼e 
uÅ¼yto opcji `toram'?
 
-#: ../lib/Tails/Persistence/Setup.pm:276
+#: ../lib/Tails/Persistence/Setup.pm:277
 msgid Setup Tails persistent volume
 msgstr Ustaw wolumen przechowywania danych Tails
 
-#: ../lib/Tails/Persistence/Setup.pm:420
+#: ../lib/Tails/Persistence/Setup.pm:443
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr UrzÄdzenie %s juÅ¼ ma wolumen przechowywania danych.
 
-#: ../lib/Tails/Persistence/Setup.pm:428
+#: ../lib/Tails/Persistence/Setup.pm:451
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr UrzÄdzenie %s nie ma wystarczajÄco wolnego miejsca.
 
-#: ../lib/Tails/Persistence/Setup.pm:436 ../lib/Tails/Persistence/Setup.pm:450
+#: ../lib/Tails/Persistence/Setup.pm:459 ../lib/Tails/Persistence/Setup.pm:473
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr UrzÄdzenie %s nie ma wolumenu przechowywania danych.
 
-#: ../lib/Tails/Persistence/Setup.pm:442
+#: ../lib/Tails/Persistence/Setup.pm:465
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr Nie moÅ¼na usunÄÄ wolumenu przechowywania danych, gdy jest uÅ¼ywany. 
Powinno siÄ ponownie uruchomiÄ Tails bez przechowywania danych.
 
-#: ../lib/Tails/Persistence/Setup.pm:461
+#: ../lib/Tails/Persistence/Setup.pm:484
 msgid Persistence volume is not unlocked.
 msgstr Wolumen przechowywania danych nie jest odblokowany.
 
-#: ../lib/Tails/Persistence/Setup.pm:466
+#: ../lib/Tails/Persistence/Setup.pm:489
 msgid Persistence volume is not mounted.
 msgstr Wolumen przechowywania danych nie jest zamontowany.
 
-#: ../lib/Tails/Persistence/Setup.pm:471
+#: ../lib/Tails/Persistence/Setup.pm:494
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr Nie moÅ¼na odczytaÄ wolumenu przechowywania danych. Problemy z 
uprawnieniami lub wÅasnoÅciÄ?
 
-#: ../lib/Tails/Persistence/Setup.pm:476
+#: ../lib/Tails/Persistence/Setup.pm:499
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr Nie moÅ¼na zapisaÄ wolumenu przechowywania danych. MoÅ¼e zostaÅ 
zamontowany tylko do odczytu?
 
-#: ../lib/Tails/Persistence/Setup.pm:485
+#: ../lib/Tails/Persistence/Setup.pm:508
 #, perl-format
-msgid Tails is running from non-USB device %s.
-msgstr Tails dziaÅa z urzÄdzenia %s, nie bÄdÄcego urzÄdzeniem USB.
+msgid Tails is running from non-USB / non-SDIO device %s.
+msgstr Tails nie jest uruchomiony z USB / karty SD %s.
 
-#: ../lib/Tails/Persistence/Setup.pm:491
+#: ../lib/Tails/Persistence/Setup.pm:514
 #, perl-format
 msgid Device %s is optical.
 msgstr UrzÄdzenie %s jest napÄdem optycznym.
 
-#: ../lib/Tails/Persistence/Setup.pm:498
+#: ../lib/Tails/Persistence/Setup.pm:521
 #, perl-format
 msgid Device %s was not created using Tails USB installer.
 msgstr UrzÄdzenie %s nie zostaÅo utworzone instalatorem Tails USB.
 
-#: ../lib/Tails/Persistence/Setup.pm:532
+#: ../lib/Tails/Persistence/Setup.pm:555
 msgid Error
 msgstr BÅÄd
 
-#: ../lib/Tails/Persistence/Setup.pm:839
+#: ../lib/Tails/Persistence/Setup.pm:872
 msgid Persistence wizard - Finished
 msgstr Kreator przechowywania danych - Koniec
 
-#: ../lib/Tails/Persistence/Setup.pm:842
+#: ../lib/Tails/Persistence/Setup.pm:875
 msgid 
 Any changes you have made will only take effect after restarting Tails.\n
 \n
@@ -251,11 +251,19

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2013-11-06 Thread translation

commit 459878d569fa76c2f4ae09f8c38bb14e351cdf71
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 20:15:58 2013 +

Update translations for liveusb-creator_completed
---
 pl/pl.po |  243 +-
 1 file changed, 129 insertions(+), 114 deletions(-)

diff --git a/pl/pl.po b/pl/pl.po
index c3542a2..99ee6e5 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -8,14 +8,14 @@
 # Quaithe ewa.inf...@gmail.com, 2013
 # Quaithe ewa.inf...@gmail.com, 2013
 # Piotr DrÄg piotrd...@gmail.com, 2008
-# sebx sebastia...@rocketmail.com, 2013
+# sebx, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 11:21+0200\n
-PO-Revision-Date: 2013-10-27 13:40+\n
-Last-Translator: sebx sebastia...@rocketmail.com\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-17 13:19+0200\n
+PO-Revision-Date: 2013-11-06 20:10+\n
+Last-Translator: sebx\n
 Language-Team: Polish 
(http://www.transifex.com/projects/p/torproject/language/pl/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -23,66 +23,71 @@ msgstr 
 Language: pl\n
 Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10=2  n%10=4  (n%10010 
|| n%100=20) ? 1 : 2);\n
 
-#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149
+#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
-msgid %(distribution)s LiveUSB Creator
-msgstr Kreator LiveUSB %(distribution)s
+msgid %(distribution)s installer
+msgstr %(distribution)s instalator
 
-#: ../liveusb/gui.py:776
+#: ../liveusb/gui.py:803
 #, python-format
 msgid %(filename)s selected
 msgstr Wybrano %(filename)s
 
-#: ../liveusb/creator.py:1004
+#: ../liveusb/gui.py:440
+#, python-format
+msgid %(vendor)s %(model)s (%(details)s) - %(device)s
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
+
+#: ../liveusb/creator.py:1020
 #, python-format
 msgid %s already bootable
 msgstr %s jest juÅ¼ startowa
 
-#: ../liveusb/launcher_ui.py:156
+#: ../liveusb/launcher_ui.py:165
 msgid 
 !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;\n
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;â htmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â p, li { 
white-space: pre-wrap; }â /style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â 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;\Potrzebujesz pomocy? Przeczytaj /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentacjÄ/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
+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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan 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\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 
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;\Potrzebujesz pomocy? Czytaj /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\dokumentacjÄ/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
-#: ../liveusb/launcher_ui.py:151
+#: ../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
 htmlheadmeta name=\qrichtext\ content=\1\ /style 
type=\text/css\\n
 p, li { white-space: pre-wrap; }\n
 /style/headbody style=\ font-family:'Sans

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2013-11-06 Thread translation

commit 354eee762d2bba98dcbd893343b38f8e928831a9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 20:46:02 2013 +

Update translations for tails-persistence-setup_completed
---
 pl/pl.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/pl.po b/pl/pl.po
index 5e9ff5d..ffb9b96 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-10-26 23:24+0200\n
-PO-Revision-Date: 2013-11-06 20:13+\n
+PO-Revision-Date: 2013-11-06 20:20+\n
 Last-Translator: sebx\n
 Language-Team: Polish 
(http://www.transifex.com/projects/p/torproject/language/pl/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2013-11-06 Thread translation

commit d6a3eeb344259e635638918e24d3498b5486869b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 20:45:59 2013 +

Update translations for tails-persistence-setup
---
 pl/pl.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/pl.po b/pl/pl.po
index 5e9ff5d..ffb9b96 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-10-26 23:24+0200\n
-PO-Revision-Date: 2013-11-06 20:13+\n
+PO-Revision-Date: 2013-11-06 20:20+\n
 Last-Translator: sebx\n
 Language-Team: Polish 
(http://www.transifex.com/projects/p/torproject/language/pl/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2013-11-06 Thread translation

commit 5bba85b56e336a925c5d184eca9840fd45977afd
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 20:46:17 2013 +

Update translations for tails-misc
---
 pl.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pl.po b/pl.po
index a1884df..74a5616 100644
--- a/pl.po
+++ b/pl.po
@@ -9,8 +9,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 20:20+\n
+Last-Translator: sebx\n
 Language-Team: Polish 
(http://www.transifex.com/projects/p/torproject/language/pl/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -34,7 +34,7 @@ msgid 
 pAnyone who can see this reply will probably infer you are\n
 a Tails user. Time to wonder how much you trust your\n
 Internet and mailbox providers?/p\n
-msgstr h1PomÃ³Å¼ nam naprawiÄ bÅÄd!/h1â pPrzeczytaj a 
href=\%s\instrukcje jak zgÅaszaÄ bÅÄdy/a./pâ pstrongNie 
ujawniaj wiÄcej informacji o sobie niÅ¼ to \nkonieczne!/strong/pâ 
h2JeÅ¼eli chcesz podaÄ adres email/h2\npJeÅ¼eli zgadzasz siÄ na 
czÄÅciowe ujawnienie swojej toÅ¼samoÅci\ndeweloperom Tails, moÅ¼esz podaÄ 
swÃ³j adres email\nÅ¼ebyÅmy mogli zadaÄ Ci dodatkowe pytania dotyczÄce 
bÅÄdu. Ponadto, jeÅ¼eli podasz\nklucz publiczny PGP umoÅ¼liwisz nam 
szyfrowanie tego typu \nkomunikacji./p\npKaÅ¼dy kto zobaczy tÄ odpowiedÅº 
domyÅli siÄ, Å¼e jesteÅ\nuÅ¼ytkownikiem Tails. Czas aby siÄ zastanowiÄ jak 
bardzo ufasz swoim dostawcom\ninternetu i poczty./p\n
+msgstr h1PomÃ³Å¼ naprawiÄ nam bÅÄd!/h1â pPrzeczytaj a 
href=\%s\instrukcje jak zgÅaszaÄ bÅÄdy/a./pâ pstrongNie 
ujawniaj wiÄcej informacji o sobie niÅ¼ to \nkonieczne!/strong/pâ 
h2JeÅ¼eli chcesz podaÄ swÃ³j adres email/h2\npJeÅ¼eli zgadzasz siÄ na 
czÄÅciowe ujawnienie swojej toÅ¼samoÅci\ndeweloperom Tails, moÅ¼esz podaÄ 
swÃ³j adres email\nÅ¼ebyÅmy mogli zadaÄ Ci dodatkowe pytania dotyczÄce 
bÅÄdu z ktÃ³rym siÄ spotkaÅeÅ. Ponadto, jeÅ¼eli podasz\nklucz publiczny 
PGP umoÅ¼liwisz nam szyfrowanie tego typu \nkomunikacji./p\npKaÅ¼dy kto 
zobaczy tÄ odpowiedÅº domyÅli siÄ, Å¼e jesteÅ\nuÅ¼ytkownikiem Tails. Czas 
aby siÄ zastanowiÄ jak bardzo ufasz swoim dostawcom\ninternetu i 
poczty./p\n
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:136
 msgid OpenPGP encryption applet

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [flashproxy/master] factor out certificate checking and pinning into flashproxy.keys

2013-11-06 Thread infinity0

commit 1e541947c32f8d390b5df1cc1c42928e7c058dd5
Author: Ximin Luo infini...@gmx.com
Date:   Wed Nov 6 17:32:21 2013 +

factor out certificate checking and pinning into flashproxy.keys
---
 Makefile |2 +-
 flashproxy-reg-appspot   |   25 -
 flashproxy-reg-email |   31 ---
 flashproxy/keys.py   |   31 +++
 flashproxy/test/test_keys.py |   22 ++
 setup-common.py  |3 ++-
 6 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/Makefile b/Makefile
index 2429f33..5623c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ distclean:
 test: check
 check:
$(MAKE_CLIENT) check
-   $(PYTHON) setup-common.py check
+   $(PYTHON) setup-common.py test
cd facilitator  ./facilitator-test
cd proxy  ./flashproxy-test.js
 
diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot
index c47579c..a261f10 100755
--- a/flashproxy-reg-appspot
+++ b/flashproxy-reg-appspot
@@ -13,9 +13,8 @@ import tempfile
 import urlparse
 import urllib2
 
-from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1
+from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, 
check_certificate_pin, temp_cert
 from flashproxy.util import parse_addr_spec, format_addr
-from hashlib import sha1
 
 try:
 from M2Crypto import SSL, X509
@@ -142,31 +141,15 @@ class PinHTTPSConnection(httplib.HTTPSConnection):
 ctx = SSL.Context(tlsv1)
 ctx.set_verify(SSL.verify_peer, 3)
 
-ca_certs_fd, ca_certs_path = 
tempfile.mkstemp(prefix=flashproxy-reg-appspot-,
-dir=get_state_dir(), suffix=.crt)
-try:
-os.write(ca_certs_fd, PIN_GOOGLE_CERT)
-os.close(ca_certs_fd)
-ret = ctx.load_verify_locations(ca_certs_path)
+with temp_cert(PIN_GOOGLE_CERT) as ca_file:
+ret = ctx.load_verify_locations(ca_file.name)
 assert ret == 1
-finally:
-os.unlink(ca_certs_path)
 
 self.sock = SSL.Connection(ctx, sock)
 self.sock.connect((self.host, self.port))
 
 if options.use_certificate_pin:
-found = []
-for cert in self.sock.get_peer_cert_chain():
-pubkey_der = cert.get_pubkey().as_der()
-pubkey_digest = sha1(pubkey_der).digest()
-if pubkey_digest in PIN_GOOGLE_PUBKEY_SHA1:
-break
-found.append(pubkey_digest)
-else:
-found = ( + , .join(x.encode(hex) for x in found) + )
-expected = ( + , .join(x.encode(hex) for x in 
PIN_GOOGLE_PUBKEY_SHA1) + )
-raise ValueError(Public key does not match pin: got %s but 
expected any of %s % (found, expected))
+check_certificate_pin(self.sock, PIN_GOOGLE_PUBKEY_SHA1)
 
 class PinHTTPSHandler(urllib2.HTTPSHandler):
 def https_open(self, req):
diff --git a/flashproxy-reg-email b/flashproxy-reg-email
index 8bc8b6f..4f4599c 100755
--- a/flashproxy-reg-email
+++ b/flashproxy-reg-email
@@ -11,9 +11,8 @@ import sys
 import tempfile
 import urllib
 
-from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, 
DEFAULT_FACILITATOR_PUBKEY_PEM
+from flashproxy.keys import PIN_GOOGLE_CERT, PIN_GOOGLE_PUBKEY_SHA1, 
DEFAULT_FACILITATOR_PUBKEY_PEM, check_certificate_pin, temp_cert
 from flashproxy.util import parse_addr_spec, format_addr
-from hashlib import sha1
 
 try:
 from M2Crypto import BIO, RSA, SSL, X509
@@ -185,11 +184,7 @@ try:
 ctx = SSL.Context(tlsv1)
 ctx.set_verify(SSL.verify_peer, 3)
 
-ca_certs_fd, ca_certs_path = 
tempfile.mkstemp(prefix=flashproxy-reg-email-,
-dir=get_state_dir(), suffix=.crt)
-try:
-os.write(ca_certs_fd, PIN_GOOGLE_CERT)
-os.close(ca_certs_fd)
+with temp_cert(PIN_GOOGLE_CERT) as ca_file:
 # We roll our own initial EHLO/STARTTLS because smtplib.SMTP.starttls
 # doesn't allow enough certificate validation.
 code, msg = smtp.docmd(EHLO, EHLO_FQDN)
@@ -198,10 +193,8 @@ try:
 code, msg = smtp.docmd(STARTTLS)
 if code != 220:
 raise ValueError(Got code %d after STARTTLS % code)
-ret = ctx.load_verify_locations(ca_certs_path)
+ret = ctx.load_verify_locations(ca_file.name)
 assert ret == 1
-finally:
-os.unlink(ca_certs_path)
 
 smtp.sock = SSL.Connection(ctx, smtp.sock)
 smtp.sock.setup_ssl()
@@ -210,23 +203,7 @@ try:
 smtp.file = smtp.sock.makefile()
 
 if options.use_certificate_pin:
-found = []
-for cert in smtp.sock.get_peer_cert_chain():
-pubkey_der = cert.get_pubkey().as_der()
-pubkey_digest = sha1(pubkey_der).digest()
-if pubkey_digest in PIN_GOOGLE_PUBKEY_SHA1:
-break
-found.append(pubkey_digest)
-else:
-found

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2013-11-06 Thread translation

commit 92e78f264b45d021a06dd2263b793ee4102b9f44
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 21:46:15 2013 +

Update translations for tails-misc_completed
---
 de.po |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/de.po b/de.po
index 755da25..efb8ee3 100644
--- a/de.po
+++ b/de.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ivl1705 listmem...@rinnberger.de, 2013
 # skps lma...@emailn.de, 2013
 # MarioBaier26 mario.baie...@gmx.de, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-09-09 12:35+0200\n
-PO-Revision-Date: 2013-10-01 16:22+\n
-Last-Translator: skps lma...@emailn.de\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-10-26 23:41+0200\n
+PO-Revision-Date: 2013-11-06 21:44+\n
+Last-Translator: ivl1705 listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -226,21 +227,21 @@ msgstr Baue Informationen:\n%s
 msgid About Tails
 msgstr Ãber Tails
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
 msgid Your additional software
 msgstr Ihre zusÃ¤tzliche Software
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr Das Upgrade ist fehlgeschlagen. Es kÃ¶nnte an einem Netzwerk-Problem 
liegen. Bitte Ã¼berprÃ¼fen Sie ihre Netzwerkverbindung, starten Sie Tails neu 
oder lesen Sie die System-Logdateien um das Problem zu finden.
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
 msgid The upgrade was successful.
 msgstr Das Upgrade war erfolgreich.
 
@@ -405,9 +406,9 @@ msgid 
 concerns.
 msgstr TrueCrypt wird bald von Tails entfernt, da es Lizensierungs-Probleme 
und Sorgen um die Entwicklung gibt.
 
-#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1
-msgid Report a Bug
-msgstr Einen Bug melden
+#: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid Report an error
+msgstr Einen Fehler melden
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2013-11-06 Thread translation

commit 1ce9fd602213591dcb46b8ff5529e9244fa52606
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 21:46:12 2013 +

Update translations for tails-misc
---
 de.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/de.po b/de.po
index b568f0b..efb8ee3 100644
--- a/de.po
+++ b/de.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ivl1705 listmem...@rinnberger.de, 2013
 # skps lma...@emailn.de, 2013
 # MarioBaier26 mario.baie...@gmx.de, 2013
 msgid 
@@ -10,8 +11,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 21:44+\n
+Last-Translator: ivl1705 listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -407,7 +408,7 @@ msgstr TrueCrypt wird bald von Tails entfernt, da es 
Lizensierungs-Probleme und
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid Report an error
-msgstr 
+msgstr Einen Fehler melden
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
 msgid Tails documentation

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-11-06 Thread translation

commit 04dfa1835033d3550fb66b595d296653d3138331
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 22:15:54 2013 +

Update translations for liveusb-creator
---
 de/de.po |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/de/de.po b/de/de.po
index fbe241c..5d7b505 100644
--- a/de/de.po
+++ b/de/de.po
@@ -8,6 +8,7 @@
 # turbedi theto...@gmail.com, 2013
 # Rutz rut...@gmx.de, 2013
 # tbull tb...@fedoraproject.org, 2009
+# ivl1705 listmem...@rinnberger.de, 2013
 # Marcus Nitzschke marcu...@gmx.de, 2008
 # MarioBaier26 mario.baie...@gmx.de, 2013
 # matsa ma...@riseup.net, 2012
@@ -20,8 +21,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-17 13:19+0200\n
-PO-Revision-Date: 2013-11-06 09:28+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-11-06 22:10+\n
+Last-Translator: ivl1705 listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -32,7 +33,7 @@ msgstr 
 #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158
 #, python-format
 msgid %(distribution)s installer
-msgstr 
+msgstr %(distribution)s Installer
 
 #: ../liveusb/gui.py:803
 #, python-format
@@ -42,7 +43,7 @@ msgstr %(filename)s ausgewÃ¤hlt
 #: ../liveusb/gui.py:440
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
-msgstr 
+msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
 
 #: ../liveusb/creator.py:1020
 #, python-format
@@ -56,7 +57,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\span
 style=\ text-decoration: underline; 
color:#ff;\documentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
-msgstr 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 
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;\Du brauchst Hilfe? Lies die /spana 
href=\file:///usr/share/doc/tails/website/doc/first_steps/installation.de.html\span
 style=\ text-decoration: underline; 
color:#ff;\Dokumentation/span/aspan style=\ 
font-size:10pt;\./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:160
 msgid 
@@ -65,7 +66,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 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;\Kopiere 
das gestartete Tails auf einen USB Stick oder SD Karte. Alle Daten auf dem 
Ziellaufwerk werden gelÃ¶scht./span/p/body/html
 
 #: ../liveusb/launcher_ui.py:162
 msgid 
@@ -74,7 +75,7 @@ msgid 
 p, li { white-space: pre-wrap; }\n
 /style/headbody 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 
+msgstr !DOCTYPE HTML PUBLIC \-//W3C//DTD HTML 4.0//EN\ 
\http://www.w3.org/TR/REC-html40/strict.dtd\;â\nhtmlheadmeta 
name=\qrichtext\ content=\1\ /style type=\text/css\â\np, li { 
white-space: pre-wrap; }â\n/style/headbody style=\ font-family:'Sans 
Serif'; font-size:9pt; font-weight:400; font-style:normal;\â\np 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;\Kopiere

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2013-11-06 Thread translation

commit ce22ef86afc64b734883fc4f24445bbfe9b8b212
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 22:16:13 2013 +

Update translations for tails-misc
---
 de.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de.po b/de.po
index efb8ee3..314da61 100644
--- a/de.po
+++ b/de.po
@@ -11,7 +11,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 21:44+\n
+PO-Revision-Date: 2013-11-06 21:50+\n
 Last-Translator: ivl1705 listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2013-11-06 Thread translation

commit 5e4af4e6b9db0d10875fc0d93aaa3fd1c5646aeb
Author: Translation commit bot translat...@torproject.org
Date:   Wed Nov 6 22:16:15 2013 +

Update translations for tails-misc_completed
---
 de.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de.po b/de.po
index efb8ee3..314da61 100644
--- a/de.po
+++ b/de.po
@@ -11,7 +11,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 21:44+\n
+PO-Revision-Date: 2013-11-06 21:50+\n
 Last-Translator: ivl1705 listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Support building an alternate 'alpha' version for FF24.

2013-11-06 Thread mikeperry

commit 01c6ce6472cbd341367df9b856aba08e46d51eb5
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Nov 6 18:41:18 2013 -0800

Support building an alternate 'alpha' version for FF24.
---
 gitian/Makefile|   16 +--
 gitian/README.build|   18 +---
 gitian/fetch-inputs.sh |   30 +++
 gitian/mkbundle-linux.sh   |7 ++-
 gitian/mkbundle-mac.sh |7 ++-
 gitian/mkbundle-windows.sh |7 ++-
 gitian/versions.alpha  |   49 
 7 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/gitian/Makefile b/gitian/Makefile
index d34b59a..7fe3894 100644
--- a/gitian/Makefile
+++ b/gitian/Makefile
@@ -1,20 +1,32 @@
 all: clean prep build
 
+alpha: clean prep-alpha build-alpha
+
 build:
./mkbundle-linux.sh
./mkbundle-windows.sh
./mkbundle-mac.sh
./hash-bundles.sh
 
+build-alpha:
+   ./mkbundle-linux.sh versions.alpha
+   ./mkbundle-windows.sh versions.alpha
+   ./mkbundle-mac.sh versions.alpha
+   ./hash-bundles.sh
+
 prep:
./check-prerequisites.sh
-   torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/
+   torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions
+
+prep-alpha:
+   ./check-prerequisites.sh
+   torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha
 
 clean:
rm -f ../../gitian-builder/inputs/*gbuilt*
rm -f ../../gitian-builder/inputs/*.yml
rm -f ../../gitian-builder/inputs/bundle.inputs
-   rm -f ../../gitian-builder/inputs/versions
+   rm -f ../../gitian-builder/inputs/versions*
rm -f ../../gitian-builder/inputs/*debug.zip
 
 vmclean:
diff --git a/gitian/README.build b/gitian/README.build
index 2cfd53f..07ea652 100644
--- a/gitian/README.build
+++ b/gitian/README.build
@@ -5,7 +5,7 @@ QuickStart:
  $ make
 
  This will check all of your prerequisites and tell you what you need to
- do to get started.
+ do to get started to build the stable TBB.
 
  If everything checks out OK, it will begin downloading dependencies, and then
  start the build process to produce localized Linux bundles, followed by
@@ -37,12 +37,16 @@ Detailed Explanation of Scripts:
  several helper scripts to make things easier.
 
  0. Makefile: The main Makefile. It has six main commands:
-- prep: Check OS prerequisites and download source dependency inputs
-- build: Build localized bundles for Linux, Windows, and Mac
-- clean: Remove prior partial build stages (Tor and Firefox)
-- vmclean: Remove VM base images
-- distclean: Remove source dependency inputs, and run clean and vmclean
-- all: The default. It calls clean, prep, and then build.
+ - prep: Check OS prerequisites and download source dependency inputs
+ - build: Build localized bundles for Linux, Windows, and Mac
+ - clean: Remove prior partial build stages (Tor and Firefox)
+ - vmclean: Remove VM base images
+ - distclean: Remove source dependency inputs, and run clean and vmclean
+ - all: The default. It calls clean, prep, and then build.
+To build alpha bundles, alternate targets are provided:
+ - alpha: The equivalent to the 'all' rule for alpha packages
+ - build-alpha: The equivalent to the 'build' rule for alpha packages
+ - prep-alpha: The equivalent to the 'prep' rule for alpha packages
  
  1. check-prerequisites.sh: This script checks if your system is capable of
 running Gitian, and if it is not, it tells you what you need to do.
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 2d345ce..7320c74 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -13,18 +13,18 @@ if ! [ -e ./versions ]; then
   exit 1
 fi
 
-. ./versions
-
 WRAPPER_DIR=$(dirname $0)
 WRAPPER_DIR=$(readlink -f $WRAPPER_DIR)
 
-if [ $# -gt 1 ]; then
-  echo 2 Usage: $0 [inputsdir]
-  exit 1
-elif [ $# = 1 ]; then
+if [ $# = 1 ]; then
   INPUTS_DIR=$1
-else
+  . ./versions
+elif [ $# = 2 ]; then
   INPUTS_DIR=$PWD/../../gitian-builder/inputs
+  . $2
+else
+  echo 2 Usage: $0 [inputsdir versions]
+  exit 1
 fi
 
 mkdir -p $INPUTS_DIR
@@ -180,9 +180,11 @@ do
fi
 done
 
-mkdir -p linux-langpacks
-mkdir -p win32-langpacks
-mkdir -p mac-langpacks
+mkdir -p langpacks-$FIREFOX_LANG_VER/linux-langpacks
+mkdir -p langpacks-$FIREFOX_LANG_VER/win32-langpacks
+mkdir -p langpacks-$FIREFOX_LANG_VER/mac-langpacks
+
+cd langpacks-$FIREFOX_LANG_VER
 
 for i in $BUNDLE_LOCALES
 do
@@ -197,9 +199,11 @@ do
   cd ..
 done
 
-$WRAPPER_DIR/build-helpers/dzip.sh win32-langpacks.zip win32-langpacks
-$WRAPPER_DIR/build-helpers/dzip.sh linux-langpacks.zip linux-langpacks
-$WRAPPER_DIR/build-helpers/dzip.sh mac-langpacks.zip mac-langpacks
+$WRAPPER_DIR/build-helpers/dzip.sh ../win32-langpacks.zip win32-langpacks
+$WRAPPER_DIR/build-helpers/dzip.sh ../linux-langpacks.zip linux-langpacks
+$WRAPPER_DIR/build-helpers/dzip.sh

[tor-commits] [torbrowser/master] Remove 3.0alpha4 from the list of recommended TBB versions.

2013-11-06 Thread mikeperry

commit fb560d737d2dbe82a8e86a95c4647298b1e6df30
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Nov 6 19:06:22 2013 -0800

Remove 3.0alpha4 from the list of recommended TBB versions.
---
 build-scripts/recommended-versions |3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index fc84f09..3d2cb2d 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -5,9 +5,6 @@
 2.4.17-rc-1-MacOS,
 2.4.17-rc-1-Windows,
 2.4.17-rc-1-Linux,
-3.0-alpha-4-Linux,
-3.0-alpha-4-MacOS,
-3.0-alpha-4-Windows,
 3.0-beta-1-Linux,
 3.0-beta-1-MacOS,
 3.0-beta-1-Windows



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/maint-2.4] Remove 3.0alpha4 from the list of recommended TBB versions.

2013-11-06 Thread mikeperry

commit fb560d737d2dbe82a8e86a95c4647298b1e6df30
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Nov 6 19:06:22 2013 -0800

Remove 3.0alpha4 from the list of recommended TBB versions.
---
 build-scripts/recommended-versions |3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index fc84f09..3d2cb2d 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -5,9 +5,6 @@
 2.4.17-rc-1-MacOS,
 2.4.17-rc-1-Windows,
 2.4.17-rc-1-Linux,
-3.0-alpha-4-Linux,
-3.0-alpha-4-MacOS,
-3.0-alpha-4-Windows,
 3.0-beta-1-Linux,
 3.0-beta-1-MacOS,
 3.0-beta-1-Windows

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

2013-11-06 Thread mikeperry

commit 9ce786988a0710b1f563eb97ec9acf534b2e6dcd
Merge: b76cac4 fb560d7
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Nov 6 19:13:31 2013 -0800

Merge branch 'maint-2.4'

 build-scripts/recommended-versions |3 ---
 1 file changed, 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Fix issues with tag verification for alternate versions file.

2013-11-06 Thread mikeperry

commit 0a15d499588ad25187e64d851bb1bacb5a436b6f
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Nov 6 20:33:55 2013 -0800

Fix issues with tag verification for alternate versions file.
---
 gitian/fetch-inputs.sh |   13 ++---
 gitian/mkbundle-linux.sh   |   13 ++---
 gitian/mkbundle-mac.sh |   13 ++---
 gitian/mkbundle-windows.sh |   14 +++---
 gitian/verify-tags.sh  |   26 ++
 5 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 7320c74..7c71772 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -18,15 +18,22 @@ WRAPPER_DIR=$(readlink -f $WRAPPER_DIR)
 
 if [ $# = 1 ]; then
   INPUTS_DIR=$1
-  . ./versions
+  VERSIONS_FILE=./versions
 elif [ $# = 2 ]; then
-  INPUTS_DIR=$PWD/../../gitian-builder/inputs
-  . $2
+  INPUTS_DIR=$1
+  VERSIONS_FILE=$2
 else
   echo 2 Usage: $0 [inputsdir versions]
   exit 1
 fi
 
+if ! [ -e $VERSIONS_FILE ]; then
+  echo 2 Error: $VERSIONS_FILE file does not exist
+  exit 1
+fi
+
+. $VERSIONS_FILE
+
 mkdir -p $INPUTS_DIR
 cd $INPUTS_DIR
 
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index 09cbdd4..dc73f96 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -5,11 +5,18 @@
 
 if [ -z $1 ];
 then
-  . ./versions
+  VERSIONS_FILE=./versions
 else
-  . $1
+  VERSIONS_FILE=$1
 fi
 
+if ! [ -e $VERSIONS_FILE ]; then
+  echo 2 Error: $VERSIONS_FILE file does not exist
+  exit 1
+fi
+
+. $VERSIONS_FILE
+
 WRAPPER_DIR=$PWD
 GITIAN_DIR=$PWD/../../gitian-builder
 DESCRIPTOR_DIR=$PWD/descriptors/
@@ -51,7 +58,7 @@ cd $WRAPPER_DIR
 
 if [ z$VERIFY_TAGS = z1 ];
 then
-  ./verify-tags.sh $GITIAN_DIR/inputs || exit 1
+  ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1
   # If we're verifying tags, be explicit to gitian that we
   # want to build from tags.
   NSIS_TAG=refs/tags/$NSIS_TAG
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 97d9535..42eb9ef 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -5,11 +5,18 @@
 
 if [ -z $1 ];
 then
-  . ./versions
+  VERSIONS_FILE=./versions
 else
-  . $1
+  VERSIONS_FILE=$1
 fi
 
+if ! [ -e $VERSIONS_FILE ]; then
+  echo 2 Error: $VERSIONS_FILE file does not exist
+  exit 1
+fi
+
+. $VERSIONS_FILE
+
 WRAPPER_DIR=$PWD
 GITIAN_DIR=$PWD/../../gitian-builder
 DESCRIPTOR_DIR=$PWD/descriptors/
@@ -51,7 +58,7 @@ cd $WRAPPER_DIR
 
 if [ z$VERIFY_TAGS = z1 ];
 then
-  ./verify-tags.sh $GITIAN_DIR/inputs || exit 1
+  ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1
   # If we're verifying tags, be explicit to gitian that we
   # want to build from tags.
   NSIS_TAG=refs/tags/$NSIS_TAG
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index a542099..16a1454 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -5,11 +5,19 @@
 
 if [ -z $1 ];
 then
-  . ./versions
+  VERSIONS_FILE=./versions
 else
-  . $1
+  VERSIONS_FILE=$1
 fi
 
+if ! [ -e $VERSIONS_FILE ]; then
+  echo 2 Error: $VERSIONS_FILE file does not exist
+  exit 1
+fi
+
+. $VERSIONS_FILE
+
+
 WRAPPER_DIR=$PWD
 GITIAN_DIR=$PWD/../../gitian-builder
 DESCRIPTOR_DIR=$PWD/descriptors/
@@ -51,7 +59,7 @@ cd $WRAPPER_DIR
 
 if [ z$VERIFY_TAGS = z1 ];
 then
-  ./verify-tags.sh $GITIAN_DIR/inputs || exit 1
+  ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1
   # If we're verifying tags, be explicit to gitian that we
   # want to build from tags.
   NSIS_TAG=refs/tags/$NSIS_TAG
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 9621065..055cac5 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -4,25 +4,27 @@
 set -e
 set -u
 
-if ! [ -e ./versions ]; then
-  echo 2 Error: ./versions file does not exist
-  exit 1
-fi
-
-. ./versions
-
 WRAPPER_DIR=$(dirname $0)
 WRAPPER_DIR=$(readlink -f $WRAPPER_DIR)
 
-if [ $# -gt 1 ]; then
-  echo 2 Usage: $0 [inputsdir]
-  exit 1
-elif [ $# = 1 ]; then
+if [ $# = 1 ]; then
+  INPUTS_DIR=$1
+  VERSIONS_FILE=./versions
+elif [ $# = 2 ]; then
   INPUTS_DIR=$1
+  VERSIONS_FILE=$2
 else
-  INPUTS_DIR=$PWD/../../gitian-builder/inputs
+  echo 2 Usage: $0 [inputsdir versions]
+  exit 1
 fi
 
+if ! [ -e $VERSIONS_FILE ]; then
+  echo 2 Error: $VERSIONS_FILE file does not exist
+  exit 1
+fi
+
+. $VERSIONS_FILE
+
 cd $INPUTS_DIR
 
 CLEANUP=$(tempfile)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bug #7277: Switch to using Nick's OpenSSL branch w/ timestamp fix.

2013-11-06 Thread mikeperry

commit c9ad5b5d63738d9bfe601ed2c8c91501aa59fb99
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Nov 6 21:22:12 2013 -0800

Bug #7277: Switch to using Nick's OpenSSL branch w/ timestamp fix.

TBB's Tor client will now omit its timestamp in the TLS handshake.
---
 gitian/descriptors/linux/gitian-tor.yml   |6 ++---
 gitian/descriptors/mac/gitian-tor.yml |6 ++---
 gitian/descriptors/windows/gitian-tor.yml |6 ++---
 gitian/fetch-inputs.sh|   34 ++---
 gitian/mkbundle-linux.sh  |3 ++-
 gitian/mkbundle-mac.sh|3 ++-
 gitian/mkbundle-windows.sh|3 ++-
 gitian/verify-tags.sh |1 +
 gitian/versions   |9 
 gitian/versions.alpha |9 
 10 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml 
b/gitian/descriptors/linux/gitian-tor.yml
index dd17184..15437e2 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -23,8 +23,9 @@ remotes:
   dir: libevent
 - url: https://github.com/madler/zlib.git;
   dir: zlib
+- url: https://github.com/nmathewson/openssl.git;
+  dir: openssl
 files:
-- openssl.tar.gz
 - dzip.sh
 script: |
   INSTDIR=$HOME/install
@@ -63,8 +64,7 @@ script: |
   cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/
   cd ..
   #
-  tar xzf openssl.tar.gz
-  cd openssl-*
+  cd openssl
   find -type f | xargs touch --date=$REFERENCE_DATETIME
   #./Configure -shared --prefix=$INSTDIR/openssl linux-elf
   ./config -shared --prefix=$INSTDIR/openssl
diff --git a/gitian/descriptors/mac/gitian-tor.yml 
b/gitian/descriptors/mac/gitian-tor.yml
index 7707555..c0b483b 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -22,8 +22,9 @@ remotes:
   dir: libevent
 - url: https://github.com/madler/zlib.git;
   dir: zlib
+- url: https://github.com/nmathewson/openssl.git;
+  dir: openssl
 files:
-- openssl.tar.gz
 - apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 - 
multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 - dzip.sh
@@ -64,8 +65,7 @@ script: |
   #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/
   #cd ..
   #
-  tar xzf openssl.tar.gz
-  cd openssl-*
+  cd openssl
   find -type f | xargs touch --date=$REFERENCE_DATETIME
   ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS 
darwin-i386-cc --prefix=$INSTDIR/openssl
   make # SHARED_LDFLAGS=-shared -dynamiclib 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/
diff --git a/gitian/descriptors/windows/gitian-tor.yml 
b/gitian/descriptors/windows/gitian-tor.yml
index ff32c2e..c1af6a8 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -22,8 +22,9 @@ remotes:
   dir: libevent
 - url: https://github.com/madler/zlib.git;
   dir: zlib
+- url: https://github.com/nmathewson/openssl.git;
+  dir: openssl
 files:
-- openssl.tar.gz
 - dzip.sh
 script: |
   INSTDIR=$HOME/install
@@ -60,8 +61,7 @@ script: |
   cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/
   cd ..
   #
-  tar xzf openssl.tar.gz
-  cd openssl-*
+  cd openssl
   find -type f | xargs touch --date=$REFERENCE_DATETIME
   ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw 
--prefix=$INSTDIR/openssl
   make
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 7c71772..9295a1f 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -103,20 +103,20 @@ update_git() {
 # Get package files from mirror
 
 # Get+verify sigs that exist
-for i in OPENSSL # OBFSPROXY
-do
-  PACKAGE=${i}_PACKAGE
-  URL=${MIRROR_URL}${!PACKAGE}
-  SUFFIX=asc
-  get ${!PACKAGE} $URL
-  get ${!PACKAGE}.$SUFFIX $URL.$SUFFIX
-
-  if ! verify ${!PACKAGE} $WRAPPER_DIR/gpg/$i.gpg $SUFFIX; then
-echo $i: GPG signature is broken for ${URL}
-mv ${!PACKAGE} ${!PACKAGE}.badgpg
-exit 1
-  fi
-done
+#for i in OPENSSL # OBFSPROXY
+#do
+#  PACKAGE=${i}_PACKAGE
+#  URL=${MIRROR_URL}${!PACKAGE}
+#  SUFFIX=asc
+#  get ${!PACKAGE} $URL
+#  get ${!PACKAGE}.$SUFFIX $URL.$SUFFIX
+#
+#  if ! verify ${!PACKAGE} $WRAPPER_DIR/gpg/$i.gpg $SUFFIX; then
+#echo $i: GPG signature is broken for ${URL}
+#mv ${!PACKAGE} ${!PACKAGE}.badgpg
+#exit 1
+#  fi
+#done
 
 for i in BINUTILS GCC
 do
@@ -147,7 +147,7 @@ done
 # TOOLCHAIN4 each time. Rely only on SHA256 for now..
 mkdir -p verify
 cd verify
-for i in OPENSSL OSXSDK
+for i in OSXSDK #OPENSSL
 do
   URL=${i}_URL
   PACKAGE=${i}_PACKAGE
@@ -177,7 +177,7 @@ fi
 
 # Verify packages with weak or no signatures via direct sha256 check
 # (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
-for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100
+for i in OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100 # OPENSSL
 do
PACKAGE=${i}_PACKAGE
HASH=${i}_HASH
@@ -214,7 +214,6 @@ cd ..
 
 ln

72 matches

Mail list logo