- tor-commits - lists.torproject.org

[stem/master] Move NEWDESC sample events to alphabetic position
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 38190ab9cbedf9844022fe02f4385f1b129c5f52 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 16:15:53 2012 -0700 Move NEWDESC sample events to alphabetic position Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/response/events.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index a632125..7fb39c6 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -181,6 +181,13 @@ s Fast Guard Running Stable Valid 650 OK """ +# NEWDESC events. I've never actually seen multiple descriptors in an event, +# but the spec allows for it. + +NEWDESC_SINGLE = "650 NEWDESC $B3FA3110CC6F42443F039220C134CBD2FC4F0493=Sakura" +NEWDESC_MULTIPLE = "650 NEWDESC $BE938957B2CA5F804B3AFC2C1EE6673170CDBBF8=Moonshine \ +$B4BE08B22D4D2923EDC3970FD1B93D0448C6D8FF~Unnamed" + # NS event from tor v0.2.1.30. NS_EVENT = """650+NS @@ -288,13 +295,6 @@ STREAM_DNS_REQUEST = "650 STREAM 1113 NEW 0 www.google.com:0 \ SOURCE_ADDR=127.0.0.1:15297 \ PURPOSE=DNS_REQUEST" -# NEWDESC events. I've never actually seen multiple descriptors in an event, -# but the spec allows for it. - -NEWDESC_SINGLE = "650 NEWDESC $B3FA3110CC6F42443F039220C134CBD2FC4F0493=Sakura" -NEWDESC_MULTIPLE = "650 NEWDESC $BE938957B2CA5F804B3AFC2C1EE6673170CDBBF8=Moonshine \ -$B4BE08B22D4D2923EDC3970FD1B93D0448C6D8FF~Unnamed" - def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert("EVENT", controller_event, arrived_at = 25)

1 0

[stem/master] Event testing revisions
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 256676d5e686fb544927a715335c567d693254cc Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 15 13:06:41 2012 -0800 Event testing revisions Minor revisions for the prior event testing additions... * Adding comments saying how the 'BAD' events are malformed. Some of them took me a few seconds to figure out. :) * Renaming the 'ORCONN_CONNECTED_BAD_*' events to 'ORCONN_BAD_*' since it's not especially important that these are connection events (and in one case it isn't). * Putting ORCONN_BAD_* events on a single line to match the non-bad counterparts. The rough convention that I've been using is to add a newline if there's either a key/value argument or a really long positional arg. * Renaming ADDRMAP_BAD_3 to ADDRMAP_ERROR_EVENT. I like the ADDRMAP_BAD_1 and ADDRMAP_BAD_2 names since they make it clear that they're malformed input. However, ADDRMAP_BAD_3 is a valid response where tor is conveying that an error occurred. * Actually, I think that your STREAM_SENTCONNECT_BAD_1 event reveals a bug. The spec doesn't seem to indicate that the target is optional, so making it mandatory. --- stem/response/events.py | 3 +- test/unit/response/events.py | 93 +++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 889f93b..c8e10f3 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -757,8 +757,7 @@ class StreamEvent(Event): def _parse(self): if self.target is None: - self.target_address = None - self.target_port = None + raise stem.ProtocolError("STREAM event didn't have a target: %s" % self) else: if not ':' in self.target: raise stem.ProtocolError("Target location must be of the form 'address:port': %s" % self) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index bda2d5a..91276b7 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -17,12 +17,15 @@ from test import mocking ADDRMAP = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13" \ EXPIRES="2012-11-19 08:50:13"' + +ADDRMAP_ERROR_EVENT = '650 ADDRMAP www.atagar.com <error> "2012-11-19 00:50:13" \ +error=yes EXPIRES="2012-11-19 08:50:13"' + ADDRMAP_BAD_1 = '650 ADDRMAP www.atagar.com 75.119.206.243 2012-11-19 00:50:13" \ EXPIRES="2012-11-19 08:50:13"' + ADDRMAP_BAD_2 = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13 \ EXPIRES="2012-11-19 08:50:13"' -ADDRMAP_BAD_3 = '650 ADDRMAP www.atagar.com <error> "2012-11-19 00:50:13" \ -error=yes EXPIRES="2012-11-19 08:50:13"' # BUILDTIMEOUT_SET event from tor 0.2.3.16. @@ -203,17 +206,9 @@ ORCONN_CLOSED = "650 ORCONN $A1130635A0CDA6F60C276FBF6994EFBD4ECADAB1~tama CLOSE ORCONN_CONNECTED = "650 ORCONN 127.0.0.1:9000 CONNECTED NCIRCS=20" ORCONN_LAUNCHED = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E51E1A0=GreenDragon LAUNCHED" -ORCONN_CONNECTED_BAD_1 = "650 ORCONN \ -$7ED90E2833EE38A75795BA9237B0A4560E5=GreenD \ -LAUNCHED" - -ORCONN_CONNECTED_BAD_2 = "650 ORCONN \ -127.0.0.1:001 \ -CONNECTED" - -ORCONN_CONNECTED_BAD_3 = "650 ORCONN \ -127.0.0.1:9000 \ -CONNECTED NCIRCS=too_many" +ORCONN_BAD_1 = "650 ORCONN $7ED90E2833EE38A75795BA9237B0A4560E5=GreenD LAUNCHED" +ORCONN_BAD_2 = "650 ORCONN 127.0.0.1:001 CONNECTED" +ORCONN_BAD_3 = "650 ORCONN 127.0.0.1:9000 CONNECTED NCIRCS=too_many" # STATUS_* events that I was able to easily trigger. Most came from starting # TBB, then listening while it bootstrapped. @@ -384,18 +379,19 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.error) self.assertEqual(datetime.datetime(2012, 11, 19, 8, 50, 13), event.utc_expiry) - self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_1) - self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_2) - - event = _get_event(ADDRMAP_BAD_3) + event = _get_event(ADDRMAP_ERROR_EVENT) self.assertTrue(isinstance(event, stem.response.events.AddrMapEvent)) - self.assertEqual(ADDRMAP_BAD_3.lstrip("650 "), str(event)) + self.assertEqual(ADDRMAP_ERROR_EVENT.lstrip("650 "), str(event)) self.assertEqual("www.atagar.com", event.hostname) self.assertEqual(None, event.destination) self.assertEqual(datetime.datetime(2012, 11, 19, 0, 50, 13), event.expiry) self.assertEqual("yes", event.error) self.assertEqual(datetime.datetime(2012, 11, 19, 8, 50, 13), event.utc_expiry) + + # malformed content where quotes are missing + self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_1) + self.assertRaises(ProtocolError, _get_event, ADDRMAP_BAD_2) def test_authdir_newdesc_event(self): # TODO: awaiting test data - https://trac.torproject.org/7534 @@ -421,6 +417,7 @@ class TestEvents(unittest.TestCase): self.assertEqual(21850, event.close_timeout) self.assertEqual(0.072581, event.close_rate) + # malformed content where we get non-numeric values self.assertRaises(ProtocolError, _get_event, BUILD_TIMEOUT_EVENT_BAD_1) self.assertRaises(ProtocolError, _get_event, BUILD_TIMEOUT_EVENT_BAD_2) @@ -467,9 +464,6 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) - self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_1) - self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_2) - event = _get_event(CIRC_EXTENDED) self.assertTrue(isinstance(event, stem.response.events.CircuitEvent)) @@ -544,6 +538,12 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.created) self.assertEqual(None, event.reason) self.assertEqual(None, event.remote_reason) + + # malformed TIME_CREATED timestamp + self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_1) + + # invalid circuit id + self.assertRaises(ProtocolError, _get_event, CIRC_LAUNCHED_BAD_2) def test_circ_minor_event(self): event = _get_event(CIRC_MINOR_EVENT) @@ -561,7 +561,10 @@ class TestEvents(unittest.TestCase): self.assertEqual(CircPurpose.TESTING, event.old_purpose) self.assertEqual(None, event.old_hs_state) + # malformed TIME_CREATED timestamp self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_1) + + # invalid circuit id self.assertRaises(ProtocolError, _get_event, CIRC_MINOR_EVENT_BAD_2) def test_clients_seen_event(self): @@ -573,11 +576,22 @@ class TestEvents(unittest.TestCase): self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) + # CountrySummary's 'key=value' mappings are replaced with 'key:value' self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_1) + + # CountrySummary's country codes aren't two letters self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_2) + + # CountrySummary's mapping contains a non-numeric value self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_3) + + # CountrySummary has duplicate country codes (multiple 'au=' mappings) self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_4) + + # IPVersions's 'key=value' mappings are replaced with 'key:value' self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_5) + + # IPVersions's mapping contains a non-numeric value self.assertRaises(ProtocolError, _get_event, CLIENTS_SEEN_EVENT_BAD_6) def test_conf_changed(self): @@ -707,9 +721,14 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.reason) self.assertEqual(None, event.circ_count) - self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_1) - self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_2) - self.assertRaises(ProtocolError, _get_event, ORCONN_CONNECTED_BAD_3) + # malformed fingerprint + self.assertRaises(ProtocolError, _get_event, ORCONN_BAD_1) + + # invalid port number ('001') + self.assertRaises(ProtocolError, _get_event, ORCONN_BAD_2) + + # non-numeric NCIRCS + self.assertRaises(ProtocolError, _get_event, ORCONN_BAD_3) def test_signal_event(self): event = _get_event("650 SIGNAL DEBUG") @@ -1037,27 +1056,19 @@ class TestEvents(unittest.TestCase): self.assertEqual(15297, event.source_port) self.assertEqual(StreamPurpose.DNS_REQUEST, event.purpose) - event = _get_event(STREAM_SENTCONNECT_BAD_1) - - self.assertTrue(isinstance(event, stem.response.events.StreamEvent)) - self.assertEqual(STREAM_SENTCONNECT_BAD_1.lstrip("650 "), str(event)) - self.assertEqual("18", event.id) - self.assertEqual(StreamStatus.SENTCONNECT, event.status) - self.assertEqual("26", event.circ_id) - self.assertEqual(None, event.target) - self.assertEqual(None, event.target_address) - self.assertEqual(None, event.target_port) - self.assertEqual(None, event.reason) - self.assertEqual(None, event.remote_reason) - self.assertEqual(None, event.source) - self.assertEqual(None, event.source_addr) - self.assertEqual(None, event.source_address) - self.assertEqual(None, event.source_port) - self.assertEqual(None, event.purpose) + # missing target + self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_1) + # target is missing a port self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_2) + + # target's port is malformed self.assertRaises(ProtocolError, _get_event, STREAM_SENTCONNECT_BAD_3) + + # SOURCE_ADDR is missing a port self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_1) + + # SOURCE_ADDR's port is malformed self.assertRaises(ProtocolError, _get_event, STREAM_DNS_REQUEST_BAD_2) def test_stream_bw_event(self):

1 0

[stem/master] Script for republishing stem's site
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit 22286e9dc3fea710182984dd320f4e419cc5a425 Merge: 6711458 9a1601d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 14 09:27:50 2012 -0800 Script for republishing stem's site Now that we're moving our site from ReadTheDocs to a tpo host (staticiforme) we need our own method for automatically republishing our sphinx docs. To do this we're using a cron process that runs every five minutes which... * Pulls stem's git repo. If it has changed... * Run 'make html' to rebuild the docs. * Republish the content by calling 'static-master-update-component'. Many thanks to weasel for working with me on this, and pointing out the numerous mistakes I've been making. docs/republish | 7 ++++ docs/republish.py | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/tutorial.rst | 8 ++-- stem/__init__.py | 2 +- 4 files changed, 99 insertions(+), 5 deletions(-)

1 0

[stem/master] Remove extra checks for circuit id and stream id validity
by atagar＠torproject.org 15 Dec '12

15 Dec '12

commit e30f2df26221004fc2c535e5ef5e0b2c8518e3b2 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 14 17:12:27 2012 -0700 Remove extra checks for circuit id and stream id validity CircuitID and StreamID may not be None, so raise ProtocolError if either ID is None. Inside is_valid_circuit_id() and is_valid_stream_id(), isinstance(entry, str) already returns False if None is checked. Add None as invalid IDs in tests. NOTE: Do not try this with is_valid_fingerprint() and is_valid_nickname(), as the fingerprint or nickname may be None in certain cases. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/response/events.py | 6 +++--- test/unit/util/tor_tools.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 8c9cc2b..4e0aef8 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -326,7 +326,7 @@ class CircuitEvent(Event): except ValueError, exc: raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) - if self.id is not None and not tor_tools.is_valid_circuit_id(self.id): + if not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) self._log_if_unrecognized('status', stem.CircStatus) @@ -381,7 +381,7 @@ class CircMinorEvent(Event): except ValueError, exc: raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) - if self.id is not None and not tor_tools.is_valid_circuit_id(self.id): + if not tor_tools.is_valid_circuit_id(self.id): raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) self._log_if_unrecognized('event', stem.CircEvent) @@ -811,7 +811,7 @@ class StreamBwEvent(Event): _VERSION_ADDED = stem.version.Version('0.1.2.8-beta') def _parse(self): - if self.id is not None and not tor_tools.is_valid_stream_id(self.id): + if not tor_tools.is_valid_stream_id(self.id): raise stem.ProtocolError("Stream IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) elif not self.written: raise stem.ProtocolError("STREAM_BW event is missing its written value") diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index 32581e9..0c0e6e2 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -43,6 +43,7 @@ class TestTorTools(unittest.TestCase): ) invalid_nicknames = ( + None, "", "toolongggggggggggggg", "bad_character", @@ -66,6 +67,7 @@ class TestTorTools(unittest.TestCase): ) invalid_circuit_ids = ( + None, "", 0, 2,

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 15 Dec '12

15 Dec '12

commit a2366cbcf4c3c33d09a2c4f8ecd3a007ef8def21 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 15 13:16:05 2012 +0000 Update translations for torbirdy --- ko/torbirdy.dtd | 42 ++++++++++++++++++++++++++++++++++++++++++ ko/torbirdy.properties | 15 +++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd new file mode 100644 index 0000000..faeb101 --- /dev/null +++ b/ko/torbirdy.dtd @@ -0,0 +1,42 @@ +<!ENTITY torbirdy.accountprefs.title "계정 설정"> +<!ENTITY torbirdy.accountprefs.startup.label ""> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label ""> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "분"> +<!ENTITY torbirdy.accountprefs.cancel.button "취소"> +<!ENTITY torbirdy.accountprefs.save.button "저장"> +<!ENTITY torbirdy.accountprefs.save.key ""> + +<!ENTITY torbirdy.prefs.title "Torbirdy 개인 설정"> +<!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.key "g"> +<!ENTITY torbirdy.prefs.proxy.label "프록시 설정"> +<!ENTITY torbirdy.prefs.privacy.label "개인 정보 설정"> +<!ENTITY torbirdy.prefs.recommended.text "Torbirdy를 위한 추천되는 프록시 설정을 사용합니다."> +<!ENTITY torbirdy.prefs.recommended.key ""> +<!ENTITY torbirdy.prefs.anonservice.text ""> +<!ENTITY torbirdy.prefs.anonservice.key ""> +<!ENTITY torbirdy.prefs.customsettings.text ""> +<!ENTITY torbirdy.prefs.customsettings.key ""> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> +<!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 ""> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global ""> +<!ENTITY torbirdy.prefs.imap.label ""> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label ""> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.account_specific ""> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label ""> diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties new file mode 100644 index 0000000..5717118 --- /dev/null +++ b/ko/torbirdy.properties @@ -0,0 +1,15 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=Torbirdy 활성화 : Tor +torbirdy.enabled.jondo=Torbirdy 활성화 : JonDo +# torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy +# torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification +# torbirdy.disabled=TorBirdy: Disabled! + +# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. + +# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +# torbirdy.email.advanced.nextwarning=Show this warning next time +# torbirdy.email.advanced.title=TorBirdy Advanced Settings + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Dec '12

15 Dec '12

commit 49d615de45870d7f8411da79ae51bab1be6e6747 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 15 13:15:56 2012 +0000 Update translations for https_everywhere_completed --- ko/https-everywhere.properties | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ko/https-everywhere.properties b/ko/https-everywhere.properties index 44ba392..b029a58 100644 --- a/ko/https-everywhere.properties +++ b/ko/https-everywhere.properties @@ -1,2 +1,5 @@ https-everywhere.menu.globalEnable = 모든 곳에서 HTTPS 사용 https-everywhere.menu.globalDisable = 모든 곳에서 HTTPS 사용 안 함 +https-everywhere.menu.enableDisable = 규칙 활성화 / 비활성화 +https-everywhere.menu.noRules = (이 페이지를 위한 규칙 없음) +https-everywhere.menu.unknownRules = (알 수 없는 이 페이지를 위한 규칙)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Dec '12

15 Dec '12

commit fe2f0265ea36722d88486f6b559a019595c23b1d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 15 13:15:52 2012 +0000 Update translations for https_everywhere --- ko/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/https-everywhere.properties b/ko/https-everywhere.properties index dd3523b..b029a58 100644 --- a/ko/https-everywhere.properties +++ b/ko/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = 모든 곳에서 HTTPS 사용 https-everywhere.menu.globalDisable = 모든 곳에서 HTTPS 사용 안 함 -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = 규칙 활성화 / 비활성화 +https-everywhere.menu.noRules = (이 페이지를 위한 규칙 없음) +https-everywhere.menu.unknownRules = (알 수 없는 이 페이지를 위한 규칙)

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 15 Dec '12

15 Dec '12

commit 9be6c68bfaa0852e187fdad81bfeeeb13d0356df Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 15 13:15:46 2012 +0000 Update translations for whisperback_completed --- ko/ko.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 91dbfc2..176958c 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -10,14 +10,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-07-16 05:55+0000\n" +"PO-Revision-Date: 2012-12-15 13:05+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ko\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. XXX use a better exception #: ../whisperBack/whisperback.py:63 @@ -158,8 +158,8 @@ msgid "Send feedback in an encrypted mail." msgstr "암호화된 메일로 피드백을 보냅니다." #: ../whisperBack/gui.py:405 -msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" -msgstr "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -183,8 +183,8 @@ msgid "Bug description" msgstr "버그 설명" #: ../data/whisperback.ui.h:3 -msgid "Copyright © 2009-2011 tails(a)boum.org" -msgstr "Copyright © 2009-2011 tails(a)boum.org" +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -215,7 +215,7 @@ msgstr "기술적인 세부 사항 포함" #: ../data/whisperback.ui.h:12 msgid "" "WhisperBack - Send feedback in an encrypted mail\n" -"Copyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" "\n" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -229,7 +229,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - 암호화된 메일로 피드백을 보내기\nCopyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n\n이 프로그램은 자유 소프트웨어입니다. 귀하는 이 프로그램은 자유소프트웨어 재단이 만든 GNU General Public Lecense 버전 3 또는 그 이후 어떠한 버전에 의해 재배포/수정할 수 있습니다.\n\n이 프로그램은 유용할 것으로 기대하고 배포되지만, 심지어 묵시적 보증, 특정 목적에 대한 적합성 없이 어떤 보증도 없습니다. GNU\nGeneral Public License를 더 많은 정보를 위해 보십시오.\n\n귀하는 GNU General Public License를 이 프로그램의 복사본과 함께 받았을 것입니다. 그렇지 않으면, <http://www.gnu.org/licenses/>를 보십시오.\n" +msgstr "WhisperBack - Send feedback in an encrypted mail\nCopyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n\n이 프로그램은 자유 소프트웨어입니다. 귀하는 이 프로그램을 자유 소프트웨어 재단에서 발행한 GNU General Public License 버전 3이나 그 이후의 버전으로 기여, 재생산, 배포 할 수 있습니다.\n\nThis program is distributed in the hope that it will be useful, but\nWITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 15 Dec '12

15 Dec '12

commit 73af8b8b8e923d69fa6ba24c4df0c6e7f8cb58c7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 15 13:15:45 2012 +0000 Update translations for whisperback --- ko/ko.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 1c91086..176958c 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -10,14 +10,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-08-16 09:20+0000\n" +"PO-Revision-Date: 2012-12-15 13:05+0000\n" "Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ko\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. XXX use a better exception #: ../whisperBack/whisperback.py:63 @@ -159,7 +159,7 @@ msgstr "암호화된 메일로 피드백을 보냅니다." #: ../whisperBack/gui.py:405 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -184,7 +184,7 @@ msgstr "버그 설명" #: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -229,7 +229,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - Send feedback in an encrypted mail\nCopyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n\n이 프로그램은 자유 소프트웨어입니다. 귀하는 이 프로그램을 자유 소프트웨어 재단에서 발행한 GNU General Public License 버전 3이나 그 이후의 버전으로 기여, 재생산, 배포 할 수 있습니다.\n\nThis program is distributed in the hope that it will be useful, but\nWITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 15 Dec '12

15 Dec '12

commit 81365b7e7cf5200f967b85554279814c1c087bea Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 15 13:15:26 2012 +0000 Update translations for vidalia_help --- ko/running.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ko/running.po b/ko/running.po index f01dc3c..eb66885 100644 --- a/ko/running.po +++ b/ko/running.po @@ -1,5 +1,6 @@ # # Translators: +# <cwt967(a)naver.com>, 2012. # <dltmdqkd1004(a)gmail.com>, 2012. # <siwoochung(a)me.com>, 2012. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-11-18 07:17+0000\n" -"Last-Translator: XinyU <dltmdqkd1004(a)gmail.com>\n" +"PO-Revision-Date: 2012-12-15 13:06+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -118,7 +119,7 @@ msgstr "Vidalia는 시스템 트레이나 도크 지역에 있는 아이콘을 #: en/running.html:69 msgid "" "Tor is stopped. Select Start from the Vidalia menu to start Tor." -msgstr "" +msgstr "Tor가 작동을 멈추었습니다. Tor을 시작하려면 Cidalia 메뉴에서 시작를 선택하십시오." #. type: Content of: <html><body><table><tr><td> #: en/running.html:76

1 0