February 2018 - tor-commits - lists.torproject.org

[bridgedb/master] Merge branch 'release/0.6.4'
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 54c662947fb86330ef4a160a0e9fe2c707bd560c Merge: d49e904 4faecd5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 22:24:25 2018 +0000 Merge branch 'release/0.6.4' bridgedb.conf | 5 +++ bridgedb/distributors/common/http.py | 24 ++++++++++--- bridgedb/distributors/moat/server.py | 50 +++++++++++++++++--------- bridgedb/parse/addr.py | 22 ++++++++++++ bridgedb/test/moat_helpers.py | 3 ++ bridgedb/test/test_distributors_common_http.py | 18 ++++++++++ bridgedb/test/test_distributors_moat_server.py | 23 ++++++------ 7 files changed, 112 insertions(+), 33 deletions(-)

1 0

[bridgedb/develop] The JSON data coming into moat is being processed as a str.
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 8b4f7367e82636701997acbb57ae463c4471e3c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 20:02:47 2018 +0000 The JSON data coming into moat is being processed as a str. Duck-typing is why we can't have nice things. --- bridgedb/distributors/moat/server.py | 14 +++++++------- bridgedb/test/test_distributors_moat_server.py | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index d1d0b10..4137f51 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -185,7 +185,7 @@ class JsonAPIErrorResource(JsonAPIResource): object. """ resource.Resource.__init__(self) - self.id = id + self.id = "%s" % id self.type = type self.code = code self.status = status @@ -452,7 +452,7 @@ class CaptchaFetchResource(CaptchaResource): data = { 'data': [{ - 'id': 1, + 'id': '1', 'type': 'moat-challenge', 'version': MOAT_API_VERSION, 'transport': preferred, @@ -565,7 +565,7 @@ class CaptchaCheckResource(CaptchaResource): raise ValueError( "Bad JSON API object type: expected %s got %s" % ("moat-solution", data["type"])) - elif data["id"] != 2: + elif data["id"] != "2": raise ValueError( "Bad JSON API data id: expected 2 got %s" % (data["id"])) @@ -632,15 +632,15 @@ class CaptchaCheckResource(CaptchaResource): """ if id == 4: error_response = resource419 - error_response.id = 4 + error_response.id = "4" error_response.detail = "The CAPTCHA solution was incorrect." elif id == 5: error_response = resource419 - error_response.id = 5 + error_response.id = "5" error_response.detail = "The CAPTCHA challenge timed out." elif id == 6: error_response = resource404 - error_response.id = 6 + error_response.id = "6" error_response.detail = ("No bridges available to fulfill " "request: %s.") % bridgeRequest @@ -673,7 +673,7 @@ class CaptchaCheckResource(CaptchaResource): data = { "data": [{ - "id": 3, + "id": '3', "type": 'moat-bridges', "version": MOAT_API_VERSION, "bridges": None, diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index 2f84557..f29f224 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -233,7 +233,7 @@ class JsonAPIErrorResourceTests(unittest.TestCase): self.use_resource(server.JsonAPIErrorResource()) error = self.do_render_for_method(b'GET') - self.assertEqual(error['id'], 0) + self.assertEqual(error['id'], '0') self.assertEqual(error['type'], '') self.assertEqual(error['code'], 200) self.assertEqual(error['status'], 'OK') @@ -640,7 +640,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def create_valid_POST_with_challenge(self, challenge): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -674,7 +674,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_withoutBlockIn(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -740,7 +740,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_extractClientSolution_weird_transport(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'dinosaur', @@ -759,7 +759,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_extractClientSolution_wrong_version(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': '0.0.1', # this version never existed 'transport': 'obfs4', @@ -778,7 +778,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): def test_extractClientSolution_wrong_type(self): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'boat-revolution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -809,7 +809,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertEqual(error['status'], "No You're A Teapot") self.assertEqual(error['code'], 419) self.assertEqual(error['detail'], "The CAPTCHA challenge timed out.") - self.assertEqual(error['id'], 5) + self.assertEqual(error['id'], '5') def test_checkSolution(self): request = self.create_valid_POST_make_new_challenge() @@ -840,7 +840,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertEqual(error['detail'], "The CAPTCHA solution was incorrect.") self.assertEqual(error['version'], server.MOAT_API_VERSION) self.assertEqual(error['type'], "moat-bridges") - self.assertEqual(error['id'], 4) + self.assertEqual(error['id'], '4') def test_createBridgeRequest(self): request = self.create_valid_POST_with_challenge(self.expiredChallenge) @@ -909,7 +909,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertIsNotNone(data['bridges']) self.assertEqual(data['version'], server.MOAT_API_VERSION) self.assertEqual(data['type'], 'moat-bridges') - self.assertEqual(data['id'], 3) + self.assertEqual(data['id'], '3') def test_render_POST_unexpired_with_qrcode(self): request = DummyRequest([self.pagename]) @@ -925,7 +925,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): data = { 'data': [{ - 'id': 2, + 'id': '2', 'type': 'moat-solution', 'version': server.MOAT_API_VERSION, 'transport': 'obfs4', @@ -953,7 +953,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): self.assertIsNotNone(data['bridges']) self.assertEqual(data['version'], server.MOAT_API_VERSION) self.assertEqual(data['type'], 'moat-bridges') - self.assertEqual(data['id'], 3) + self.assertEqual(data['id'], '3') class AddMoatServerTests(unittest.TestCase):

1 0

[bridgedb/develop] Add config option to skip loopback addresses in X-Forwarded-For parsing.
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit bf7ec9eeb61908bd3bc39efc68281638504cd3cf Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 21:11:21 2018 +0000 Add config option to skip loopback addresses in X-Forwarded-For parsing. --- bridgedb.conf | 5 ++++ bridgedb/distributors/common/http.py | 24 +++++++++++++---- bridgedb/distributors/moat/server.py | 36 +++++++++++++++++++------- bridgedb/parse/addr.py | 22 ++++++++++++++++ bridgedb/test/moat_helpers.py | 3 +++ bridgedb/test/test_distributors_common_http.py | 18 +++++++++++++ bridgedb/test/test_distributors_moat_server.py | 1 + 7 files changed, 94 insertions(+), 15 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 724c802..7700917 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -345,6 +345,11 @@ MOAT_HTTP_PORT = None # the *last* entry from its X-Forwarded-For header as the client's IP. MOAT_USE_IP_FROM_FORWARDED_HEADER = True +# If True, there is a misconfigured proxy relaying incoming messages +# to us: take the *last* entry in the X-Forwarded-For header which is +# not a loopback address (127.0.0.1/8) as the client's IP. +MOAT_SKIP_LOOPBACK_ADDRESSES = True + # How many clusters do we group IPs in when distributing bridges based on IP? # Note that if PROXY_LIST_FILES is set (below), what we actually do here # is use one higher than the number here, and the extra cluster is used diff --git a/bridgedb/distributors/common/http.py b/bridgedb/distributors/common/http.py index 86c26b8..3bd7b41 100644 --- a/bridgedb/distributors/common/http.py +++ b/bridgedb/distributors/common/http.py @@ -21,6 +21,7 @@ import logging import os from bridgedb.parse.addr import isIPAddress +from bridgedb.parse.addr import isLoopback #: The fully-qualified domain name for any and all web servers we run. @@ -54,7 +55,7 @@ def getFQDN(): """ return SERVER_PUBLIC_FQDN -def getClientIP(request, useForwardedHeader=False): +def getClientIP(request, useForwardedHeader=False, skipLoopback=False): """Get the client's IP address from the ``'X-Forwarded-For:'`` header, or from the :api:`request <twisted.web.server.Request>`. @@ -62,6 +63,9 @@ def getClientIP(request, useForwardedHeader=False): :param request: A ``Request`` for a :api:`twisted.web.resource.Resource`. :param bool useForwardedHeader: If ``True``, attempt to get the client's IP address from the ``'X-Forwarded-For:'`` header. + :param bool skipLoopback: If ``True``, and ``useForwardedHeader`` is + also ``True``, then skip any loopback addresses (127.0.0.1/8) when + parsing the X-Forwarded-For header. :rtype: ``None`` or :any:`str` :returns: The client's IP address, if it was obtainable. """ @@ -70,10 +74,20 @@ def getClientIP(request, useForwardedHeader=False): if useForwardedHeader: header = request.getHeader("X-Forwarded-For") if header: - ip = header.split(",")[-1].strip() - if not isIPAddress(ip): - logging.warn("Got weird X-Forwarded-For value %r" % header) - ip = None + index = -1 + ip = header.split(",")[index].strip() + if skipLoopback: + logging.info(("Parsing X-Forwarded-For again, ignoring " + "loopback addresses...")) + while isLoopback(ip): + index -= 1 + ip = header.split(",")[index].strip() + if not skipLoopback and isLoopback(ip): + logging.warn("Accepting loopback address: %s" % ip) + else: + if not isIPAddress(ip): + logging.warn("Got weird X-Forwarded-For value %r" % header) + ip = None else: ip = request.getClientIP() diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index 4137f51..509d471 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -134,9 +134,17 @@ class JsonAPIResource(resource.Resource): """A resource which conforms to the `JSON API spec <http://jsonapi.org/>`__. """ - def __init__(self, useForwardedHeader=True): + def __init__(self, useForwardedHeader=True, skipLoopback=False): + """Create a JSON API resource, containing either error(s) or data. + + :param bool useForwardedHeader: If ``True``, obtain the client's IP + address from the ``X-Forwarded-For`` HTTP header. + :param bool skipLoopback: Skip loopback addresses when parsing the + X-Forwarded-For header. + """ resource.Resource.__init__(self) self.useForwardedHeader = useForwardedHeader + self.skipLoopback = skipLoopback def getClientIP(self, request): """Get the client's IP address from the ``'X-Forwarded-For:'`` @@ -148,7 +156,7 @@ class JsonAPIResource(resource.Resource): :rtype: ``None`` or :any:`str` :returns: The client's IP address, if it was obtainable. """ - return getClientIP(request, self.useForwardedHeader) + return getClientIP(request, self.useForwardedHeader, self.skipLoopback) def formatDataForResponse(self, data, request): """Format a dictionary of ``data`` into JSON and add necessary response @@ -233,8 +241,8 @@ class CustomErrorHandlingResource(resource.Resource): class JsonAPIDataResource(JsonAPIResource): """A resource which returns some JSON API data.""" - def __init__(self, useForwardedHeader=True): - JsonAPIResource.__init__(self, useForwardedHeader) + def __init__(self, useForwardedHeader=True, skipLoopback=False): + JsonAPIResource.__init__(self, useForwardedHeader, skipLoopback) def checkRequestHeaders(self, request): """The JSON API specification requires servers to respond with certain HTTP @@ -288,8 +296,8 @@ class CaptchaResource(JsonAPIDataResource): """A CAPTCHA.""" def __init__(self, hmacKey=None, publicKey=None, secretKey=None, - useForwardedHeader=True): - JsonAPIDataResource.__init__(self, useForwardedHeader) + useForwardedHeader=True, skipLoopback=False): + JsonAPIDataResource.__init__(self, useForwardedHeader, skipLoopback) self.hmacKey = hmacKey self.publicKey = publicKey self.secretKey = secretKey @@ -301,7 +309,7 @@ class CaptchaFetchResource(CaptchaResource): isLeaf = True def __init__(self, hmacKey=None, publicKey=None, secretKey=None, - captchaDir="captchas", useForwardedHeader=True): + captchaDir="captchas", useForwardedHeader=True, skipLoopback=False): """DOCDOC :param bytes hmacKey: The master HMAC key, used for validating CAPTCHA @@ -319,6 +327,8 @@ class CaptchaFetchResource(CaptchaResource): :param str captchaDir: The directory where the cached CAPTCHA images :param bool useForwardedHeader: If ``True``, obtain the client's IP address from the ``X-Forwarded-For`` HTTP header. + :param bool skipLoopback: Skip loopback addresses when parsing the + X-Forwarded-For header. """ CaptchaResource.__init__(self, hmacKey, publicKey, secretKey, useForwardedHeader) @@ -477,7 +487,7 @@ class CaptchaCheckResource(CaptchaResource): def __init__(self, distributor, schedule, N=1, hmacKey=None, publicKey=None, secretKey=None, - useForwardedHeader=True): + useForwardedHeader=True, skipLoopback=False): """Create a new resource for checking CAPTCHA solutions and returning bridges to a client. @@ -490,6 +500,8 @@ class CaptchaCheckResource(CaptchaResource): :param int N: The number of bridges to hand out per query. :param bool useForwardedHeader: Whether or not we should use the the X-Forwarded-For header instead of the source IP address. + :param bool skipLoopback: Skip loopback addresses when parsing the + X-Forwarded-For header. """ CaptchaResource.__init__(self, hmacKey, publicKey, secretKey, useForwardedHeader) @@ -748,6 +760,7 @@ def addMoatServer(config, distributor): MOAT_BRIDGES_PER_ANSWER MOAT_TRANSPORT_PREFERENCE_LIST MOAT_USE_IP_FROM_FORWARDED_HEADER + MOAT_SKIP_LOOPBACK_ADDRESSES MOAT_ROTATION_PERIOD MOAT_GIMP_CAPTCHA_HMAC_KEYFILE MOAT_GIMP_CAPTCHA_RSA_KEYFILE @@ -760,6 +773,7 @@ def addMoatServer(config, distributor): captcha = None fwdHeaders = config.MOAT_USE_IP_FROM_FORWARDED_HEADER numBridges = config.MOAT_BRIDGES_PER_ANSWER + skipLoopback = config.MOAT_SKIP_LOOPBACK_ADDRESSES logging.info("Starting moat servers...") @@ -785,9 +799,11 @@ def addMoatServer(config, distributor): meek = CustomErrorHandlingResource() moat = CustomErrorHandlingResource() fetch = CaptchaFetchResource(hmacKey, publicKey, secretKey, - config.GIMP_CAPTCHA_DIR, fwdHeaders) + config.GIMP_CAPTCHA_DIR, + fwdHeaders, skipLoopback) check = CaptchaCheckResource(distributor, sched, numBridges, - hmacKey, publicKey, secretKey, fwdHeaders) + hmacKey, publicKey, secretKey, + fwdHeaders, skipLoopback) moat.putChild("fetch", fetch) moat.putChild("check", check) diff --git a/bridgedb/parse/addr.py b/bridgedb/parse/addr.py index bf5a8a5..90bc1d5 100644 --- a/bridgedb/parse/addr.py +++ b/bridgedb/parse/addr.py @@ -435,6 +435,28 @@ def isValidIP(ip): return False return True +def isLoopback(ip): + """Determine if ``ip`` is a loopback or localhost address (127.0.0.1/8). + + :type: ``str`` or ``ipaddr.IPAddress`` + :param ip: An IP address. + :rtype: bool + :returns: ``True`` if the IP was a loopback or localhost address; ``False`` + otherwise. + """ + try: + if isinstance(ip, basestring): + ip = ipaddr.IPAddress(ip) + + if ip.is_loopback: + return True + else: + return False + except Exception as err: + logging.debug("Error attempting to parse IP address: %s", ip) + + return False + def normalizeEmail(emailaddr, domainmap, domainrules, ignorePlus=True): """Normalise an email address according to the processing rules for its canonical originating domain. diff --git a/bridgedb/test/moat_helpers.py b/bridgedb/test/moat_helpers.py index c7f7718..07b44a0 100644 --- a/bridgedb/test/moat_helpers.py +++ b/bridgedb/test/moat_helpers.py @@ -42,6 +42,7 @@ MOAT_HTTPS_PORT = None MOAT_HTTP_IP = None MOAT_HTTP_PORT = None MOAT_USE_IP_FROM_FORWARDED_HEADER = True +MOAT_SKIP_LOOPBACK_ADDRESSES = True MOAT_N_IP_CLUSTERS = 4 MOAT_ROTATION_PERIOD = "3 hours" MOAT_GIMP_CAPTCHA_HMAC_KEYFILE = 'moat_captcha_hmac_key' @@ -63,6 +64,7 @@ MOAT_HTTP_PORT = %r MOAT_BRIDGES_PER_ANSWER = %r MOAT_TRANSPORT_PREFERENCE_LIST = %r MOAT_USE_IP_FROM_FORWARDED_HEADER = %r +MOAT_SKIP_LOOPBACK_ADDRESSES = %r MOAT_N_IP_CLUSTERS = %r MOAT_ROTATION_PERIOD = %r MOAT_GIMP_CAPTCHA_HMAC_KEYFILE = %r @@ -82,6 +84,7 @@ MOAT_GIMP_CAPTCHA_RSA_KEYFILE = %r MOAT_BRIDGES_PER_ANSWER, MOAT_TRANSPORT_PREFERENCE_LIST, MOAT_USE_IP_FROM_FORWARDED_HEADER, + MOAT_SKIP_LOOPBACK_ADDRESSES, MOAT_N_IP_CLUSTERS, MOAT_ROTATION_PERIOD, MOAT_GIMP_CAPTCHA_HMAC_KEYFILE, diff --git a/bridgedb/test/test_distributors_common_http.py b/bridgedb/test/test_distributors_common_http.py index 60759e4..ff3da41 100644 --- a/bridgedb/test/test_distributors_common_http.py +++ b/bridgedb/test/test_distributors_common_http.py @@ -91,6 +91,24 @@ class GetClientIPTests(unittest.TestCase): clientIP = server.getClientIP(request, useForwardedHeader=True) self.assertEqual(clientIP, None) + def test_getClientIP_XForwardedFor_skip_loopback(self): + request = self.createRequestWithIPs() + request.headers.update({'x-forwarded-for': '3.3.3.3, 127.0.0.1'}) + clientIP = server.getClientIP(request, useForwardedHeader=True, skipLoopback=True) + self.assertEqual(clientIP, '3.3.3.3') + + def test_getClientIP_XForwardedFor_skip_loopback_multiple(self): + request = self.createRequestWithIPs() + request.headers.update({'x-forwarded-for': '3.3.3.3, 127.0.0.6, 127.0.0.1'}) + clientIP = server.getClientIP(request, useForwardedHeader=True, skipLoopback=True) + self.assertEqual(clientIP, '3.3.3.3') + + def test_getClientIP_XForwardedFor_no_skip_loopback(self): + request = self.createRequestWithIPs() + request.headers.update({'x-forwarded-for': '3.3.3.3, 127.0.0.1'}) + clientIP = server.getClientIP(request, useForwardedHeader=True, skipLoopback=False) + self.assertEqual(clientIP, '127.0.0.1') + def test_getClientIP_fromRequest(self): """getClientIP() should return the IP address from the request instance when ``useForwardedHeader=False``. diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index f29f224..33069ef 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -337,6 +337,7 @@ class CaptchaFetchResourceTests(unittest.TestCase): self.root.putChild(self.pagename, self.resource) self.make_captcha_directory() + server.setPreferredTransports(['obfs4', 'vanilla']) def make_captcha_directory(self): if not os.path.isdir(self.captchaDir):

1 0

[bridgedb/develop] Merge branch 'fix/24432-ignore-loopback' into develop
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 4faecd5c7252d108e3749a63ab0f0a0464adec05 Merge: 8b4f736 bf7ec9e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 13 22:20:51 2018 +0000 Merge branch 'fix/24432-ignore-loopback' into develop bridgedb.conf | 5 ++++ bridgedb/distributors/common/http.py | 24 +++++++++++++---- bridgedb/distributors/moat/server.py | 36 +++++++++++++++++++------- bridgedb/parse/addr.py | 22 ++++++++++++++++ bridgedb/test/moat_helpers.py | 3 +++ bridgedb/test/test_distributors_common_http.py | 18 +++++++++++++ bridgedb/test/test_distributors_moat_server.py | 1 + 7 files changed, 94 insertions(+), 15 deletions(-)

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit beddee98246921b36cf6961cf33db5d04a8728ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:20:57 2018 +0000 Update translations for tor-browser-manual_completed --- fr/fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 633d75139..e9c5e862d 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1433,13 +1433,13 @@ msgid "" "disabled by default on all sites; most video and audio formats are disabled;" " and some fonts and icons may not display correctly." msgstr "" -"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " -"avec NoScript ; toutes les optimisations des performances JavaScript sont " -"désactivées ; certaines équations mathématiques pourraient ne pas s’afficher" -" correctement ; certaines fonctions de rendu des polices sont désactivées ; " -"certains types d’images sont désactivés ; JavaScript est désactivé par " -"défaut pour tous les sites ; la plupart des formats vidéo et audio sont " -"désactivés ; et certaines polices et icônes pourraient ne pas s’afficher " +"À ce niveau, les contenus multimédias HTML5 deviennent « cliquer pour lire »" +" avec NoScript ; toutes les optimisations des performances JavaScript sont " +"désactivées ; certaines équations mathématiques pourraient ne pas s’afficher" +" correctement ; certaines fonctions de rendu des polices sont désactivées ; " +"certains types d’images sont désactivés ; JavaScript est désactivé par " +"défaut pour tous les sites ; la plupart des formats vidéo et audio sont " +"désactivés ; et certaines polices et icônes pourraient ne pas s’afficher " "correctement." #: security-slider.page:53 @@ -1482,7 +1482,7 @@ msgstr "" #: security-slider.page:73 msgid "Low" -msgstr "Faible" +msgstr "Normal" #: security-slider.page:74 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 9641058f7556ac67f6f9da6d0da56d0d071e5ccd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:20:51 2018 +0000 Update translations for tor-browser-manual --- fr/fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 633d75139..e9c5e862d 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -1433,13 +1433,13 @@ msgid "" "disabled by default on all sites; most video and audio formats are disabled;" " and some fonts and icons may not display correctly." msgstr "" -"À ce niveau, les contenus multimédias HTML5 deviennent cliquer-pour-lire " -"avec NoScript ; toutes les optimisations des performances JavaScript sont " -"désactivées ; certaines équations mathématiques pourraient ne pas s’afficher" -" correctement ; certaines fonctions de rendu des polices sont désactivées ; " -"certains types d’images sont désactivés ; JavaScript est désactivé par " -"défaut pour tous les sites ; la plupart des formats vidéo et audio sont " -"désactivés ; et certaines polices et icônes pourraient ne pas s’afficher " +"À ce niveau, les contenus multimédias HTML5 deviennent « cliquer pour lire »" +" avec NoScript ; toutes les optimisations des performances JavaScript sont " +"désactivées ; certaines équations mathématiques pourraient ne pas s’afficher" +" correctement ; certaines fonctions de rendu des polices sont désactivées ; " +"certains types d’images sont désactivés ; JavaScript est désactivé par " +"défaut pour tous les sites ; la plupart des formats vidéo et audio sont " +"désactivés ; et certaines polices et icônes pourraient ne pas s’afficher " "correctement." #: security-slider.page:53 @@ -1482,7 +1482,7 @@ msgstr "" #: security-slider.page:73 msgid "Low" -msgstr "Faible" +msgstr "Normal" #: security-slider.page:74 msgid ""

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 9fe9cffe1960bff060620e630b04de61da1db52a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:17:55 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- fr/torbutton.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index 75def713f..1a377a68b 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -37,13 +37,13 @@ <!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du navigateur Tor et des sites Web sont activées."> <!ENTITY torbutton.prefs.sec_safer_label "Plus sûr"> <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> -<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre plus sûr :"> +<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre Plus sûr :"> <!ENTITY torbutton.prefs.sec_safest_label "Le plus sûr"> -<!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de site Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre le plus sûr :"> +<!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> +<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre Le plus sûr :"> <!ENTITY torbutton.prefs.sec_learn_more_label "En apprendre davantage"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé sur les sites non HTTPS."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut sur tous les sites."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé pour les sites non HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut pour tous les sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Certaines polices et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icônes, images et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidéo (médias HTML5) sont « cliquer pour lire ».">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 0c10294ae1763e80a7dd73a5a6f90de807bb6c62 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:17:50 2018 +0000 Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index 75def713f..1a377a68b 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -37,13 +37,13 @@ <!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du navigateur Tor et des sites Web sont activées."> <!ENTITY torbutton.prefs.sec_safer_label "Plus sûr"> <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> -<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre plus sûr :"> +<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre Plus sûr :"> <!ENTITY torbutton.prefs.sec_safest_label "Le plus sûr"> -<!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de site Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre le plus sûr :"> +<!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> +<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre Le plus sûr :"> <!ENTITY torbutton.prefs.sec_learn_more_label "En apprendre davantage"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé sur les sites non HTTPS."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut sur tous les sites."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé pour les sites non HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut pour tous les sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Certaines polices et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icônes, images et certains symboles mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidéo (médias HTML5) sont « cliquer pour lire ».">

1 0

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

14 Feb '18

commit 00dd802801e3d89f1dc921383f997c03a94bfaba Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:17:08 2018 +0000 Update translations for tails-misc_completed --- fr.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fr.po b/fr.po index d3980b6f6..c8170cf6a 100644 --- a/fr.po +++ b/fr.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-13 21:26+0000\n" +"PO-Revision-Date: 2018-02-13 22:01+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -247,18 +247,18 @@ msgstr "Annuler" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "Voulez-vous vraiment lancer le navigateur non-sécurisé ?" +msgstr "Voulez-vous vraiment lancer le navigateur non sécurisé ?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "L’activité réseau dans le navigateur non-sécurisé n’est pas anonyme.\\nN’utilisez le navigateur non-sécurisé que si nécessaire, par exemple\\nsi vous devez vous connecter ou vous inscrire pour activer votre connexion Internet." +msgstr "L’activité réseau dans le navigateur non sécurisé n’est pas anonyme.\\nN’utilisez le navigateur non sécurisé que si nécessaire, par exemple si vous devez vous connecter ou vous inscrire pour activer votre connexion Internet." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." -msgstr "Démarrage du navigateur non fiable…" +msgstr "Démarrage du navigateur non sécurisé…" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "This may take a while, so please be patient." @@ -266,13 +266,13 @@ msgstr "Cela peut prendre du temps. Veuillez être patient." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." -msgstr "Fermeture du navigateur non fiable…" +msgstr "Fermeture du navigateur non sécurisé…" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." -msgstr "Cela peut prendre du temps et vous ne devez pas redémarrer le navigateur non-sécurisé avant sa fermeture complète." +msgstr "Cela peut prendre du temps et vous ne devez pas redémarrer le navigateur non sécurisé avant sa fermeture complète." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." @@ -281,13 +281,13 @@ msgstr "Échec lors du redémarrage de Tor." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "Navigateur non-sécurisé" +msgstr "Navigateur non sécurisé" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "Un autre navigateur non-sécurisé est en cours d’utilisation, ou est en train d’être nettoyé. Veuillez ressayer dans un moment." +msgstr "Un autre navigateur non sécurisé est en cours d’utilisation ou de nettoyage. Veuillez ressayer dans un moment." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 msgid "" @@ -344,7 +344,7 @@ msgstr "Naviguer sur le Web sans anonymat" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 msgid "Unsafe Web Browser" -msgstr "Navigateur Web non-sécurisé" +msgstr "Navigateur Web non sécurisé" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools"

1 0

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

14 Feb '18

commit 567d60d97b5265b831d41c7f11018bb3d5932b78 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 13 22:17:03 2018 +0000 Update translations for tails-misc --- fr.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fr.po b/fr.po index d3980b6f6..c8170cf6a 100644 --- a/fr.po +++ b/fr.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-13 21:26+0000\n" +"PO-Revision-Date: 2018-02-13 22:01+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -247,18 +247,18 @@ msgstr "Annuler" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "Voulez-vous vraiment lancer le navigateur non-sécurisé ?" +msgstr "Voulez-vous vraiment lancer le navigateur non sécurisé ?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "L’activité réseau dans le navigateur non-sécurisé n’est pas anonyme.\\nN’utilisez le navigateur non-sécurisé que si nécessaire, par exemple\\nsi vous devez vous connecter ou vous inscrire pour activer votre connexion Internet." +msgstr "L’activité réseau dans le navigateur non sécurisé n’est pas anonyme.\\nN’utilisez le navigateur non sécurisé que si nécessaire, par exemple si vous devez vous connecter ou vous inscrire pour activer votre connexion Internet." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." -msgstr "Démarrage du navigateur non fiable…" +msgstr "Démarrage du navigateur non sécurisé…" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "This may take a while, so please be patient." @@ -266,13 +266,13 @@ msgstr "Cela peut prendre du temps. Veuillez être patient." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." -msgstr "Fermeture du navigateur non fiable…" +msgstr "Fermeture du navigateur non sécurisé…" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." -msgstr "Cela peut prendre du temps et vous ne devez pas redémarrer le navigateur non-sécurisé avant sa fermeture complète." +msgstr "Cela peut prendre du temps et vous ne devez pas redémarrer le navigateur non sécurisé avant sa fermeture complète." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." @@ -281,13 +281,13 @@ msgstr "Échec lors du redémarrage de Tor." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "Navigateur non-sécurisé" +msgstr "Navigateur non sécurisé" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "Un autre navigateur non-sécurisé est en cours d’utilisation, ou est en train d’être nettoyé. Veuillez ressayer dans un moment." +msgstr "Un autre navigateur non sécurisé est en cours d’utilisation ou de nettoyage. Veuillez ressayer dans un moment." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 msgid "" @@ -344,7 +344,7 @@ msgstr "Naviguer sur le Web sans anonymat" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 msgid "Unsafe Web Browser" -msgstr "Navigateur Web non-sécurisé" +msgstr "Navigateur Web non sécurisé" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools"

1 0