March 2013 - tor-commits - lists.torproject.org

[bridgedb/master] 4297 - Prepopulate rings before calling dumpAssignments
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 8d3aa5cb83ee0eff0f8453c5a0c56ba06f574204 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Sep 9 17:30:26 2012 -0700 4297 - Prepopulate rings before calling dumpAssignments Default rings are not populated if the FilteredBridgeSplitter is cleared on reload(). --- lib/bridgedb/Main.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 4faec57..31c9917 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -309,7 +309,6 @@ def startup(cfg): Bridges.get_hmac(key, "HTTPS-IP-Dist-Key"), categories, answerParameters=ringParams) - ipDistributor.prepopulateRings() # create default rings splitter.addRing(ipDistributor, "https", cfg.HTTPS_SHARE) #webSchedule = Time.IntervalSchedule("day", 2) webSchedule = Time.NoSchedule() @@ -323,7 +322,6 @@ def startup(cfg): cfg.EMAIL_DOMAIN_MAP.copy(), cfg.EMAIL_DOMAIN_RULES.copy(), answerParameters=ringParams) - emailDistributor.prepopulateRings() # create default rings splitter.addRing(emailDistributor, "email", cfg.EMAIL_SHARE) #emailSchedule = Time.IntervalSchedule("day", 1) emailSchedule = Time.NoSchedule() @@ -357,8 +355,10 @@ def startup(cfg): proxyList.replaceProxyList(loadProxyList(cfg)) logging.info("%d bridges loaded", len(splitter)) if emailDistributor: + emailDistributor.prepopulateRings() # create default rings logging.info("%d for email", len(emailDistributor.splitter)) if ipDistributor: + ipDistributor.prepopulateRings() # create default rings logging.info("%d for web:", len(ipDistributor.splitter)) for (n,(f,r)) in ipDistributor.splitter.filterRings.items(): logging.info(" by filter set %s, %d" % (n, len(r)))

1 0

[bridgedb/master] 5027 - parse bridge block list in Main.py
by aagbsn＠torproject.org 16 Mar '13

16 Mar '13

commit 22248927f70b2ec2b7d7271e42b6ba48f04d10c1 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Jul 1 04:22:40 2012 -0700 5027 - parse bridge block list in Main.py --- lib/bridgedb/Main.py | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d8a5c3c..4faec57 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -160,12 +160,9 @@ def load(cfg, splitter, clear=False): """Read all the bridge files from cfg, and pass them into a splitter object. """ - countryblock = Bridges.CountryBlock() if clear: logging.info("Clearing old bridges") splitter.clear() - logging.info("Clearing old blocked bridges") - countryblock.clear() logging.info("Loading bridges") status = {} addresses = {} @@ -176,11 +173,6 @@ def load(cfg, splitter, clear=False): addresses[ID] = or_addresses #transports[ID] = transports f.close() - if hasattr(cfg, "COUNTRY_BLOCK_FILE"): - f = open(cfg.COUNTRY_BLOCK_FILE, 'r') - for fingerprint, countryCode in Bridges.parseCountryBlockFile(f): - countryblock.insert(fingerprint, countryCode) - f.close() bridges = {} for fname in cfg.BRIDGE_FILES: f = open(fname, 'r') @@ -191,8 +183,6 @@ def load(cfg, splitter, clear=False): running, stable = s bridge.setStatus(running=running, stable=stable) bridge.or_addresses = addresses.get(bridge.getID()) - bridge.setBlockingCountries( - countryblock.getBlockingCountries(bridge.fingerprint)) splitter.insert(bridge) f.close() # read pluggable transports from extra-info document @@ -205,6 +195,21 @@ def load(cfg, splitter, clear=False): if bridges[ID].running: bridges[ID].transports.append(Bridges.PluggableTransport(bridges[ID], method_name, address, port, argdict)) + if hasattr(cfg, "COUNTRY_BLOCK_FILE"): + f = open(cfg.COUNTRY_BLOCK_FILE, 'r') + for ID,address,portlist,countries in Bridges.parseCountryBlockFile(f): + if ID in bridges.keys() and bridges[ID].running: + for port in portlist: + logging.debug(":.( Tears! %s blocked %s %s:%s" % ( + countries, bridges[ID].fingerprint, address, port)) + try: + bridges[ID].blockingCountries["%s:%s" % \ + (address, port)].update(countries) + except KeyError: + bridges[ID].blockingCountries["%s:%s" % \ + (address, port)] = set(countries) + f.close() + bridges = None def loadProxyList(cfg):

1 0

[stem/master] Including param constraints for UseOptimisticData
by atagar＠torproject.org 16 Mar '13

16 Mar '13

commit cb7915bb4734742f487519dad6ce0ec2a84b5bb7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 16 09:42:41 2013 -0700 Including param constraints for UseOptimisticData We were missing the bounds for the UseOptimisticData parameter. --- stem/descriptor/networkstatus.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index de0b945..74431d1 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -778,6 +778,8 @@ class _DocumentHeader(object): minimum = 500 elif key == "cbtinitialtimeout": minimum = self.params.get("cbtmintimeout", minimum) + elif key == "UseOptimisticData": + minimum, maximum = 0, 1 if value < minimum or value > maximum: raise ValueError("'%s' value on the params line must be in the range of %i - %i, was %i" % (key, minimum, maximum, value))

1 0

[stem/master] Supporting 'Unmeasured' in router status entries
by atagar＠torproject.org 16 Mar '13

16 Mar '13

commit a124b62f26c8ae1cee01f780a0383389275ee873 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 16 10:12:57 2013 -0700 Supporting 'Unmeasured' in router status entries Spec commit c3860e3 added a new 'Unmeasured' key/value entry to the 'w' lines of v3 router status entries. --- stem/descriptor/router_status_entry.py | 18 +++++++++++++++--- test/unit/descriptor/router_status_entry.py | 18 +++++++++++++----- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 68c1b38..69b8fa2 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -307,6 +307,8 @@ class RouterStatusEntryV3(RouterStatusEntry): :var int bandwidth: bandwidth claimed by the relay (in kb/s) :var int measured: bandwidth measured to be available by the relay + :var bool is_unmeasured: bandwidth measurement isn't based on three or more + measurements :var list unrecognized_bandwidth_entries: **\*** bandwidth weighting information that isn't yet recognized @@ -326,6 +328,7 @@ class RouterStatusEntryV3(RouterStatusEntry): self.bandwidth = None self.measured = None + self.is_unmeasured = False self.unrecognized_bandwidth_entries = [] self.exit_policy = None @@ -394,6 +397,8 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): :var int bandwidth: bandwidth claimed by the relay (in kb/s) :var int measured: bandwidth measured to be available by the relay + :var bool is_unmeasured: bandwidth measurement isn't based on three or more + measurements :var list unrecognized_bandwidth_entries: **\*** bandwidth weighting information that isn't yet recognized @@ -404,8 +409,10 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): """ def __init__(self, content, validate = True, document = None): - self.version_line = None - self.version = None + self.bandwidth = None + self.measured = None + self.is_unmeasured = False + self.unrecognized_bandwidth_entries = [] self.digest = None @@ -581,7 +588,7 @@ def _parse_v_line(desc, value, validate): def _parse_w_line(desc, value, validate): - # "w" "Bandwidth=" INT ["Measured=" INT] + # "w" "Bandwidth=" INT ["Measured=" INT] ["Unmeasured=1"] # example: w Bandwidth=7980 w_comp = value.split(" ") @@ -619,6 +626,11 @@ def _parse_w_line(desc, value, validate): raise ValueError("%s 'Measured=' entry needs to have a numeric value: w %s" % (desc._name(), value)) desc.measured = int(w_value) + elif w_key == "Unmeasured": + if validate and w_value != "1": + raise ValueError("%s 'Unmeasured=' should only have the value of '1': w %s" % (desc._name(), value)) + + desc.is_unmeasured = True else: desc.unrecognized_bandwidth_entries.append(w_entry) diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 23baaeb..b61f5e8 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -81,6 +81,7 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual(None, entry.version) self.assertEqual(None, entry.bandwidth) self.assertEqual(None, entry.measured) + self.assertEqual(False, entry.is_unmeasured) self.assertEqual([], entry.unrecognized_bandwidth_entries) self.assertEqual(None, entry.exit_policy) self.assertEqual([], entry.microdescriptor_hashes) @@ -403,17 +404,19 @@ class TestRouterStatusEntry(unittest.TestCase): """ test_values = { - "Bandwidth=0": (0, None, []), - "Bandwidth=63138": (63138, None, []), - "Bandwidth=11111 Measured=482": (11111, 482, []), - "Bandwidth=11111 Measured=482 Blarg!": (11111, 482, ["Blarg!"]), + "Bandwidth=0": (0, None, False, []), + "Bandwidth=63138": (63138, None, False, []), + "Bandwidth=11111 Measured=482": (11111, 482, False, []), + "Bandwidth=11111 Measured=482 Blarg!": (11111, 482, False, ["Blarg!"]), + "Bandwidth=11111 Measured=482 Unmeasured=1 Blarg!": (11111, 482, True, ["Blarg!"]), } for w_line, expected in test_values.items(): entry = get_router_status_entry_v3({'w': w_line}) self.assertEquals(expected[0], entry.bandwidth) self.assertEquals(expected[1], entry.measured) - self.assertEquals(expected[2], entry.unrecognized_bandwidth_entries) + self.assertEquals(expected[2], entry.is_unmeasured) + self.assertEquals(expected[3], entry.unrecognized_bandwidth_entries) # tries some invalid inputs test_values = ( @@ -427,6 +430,11 @@ class TestRouterStatusEntry(unittest.TestCase): "Bandwidth=10 Measured", "Bandwidth=10 Measured=", "Bandwidth=10 Measured=-50", + "Bandwidth=10 Measured=482 Unmeasured", + "Bandwidth=10 Measured=482 Unmeasured=", + "Bandwidth=10 Measured=482 Unmeasured=0", + "Bandwidth=10 Measured=482 Unmeasured=842", + "Bandwidth=10 Measured=482 Unmeasured=-5", ) for w_line in test_values:

1 0

[stem/master] Chaning GuardEvent to match spec revisions
by atagar＠torproject.org 16 Mar '13

16 Mar '13

commit 2f90285dd88db3fdac5dc14441b7ffe19ce8da38 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 16 09:05:22 2013 -0700 Chaning GuardEvent to match spec revisions Nick has clarified GUARD events in... https://trac.torproject.org/7619 Updating our enum docs to reflect the revisions and changing our 'name' attribute to reflect that it could contain either a fingerprint or fingerprint/nickname pair. This is a similar pattern to what we use for ORConnEvent. --- stem/__init__.py | 20 +++++++------------- stem/response/events.py | 29 ++++++++++++++++++++++------- test/unit/response/events.py | 14 ++++++++++---- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 3fee276..935ba00 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -332,31 +332,25 @@ Library for working with the tor process. Use a guard relay can be for. Tor may provide types not in this enum. - Enum descriptions are pending... - https://trac.torproject.org/7619 - =========== =========== GuardType Description =========== =========== - **ENTRY** unknown + **ENTRY** used to connect to the tor network =========== =========== .. data:: GuardStatus (enum) Status a guard relay can have. Tor may provide types not in this enum. - Enum descriptions are pending... - https://trac.torproject.org/7619 - ============= =========== GuardStatus Description ============= =========== - **NEW** unknown - **UP** unknown - **DOWN** unknown - **BAD** unknown - **GOOD** unknown - **DROPPED** unknown + **NEW** new guard that we weren't previously using + **DROPPED** removed from use as one of our guards + **UP** guard is now reachable + **DOWN** guard is now unreachable + **BAD** consensus or relay considers this relay to be unusable as a guard + **GOOD** consensus or relay considers this relay to be usable as a guard ============= =========== .. data:: TimeoutSetType (enum) diff --git a/stem/response/events.py b/stem/response/events.py index a2c43ff..d99b291 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -522,23 +522,38 @@ class DescChangedEvent(Event): class GuardEvent(Event): """ - Event that indicates that our guard relays have changed. + Event that indicates that our guard relays have changed. The 'endpoint' could + be either a... + + * fingerprint + * 'fingerprint=nickname' pair + + The derived 'endpoint_*' attributes are generally more useful. The GUARD event was introduced in tor version 0.1.2.5-alpha. :var stem.GuardType guard_type: purpose the guard relay is for - :var str name: nickname or fingerprint of the guard relay + :var str endpoint: relay that the event concerns + :var str endpoint_fingerprint: endpoint's finterprint + :var str endpoint_nickname: endpoint's nickname if it was provided :var stem.GuardStatus status: status of the guard relay """ _VERSION_ADDED = stem.version.Requirement.EVENT_GUARD + _POSITIONAL_ARGS = ("guard_type", "endpoint", "status") - # TODO: We should replace the 'name' field with a fingerprint or nickname - # attribute once we know what it can be... - # - # https://trac.torproject.org/7619 + def _parse(self): + self.endpoint_fingerprint = None + self.endpoint_nickname = None + + try: + self.endpoint_fingerprint, self.endpoint_nickname = \ + stem.control._parse_circ_entry(self.endpoint) + except stem.ProtocolError: + raise stem.ProtocolError("ORCONN's endpoint doesn't match a ServerSpec: %s" % self) - _POSITIONAL_ARGS = ("guard_type", "name", "status") + self._log_if_unrecognized('guard_type', stem.GuardType) + self._log_if_unrecognized('status', stem.GuardStatus) class LogEvent(Event): diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 803de0f..98e7f95 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -173,7 +173,7 @@ CONF_CHANGED_EVENT = """650-CONF_CHANGED GUARD_NEW = "650 GUARD ENTRY $36B5DBA788246E8369DBAF58577C6BC044A9A374 NEW" GUARD_GOOD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A GOOD" -GUARD_BAD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A BAD" +GUARD_BAD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A=caerSidi BAD" # NEWCONSENSUS event from v0.2.1.30. @@ -636,17 +636,23 @@ class TestEvents(unittest.TestCase): self.assertTrue(isinstance(event, stem.response.events.GuardEvent)) self.assertEqual(GUARD_NEW.lstrip("650 "), str(event)) self.assertEqual(GuardType.ENTRY, event.guard_type) - self.assertEqual("$36B5DBA788246E8369DBAF58577C6BC044A9A374", event.name) + self.assertEqual("$36B5DBA788246E8369DBAF58577C6BC044A9A374", event.endpoint) + self.assertEqual("36B5DBA788246E8369DBAF58577C6BC044A9A374", event.endpoint_fingerprint) + self.assertEqual(None, event.endpoint_nickname) self.assertEqual(GuardStatus.NEW, event.status) event = _get_event(GUARD_GOOD) self.assertEqual(GuardType.ENTRY, event.guard_type) - self.assertEqual("$5D0034A368E0ABAF663D21847E1C9B6CFA09752A", event.name) + self.assertEqual("$5D0034A368E0ABAF663D21847E1C9B6CFA09752A", event.endpoint) + self.assertEqual("5D0034A368E0ABAF663D21847E1C9B6CFA09752A", event.endpoint_fingerprint) + self.assertEqual(None, event.endpoint_nickname) self.assertEqual(GuardStatus.GOOD, event.status) event = _get_event(GUARD_BAD) self.assertEqual(GuardType.ENTRY, event.guard_type) - self.assertEqual("$5D0034A368E0ABAF663D21847E1C9B6CFA09752A", event.name) + self.assertEqual("$5D0034A368E0ABAF663D21847E1C9B6CFA09752A=caerSidi", event.endpoint) + self.assertEqual("5D0034A368E0ABAF663D21847E1C9B6CFA09752A", event.endpoint_fingerprint) + self.assertEqual("caerSidi", event.endpoint_nickname) self.assertEqual(GuardStatus.BAD, event.status) def test_newdesc_event(self):

1 0

[stem/master] Unescaped characters shouldn't be considered in further unescaping
by atagar＠torproject.org 16 Mar '13

16 Mar '13

commit b8d79e24b4599b59df1d68bd99273cebb11a8038 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 16 11:30:36 2013 -0700 Unescaped characters shouldn't be considered in further unescaping When we unescape responses we should process the string from start to end, and when something is unescaped it needs to be removed from further consideration. For instance, '\\t' should be unescaped to '\t', not a tab. Caught on... https://trac.torproject.org/8471 --- stem/response/__init__.py | 31 +++++++++++++++++++++++++++++-- test/unit/response/control_line.py | 7 +++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 838ea89..c59c9bd 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -450,8 +450,7 @@ def _parse_entry(line, quoted, escaped): next_entry, remainder = remainder, "" if escaped: - for esc_sequence, replacement in CONTROL_ESCAPES.items(): - next_entry = next_entry.replace(esc_sequence, replacement) + next_entry = _unescape(next_entry) return (next_entry, remainder.lstrip()) @@ -482,6 +481,34 @@ def _get_quote_indices(line, escaped): return tuple(indices) +def _unescape(entry): + # Unescapes the given string with the mappings in CONTROL_ESCAPES. + # + # This can't be a simple series of str.replace() calls because replacements + # need to be excluded from consideration for further unescaping. For + # instance, '\\t' should be converted to '\t' rather than a tab. + + def _pop_with_unescape(entry): + # Pop either the first character or the escape sequence conversion the + # entry starts with. This provides a tuple of... + # + # (unescaped prefix, remaining entry) + + for esc_sequence, replacement in CONTROL_ESCAPES.items(): + if entry.startswith(esc_sequence): + return (replacement, entry[len(esc_sequence):]) + + return (entry[0], entry[1:]) + + result = [] + + while entry: + prefix, entry = _pop_with_unescape(entry) + result.append(prefix) + + return "".join(result) + + class SingleLineResponse(ControlMessage): """ Reply to a request that performs an action rather than querying data. These diff --git a/test/unit/response/control_line.py b/test/unit/response/control_line.py index c342dd2..c00baf6 100644 --- a/test/unit/response/control_line.py +++ b/test/unit/response/control_line.py @@ -165,3 +165,10 @@ class TestControlLine(unittest.TestCase): line = stem.response.ControlLine(cookie_file_entry) self.assertEquals(line.pop_mapping(True, True), ('COOKIEFILE', r'/tmp/my data\"dir//control_auth_cookie')) self.assertTrue(line.is_empty()) + + # try an escaped slash followed by a character that could be part of an + # escape sequence + + line = stem.response.ControlLine(r'COOKIEFILE="C:\\Users\\Atagar\\AppData\\tor\\control_auth_cookie"') + self.assertEquals(line.pop_mapping(True, True), ('COOKIEFILE', r'C:\Users\Atagar\AppData\tor\control_auth_cookie')) + self.assertTrue(line.is_empty())

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 Mar '13

16 Mar '13

commit 29886fad4591d0ec7805c3623cfa1b733f2eaf7f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 16 18:46:12 2013 +0000 Update translations for https_everywhere_completed --- ru/https-everywhere.properties | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index f78fa58..3a6ed40 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -3,3 +3,4 @@ https-everywhere.menu.globalDisable = Выключить HTTPS Everywhere https-everywhere.menu.enableDisable = Включить / Выключить правила https-everywhere.menu.noRules = Нет правил для этой страницы https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны +https-everywhere.toolbar.hint = HTTPS Everywhere активен. Вы можете отключить его для этого сайта кликнув по значку.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Mar '13

16 Mar '13

commit db5e57211e3bcfbcd918f40219f16d31cc8f90aa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 16 18:46:05 2013 +0000 Update translations for https_everywhere --- ru/https-everywhere.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index 96d2d31..3a6ed40 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = Выключить HTTPS Everywhere https-everywhere.menu.enableDisable = Включить / Выключить правила https-everywhere.menu.noRules = Нет правил для этой страницы https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.toolbar.hint = HTTPS Everywhere активен. Вы можете отключить его для этого сайта кликнув по значку.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 Mar '13

16 Mar '13

commit 727a855754d39f39c0aef3231b12a1832a039a84 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 16 16:46:02 2013 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.properties | 5 +++-- zh_TW/https-everywhere.properties | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fr/https-everywhere.properties b/fr/https-everywhere.properties index a48ca92..300d58b 100644 --- a/fr/https-everywhere.properties +++ b/fr/https-everywhere.properties @@ -1,5 +1,6 @@ -https-everywhere.menu.globalEnable = Activer HTTPS partout -https-everywhere.menu.globalDisable = Désactiver HTTPS partout +https-everywhere.menu.globalEnable = Activer HTTPS Everywhere +https-everywhere.menu.globalDisable = Désactiver HTTPS Everywhere https-everywhere.menu.enableDisable = Activer / Désactiver les règles https-everywhere.menu.noRules = (Aucune règle pour cette page) https-everywhere.menu.unknownRules = (Règles inconnues pour cette page) +https-everywhere.toolbar.hint = HTTPS Everywhere est désormais actif. Vous pouvez l'activer sur les sites au cas par cas en cliquant sur l'icône dans la barre d'adresse. diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index 9cf2c9a..be0d750 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -3,3 +3,4 @@ https-everywhere.menu.globalDisable = 停用 HTTPS Everywhere https-everywhere.menu.enableDisable = 啟用 / 停用規則 https-everywhere.menu.noRules = （沒有適用此網頁的規則） https-everywhere.menu.unknownRules = （適用此網頁的規則不明） +https-everywhere.toolbar.hint = HTTPS Everywhere 已啟用。您可以利用位址列的圖示根據網站切換啟用狀態。

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Mar '13

16 Mar '13

commit f9f70b4eab96ac62c228198c6a4198aaf92011e1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 16 16:45:57 2013 +0000 Update translations for https_everywhere --- fr/https-everywhere.properties | 6 +++--- zh_TW/https-everywhere.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/https-everywhere.properties b/fr/https-everywhere.properties index dffe15e..300d58b 100644 --- a/fr/https-everywhere.properties +++ b/fr/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = Activer HTTPS partout -https-everywhere.menu.globalDisable = Désactiver HTTPS partout +https-everywhere.menu.globalEnable = Activer HTTPS Everywhere +https-everywhere.menu.globalDisable = Désactiver HTTPS Everywhere https-everywhere.menu.enableDisable = Activer / Désactiver les règles https-everywhere.menu.noRules = (Aucune règle pour cette page) https-everywhere.menu.unknownRules = (Règles inconnues pour cette page) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.toolbar.hint = HTTPS Everywhere est désormais actif. Vous pouvez l'activer sur les sites au cas par cas en cliquant sur l'icône dans la barre d'adresse. diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index 1a11c7b..be0d750 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = 停用 HTTPS Everywhere https-everywhere.menu.enableDisable = 啟用 / 停用規則 https-everywhere.menu.noRules = （沒有適用此網頁的規則） https-everywhere.menu.unknownRules = （適用此網頁的規則不明） -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.toolbar.hint = HTTPS Everywhere 已啟用。您可以利用位址列的圖示根據網站切換啟用狀態。

1 0