July 2012 - tor-commits - lists.torproject.org

[stem/master] Fix #6248 and make test_get_pid_by_open_file cross-platform while doing so
by atagar＠torproject.org 07 Jul '12

07 Jul '12

commit bdc71d9c70e6184f7450e1fecef2cb2ce7bc4ac5 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Wed Jun 27 16:44:01 2012 +0530 Fix #6248 and make test_get_pid_by_open_file cross-platform while doing so --- test/integ/util/system.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 968b920..19ea5ea 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -6,6 +6,7 @@ that we're running. import os import getpass import unittest +import tempfile import stem.util.system import test.runner @@ -302,16 +303,13 @@ class TestSystem(unittest.TestCase): Checks the stem.util.system.get_pid_by_open_file function. """ - # on macs this test is unreliable because Quicklook sometimes claims '/tmp' - if stem.util.system.is_mac(): - test.runner.skip(self, "(unreliable due to Quicklook)") - return - # we're not running with a control socket so this just exercises the # failure case - self.assertEquals(None, stem.util.system.get_pid_by_open_file("/tmp")) - self.assertEquals(None, stem.util.system.get_pid_by_open_file("/non-existnt-path")) + tmpdir = tempfile.mkdtemp() + self.assertEquals(None, stem.util.system.get_pid_by_open_file(tmpdir)) + os.rmdir(tmpdir) + self.assertEquals(None, stem.util.system.get_pid_by_open_file(tmpdir)) def test_get_cwd(self): """

1 0

[stem/master] Clarifying comments for the get_pid_by_open_file test
by atagar＠torproject.org 07 Jul '12

07 Jul '12

commit 4c7831fee70848b002b97d8d8dd4b30519ec9eb9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 7 13:15:52 2012 -0700 Clarifying comments for the get_pid_by_open_file test The prior fix is better for the test (working == better!), but makes it a bit less self-descriptive. Adding a couple comments. --- test/integ/util/system.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 19ea5ea..522e576 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -303,11 +303,11 @@ class TestSystem(unittest.TestCase): Checks the stem.util.system.get_pid_by_open_file function. """ - # we're not running with a control socket so this just exercises the - # failure case - + # check a directory that exists, but isn't claimed by any application tmpdir = tempfile.mkdtemp() self.assertEquals(None, stem.util.system.get_pid_by_open_file(tmpdir)) + + # check a directory that doesn't exist os.rmdir(tmpdir) self.assertEquals(None, stem.util.system.get_pid_by_open_file(tmpdir))

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit efb79c7657331347a13a5cfb1a1ecd3e914797c8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 20:15:36 2012 +0000 Update translations for https_everywhere_completed --- ko/https-everywhere.dtd | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd new file mode 100644 index 0000000..37d1e2c --- /dev/null +++ b/ko/https-everywhere.dtd @@ -0,0 +1,38 @@ +<!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여 +"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_description "웹 암호화! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다."> +<!ENTITY https-everywhere.about.version "Version"> +<!ENTITY https-everywhere.about.created_by "작성"> +<!ENTITY https-everywhere.about.librarians "규칙설정 라이브러리"> +<!ENTITY https-everywhere.about.thanks "Thanks to"> +<!ENTITY https-everywhere.about.contribute "모든곳에서 HTTPS를 사용하려면, 고려해 보십시오"> +<!ENTITY https-everywhere.about.donate_tor "Tor에 기부하기"> +<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.donate_eff "EFF에 기부하기"> + +<!ENTITY https-everywhere.menu.about "HTTPS Everywhere에 대하여"> +<!ENTITY https-everywhere.menu.observatory "SSL 관측 환경 설정"> +<!ENTITY https-everywhere.menu.globalEnable "모든곳에서 HTTPS 사용"> +<!ENTITY https-everywhere.menu.globalDisable "모든곳에서 HTTPS 사용 안 함"> + +<!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정"> +<!ENTITY https-everywhere.prefs.enable_all "모두 사용"> +<!ENTITY https-everywhere.prefs.disable_all "모두 사용 안 함"> +<!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정"> +<!ENTITY https-everywhere.prefs.search "검색"> +<!ENTITY https-everywhere.prefs.site "사이트"> +<!ENTITY https-everywhere.prefs.notes "참고"> +<!ENTITY https-everywhere.prefs.list_caption "HTTPS 리디렉션 규칙을 적용하시겟습니까?"> +<!ENTITY https-everywhere.prefs.enabled "사용"> +<!ENTITY https-everywhere.prefs.ruleset_howto "자신의 규칙 작성 방법을 배울 수 있습니다 (다른 웹 사이트에 대한 지원 추가)"> +<!ENTITY https-everywhere.prefs.here_link "여기"> +<!ENTITY https-everywhere.prefs.toggle "전환"> +<!ENTITY https-everywhere.prefs.reset_default "기본값으로 다시 설정"> +<!ENTITY https-everywhere.prefs.view_xml_source "XML 소스 보기"> + +<!ENTITY https-everywhere.source.downloading "다운로드"> +<!ENTITY https-everywhere.source.filename "파일명"> +<!ENTITY https-everywhere.source.unable_to_download "소스를 다운로드할 수 없습니다."> + +

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit f1dfb59027f5094bb6baf0f3ec0489467d1c96be Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 20:15:33 2012 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index d1492f7..37d1e2c 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -4,19 +4,19 @@ <!ENTITY https-everywhere.about.ext_description "웹 암호화! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다."> <!ENTITY https-everywhere.about.version "Version"> <!ENTITY https-everywhere.about.created_by "작성"> -<!ENTITY https-everywhere.about.librarians ""> +<!ENTITY https-everywhere.about.librarians "규칙설정 라이브러리"> <!ENTITY https-everywhere.about.thanks "Thanks to"> -<!ENTITY https-everywhere.about.contribute ""> +<!ENTITY https-everywhere.about.contribute "모든곳에서 HTTPS를 사용하려면, 고려해 보십시오"> <!ENTITY https-everywhere.about.donate_tor "Tor에 기부하기"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.donate_eff "EFF에 기부하기"> <!ENTITY https-everywhere.menu.about "HTTPS Everywhere에 대하여"> -<!ENTITY https-everywhere.menu.observatory ""> -<!ENTITY https-everywhere.menu.globalEnable ""> -<!ENTITY https-everywhere.menu.globalDisable ""> +<!ENTITY https-everywhere.menu.observatory "SSL 관측 환경 설정"> +<!ENTITY https-everywhere.menu.globalEnable "모든곳에서 HTTPS 사용"> +<!ENTITY https-everywhere.menu.globalDisable "모든곳에서 HTTPS 사용 안 함"> -<!ENTITY https-everywhere.prefs.title ""> +<!ENTITY https-everywhere.prefs.title "HTTPS 모든곳 사용 환경 설정"> <!ENTITY https-everywhere.prefs.enable_all "모두 사용"> <!ENTITY https-everywhere.prefs.disable_all "모두 사용 안 함"> <!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정">

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit b9e498f46b6deb5a390cd060e4e006168f22ef71 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 20:15:19 2012 +0000 Update translations for vidalia_help --- ko/config.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ko/config.po b/ko/config.po index 596c0e2..80e3bfe 100644 --- a/ko/config.po +++ b/ko/config.po @@ -1,13 +1,14 @@ # # Translators: +# <pcsori(a)gmail.com>, 2012. # Seongsu Yoon <sople1(a)snooey.net>, 2012. msgid "" 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 16:58+0200\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: Seongsu Yoon <sople1(a)snooey.net>\n" +"PO-Revision-Date: 2012-07-07 20:15+0000\n" +"Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgid "" "proxy is listening for connections. If your proxy requires authentication, " "you can also enter the Username and Password you use to " "connect to your proxy. Otherwise, you can leave those fields blank." -msgstr "" +msgstr "인터넷 액세스에 프록시 사용: 인터넷 연결이 HTTP 프록시를 필요로 할 경우, 프록시를 통해 자신의 디렉토리 요청과 토르 릴레이 연결을 모두 보낼 수 있도록 토르를 구성할 수 있습니다. 최소한 호스트 이름이나 프록시 주소, 그리고 프록시 연결을 수신 대기하는 포트를 지정해야 합니다. 프록시 인증이 필요하면, 프록시 연결에 사용할 사용자 이름과 암호를 입력하실 수 있습니다. 그렇지 않으면, 해당 필드를 비워 두십시오." #. type: Content of: <html><body><ul><li> #: en/config.html:62 @@ -116,7 +117,7 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:77 msgid "Below are examples of valid bridge address formats:" -msgstr "" +msgstr "다음은 유효한 브릿지 주소 형식의 예제입니다 :" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:80

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit 4898af3363a1a7a8dd2c03aac9149cb47b7c5470 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 19:45:38 2012 +0000 Update translations for https_everywhere_completed --- ko/https-everywhere.properties | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ko/https-everywhere.properties b/ko/https-everywhere.properties new file mode 100644 index 0000000..44ba392 --- /dev/null +++ b/ko/https-everywhere.properties @@ -0,0 +1,2 @@ +https-everywhere.menu.globalEnable = 모든 곳에서 HTTPS 사용 +https-everywhere.menu.globalDisable = 모든 곳에서 HTTPS 사용 안 함

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit ca81e6a1ae990f31ee633dc2debf8edb62ee4ffd Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 19:45:35 2012 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 36 ++++++++++++++++++------------------ ko/https-everywhere.properties | 2 ++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index 61c3ead..d1492f7 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -1,9 +1,9 @@ <!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여 "> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description ""> +<!ENTITY https-everywhere.about.ext_description "웹 암호화! 자동으로 여러 사이트에 HTTPS 보안을 사용합니다."> <!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.created_by ""> +<!ENTITY https-everywhere.about.created_by "작성"> <!ENTITY https-everywhere.about.librarians ""> <!ENTITY https-everywhere.about.thanks "Thanks to"> <!ENTITY https-everywhere.about.contribute ""> @@ -17,22 +17,22 @@ <!ENTITY https-everywhere.menu.globalDisable ""> <!ENTITY https-everywhere.prefs.title ""> -<!ENTITY https-everywhere.prefs.enable_all ""> -<!ENTITY https-everywhere.prefs.disable_all ""> -<!ENTITY https-everywhere.prefs.reset_defaults ""> -<!ENTITY https-everywhere.prefs.search ""> -<!ENTITY https-everywhere.prefs.site ""> -<!ENTITY https-everywhere.prefs.notes ""> -<!ENTITY https-everywhere.prefs.list_caption ""> -<!ENTITY https-everywhere.prefs.enabled ""> -<!ENTITY https-everywhere.prefs.ruleset_howto ""> -<!ENTITY https-everywhere.prefs.here_link ""> -<!ENTITY https-everywhere.prefs.toggle ""> -<!ENTITY https-everywhere.prefs.reset_default ""> -<!ENTITY https-everywhere.prefs.view_xml_source ""> +<!ENTITY https-everywhere.prefs.enable_all "모두 사용"> +<!ENTITY https-everywhere.prefs.disable_all "모두 사용 안 함"> +<!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정"> +<!ENTITY https-everywhere.prefs.search "검색"> +<!ENTITY https-everywhere.prefs.site "사이트"> +<!ENTITY https-everywhere.prefs.notes "참고"> +<!ENTITY https-everywhere.prefs.list_caption "HTTPS 리디렉션 규칙을 적용하시겟습니까?"> +<!ENTITY https-everywhere.prefs.enabled "사용"> +<!ENTITY https-everywhere.prefs.ruleset_howto "자신의 규칙 작성 방법을 배울 수 있습니다 (다른 웹 사이트에 대한 지원 추가)"> +<!ENTITY https-everywhere.prefs.here_link "여기"> +<!ENTITY https-everywhere.prefs.toggle "전환"> +<!ENTITY https-everywhere.prefs.reset_default "기본값으로 다시 설정"> +<!ENTITY https-everywhere.prefs.view_xml_source "XML 소스 보기"> -<!ENTITY https-everywhere.source.downloading ""> -<!ENTITY https-everywhere.source.filename ""> -<!ENTITY https-everywhere.source.unable_to_download ""> +<!ENTITY https-everywhere.source.downloading "다운로드"> +<!ENTITY https-everywhere.source.filename "파일명"> +<!ENTITY https-everywhere.source.unable_to_download "소스를 다운로드할 수 없습니다."> diff --git a/ko/https-everywhere.properties b/ko/https-everywhere.properties new file mode 100644 index 0000000..44ba392 --- /dev/null +++ b/ko/https-everywhere.properties @@ -0,0 +1,2 @@ +https-everywhere.menu.globalEnable = 모든 곳에서 HTTPS 사용 +https-everywhere.menu.globalDisable = 모든 곳에서 HTTPS 사용 안 함

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit 891aeadeb34e94d78268f201bb97923962403589 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 19:45:14 2012 +0000 Update translations for vidalia_completed --- ko/vidalia_ko.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index ac877d7..8a4f5e5 100644 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-07-07 19:10+0000\n" +"PO-Revision-Date: 2012-07-07 19:23+0000\n" "Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgstr "귀하의 설정 파일의 경로를 지정하십시오." msgctxt "AdvancedPage" msgid "Browse" -msgstr "찬아보기" +msgstr "찾아보기" msgctxt "AdvancedPage" msgid "Data Directory"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit 98cbee3522822d715a5bcbab8327b919b55ffd5e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 19:45:11 2012 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index ac877d7..8a4f5e5 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-07-07 19:10+0000\n" +"PO-Revision-Date: 2012-07-07 19:23+0000\n" "Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgstr "귀하의 설정 파일의 경로를 지정하십시오." msgctxt "AdvancedPage" msgid "Browse" -msgstr "찬아보기" +msgstr "찾아보기" msgctxt "AdvancedPage" msgid "Data Directory"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 07 Jul '12

07 Jul '12

commit babb3eef35ccf3993c8600f52aca76372019da84 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 7 19:15:11 2012 +0000 Update translations for vidalia_completed --- ko/vidalia_ko.po | 113 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 73 insertions(+), 40 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index 5584132..ac877d7 100644 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -1,15 +1,17 @@ -# Translators: +# # Translators: # <contact(a)imfast.kr>, 2011. # <cwt967(a)naver.com>, 2011, 2012. +# <pcsori(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. +# tor.korean.translate <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-14 09:46+0000\n" -"Last-Translator: cwt96 <cwt967(a)naver.com>\n" +"POT-Creation-Date: 2012-03-21 17:52+0000\n" +"PO-Revision-Date: 2012-07-07 19:10+0000\n" +"Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -201,6 +203,13 @@ msgstr "제어 포트를 자동적으로 설정" msgctxt "AdvancedPage" msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "ControlPort에 대한 자동 구성 옵션을 선택했으나 제공된 데이터 디렉터리가 없습니다. 데이터 디렉터리를 추가하거나 \"자동으로 ControlPort 구성\"의 선택을 해제하십시오." + +msgctxt "AdvancedPage" +msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -226,6 +235,23 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "Vidalia는 선택된 언어 번역을 읽지 못했습니다." +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "시스템 아이콘 환경 설정 (Vidalia를 다시 시작하면 변경 내용이 적용됩니다)" + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr "트레이 아이콘 및 도킹 아이콘 표시 (기본값)" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "트레이 아이콘 숨기기" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "Dock아이콘 숨기기" + msgctxt "BandwidthGraph" msgid "Since:" msgstr "since:" @@ -1751,10 +1777,6 @@ msgid "Connected to the Tor network!" msgstr "Tor 네트워크에 연결 성공!" msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "알 수없는 시작 상태" - -msgctxt "MainWindow" msgid "miscellaneous" msgstr "잡동사니" @@ -2066,6 +2088,24 @@ msgid "" msgstr "이 연결을 통해 보낸 아무것이나 모니터링 할 수 있습니다. 가능하면 응용 프로그램의 설정을 확인 SSL (Secure Socket Layer)같은 암호화된 프로토콜 만을 사용하시기 바랍니다." msgctxt "MainWindow" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "%1에서 %2로 부팅 " + +msgctxt "MainWindow" +msgid "(probably Telnet)" +msgstr "(probably Telnet)" + +msgctxt "MainWindow" +msgid "(probably an email client)" +msgstr "(아마 이메일 클라이언트)" + +msgctxt "MainWindow" +msgid "" +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." +msgstr "응용 프로그램 %1 중 하나는 포트 %2에 잠재적으로 암호화되지 않고 안전하지 않은 연결을 만드는 것 같습니다." + +msgctxt "MainWindow" msgid "failed (%1)" msgstr "실패 (%1)" @@ -2076,8 +2116,19 @@ msgid "" msgstr "현재 중계가 종료중입니다. 중계를 지금 종료하려면 멈춤 버튼을 다시 눌러주십시오." msgctxt "MainWindow" -msgid "Bootstrapping torrc from %1 to %2" -msgstr "%1에서 %2로 부팅 " +msgid "" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" +"\n" +"Here's the last error message:\n" +"%2" +msgstr "Vidalia는 파일에 액세스할 수 없기 때문에 토르 이야기하는 방법을 찾을 수 없습니다 : %1⏎\n⏎\n마지막 오류메시지:⏎\n%2" + +msgctxt "MainWindow" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." +msgstr "Vidalia가 시작된 이후에 Tor가 실행을 중지한 것 같습니다.\n\n자세한 내용은 고급 메시지 로그를 참조하십시오." msgctxt "MainWindow" msgid "" @@ -2093,20 +2144,6 @@ msgid "" "Please check the message log for recent warning or error messages." msgstr "Vidalia는 Tor가 예기치 못하게 종료된 것을 감지했습니다.\n\n최근의 경고나 오류 메시지를 확인하여 주십시오." -msgctxt "MainWindow" -msgid "(probably Telnet)" -msgstr "(probably Telnet)" - -msgctxt "MainWindow" -msgid "(probably an email client)" -msgstr "(아마 이메일 클라이언트)" - -msgctxt "MainWindow" -msgid "" -"One of your applications %1 appears to be making a potentially unencrypted " -"and unsafe connection to port %2." -msgstr "응용 프로그램 %1 중 하나는 포트 %2에 잠재적으로 암호화되지 않고 안전하지 않은 연결을 만드는 것 같습니다." - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "필터 설정 오류" @@ -2519,14 +2556,6 @@ msgid "Ctrl+F" msgstr "Ctrl+F" msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "잘못된 브릿지" - -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "주어진 Bridge 식별자는 불량입니다." - -msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" msgstr "복사 (Ctrl+C)" @@ -2659,13 +2688,13 @@ msgid "SOCKS 5" msgstr "SOCKS 5" msgctxt "NetworkPage" -msgid "HTTP" -msgstr "HTTP" - -msgctxt "NetworkPage" msgid "HTTP / HTTPS" msgstr "HTTP / HTTPS" +msgctxt "NetworkPage" +msgid "You must specify one or more bridges." +msgstr "하나 이상의 bridge를 지정해야 합니다." + msgctxt "Policy" msgid "accept" msgstr "동의" @@ -2843,10 +2872,6 @@ msgid "Run as a client only" msgstr "클라이언트만 작동" msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr " Tor 네트워크를 위하여 트래픽을 중계합니다.(추천)" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "중계 포트" @@ -3091,6 +3116,14 @@ msgid "Automatically distribute my bridge address" msgstr "자동적으로 나의 브릿지 주소 배포" msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "Tor 네트워크를 위해 트래픽을 중계 (출구 중계)" + +msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "Tor 네트워크를 위해 트래픽을 중계 (출구 중계 아님)" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "중계소 목록를 미러"

1 0