- tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit 0b59767fd74da09f7480736054c0af28607e1575 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:15:51 2012 +0000 Update translations for torcheck_completed --- ko/torcheck.po | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po new file mode 100644 index 0000000..4e1c787 --- /dev/null +++ b/ko/torcheck.po @@ -0,0 +1,58 @@ +# TorCheck gettext template +# Copyright (C) 2008-2012 The Tor Project, Inc +# +# Translators: +# <cwt967(a)gmail.com>, 2012. +# <cwt967(a)naver.com>, 2012. +msgid "" +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 20:28+PDT\n" +"PO-Revision-Date: 2012-06-29 08:59+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" +"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: ko\n" +"Plural-Forms: nplurals=1; plural=0\n" + +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "축하합니다. 귀하의 브라우저는 Tor를 사용하도록 설정되었습니다." + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "Tor를 안전하게 사용하는 정보에 관한 정보를 얻으려면 <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 귀하는 이제 인터넷을 익명으로 자유롭게 탐색할 수 있습니다." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Tor browser Bundle에 대한 보안 업데이트가 있습니다." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">다운로드 페이지로 가려면 여기를 선택하십시오.</a>" + +msgid "Sorry. You are not using Tor." +msgstr "지금 Tor를 사용하지 않고 있습니다. " + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Tor 클라이언트를 사용하고 싶으시다면, <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 특히, <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">Tor 클라이언트 설정 방법</a>를 방문하십시오." + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "죄송하지만, 귀하의 쿼리나 예상되지 않은 반응을 받았습니다." + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "임시적인 서비스 중단이 귀하의 IP 주소가 <a href=\"https://www.torproject.org/\">Tor</a> node인지 알려주는 것을 막았습니다." + +msgid "Your IP address appears to be: " +msgstr "귀하의 IP는 다음과 같이 보입니다. "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit b3eebdb23ffbd61c6474ac72bb691b6aa2bdba47 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:15:50 2012 +0000 Update translations for torcheck --- ko/torcheck.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index e1e5993..4e1c787 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -3,13 +3,14 @@ # # Translators: # <cwt967(a)gmail.com>, 2012. +# <cwt967(a)naver.com>, 2012. msgid "" 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 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 09:03+0000\n" -"Last-Translator: cwt967 <cwt967(a)gmail.com>\n" +"PO-Revision-Date: 2012-06-29 08:59+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,21 +20,21 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "" +msgstr "축하합니다. 귀하의 브라우저는 Tor를 사용하도록 설정되었습니다." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Tor를 안전하게 사용하는 정보에 관한 정보를 얻으려면 <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 귀하는 이제 인터넷을 익명으로 자유롭게 탐색할 수 있습니다." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Tor browser Bundle에 대한 보안 업데이트가 있습니다." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">다운로드 페이지로 가려면 여기를 선택하십시오.</a>" msgid "Sorry. You are not using Tor." msgstr "지금 Tor를 사용하지 않고 있습니다. " @@ -43,15 +44,15 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Tor 클라이언트를 사용하고 싶으시다면, <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 특히, <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">Tor 클라이언트 설정 방법</a>를 방문하십시오." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "" +msgstr "죄송하지만, 귀하의 쿼리나 예상되지 않은 반응을 받았습니다." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "임시적인 서비스 중단이 귀하의 IP 주소가 <a href=\"https://www.torproject.org/\">Tor</a> node인지 알려주는 것을 막았습니다." msgid "Your IP address appears to be: " msgstr "귀하의 IP는 다음과 같이 보입니다. "

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit 3f1af5958a7ce98cb75003f828aeb412cf012954 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:15:31 2012 +0000 Update translations for orbot_completed --- values/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values/strings.xml b/values/strings.xml index 6d398c2..461bf86 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit fdb7cd133a9924f8097e2f3e0d4379b2a60d8997 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:15:28 2012 +0000 Update translations for orbot --- values-ca/strings.xml | 2 +- values-cs/strings.xml | 2 +- values-el/strings.xml | 2 +- values-es_AR/strings.xml | 2 +- values-ja/strings.xml | 2 +- values-mk/strings.xml | 2 +- values-nb/strings.xml | 2 +- values-pt/strings.xml | 2 +- values-sv/strings.xml | 2 +- values/strings.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/values-ca/strings.xml b/values-ca/strings.xml index 9288330..413104b 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-cs/strings.xml b/values-cs/strings.xml index 95ce80a..e568348 100644 --- a/values-cs/strings.xml +++ b/values-cs/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-el/strings.xml b/values-el/strings.xml index 388ff2f..e66430b 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-es_AR/strings.xml b/values-es_AR/strings.xml index 998bbd0..bd92b9a 100644 --- a/values-es_AR/strings.xml +++ b/values-es_AR/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-ja/strings.xml b/values-ja/strings.xml index a431ccb..b42ecf2 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 62e509f..3a4959f 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index a837fa6..30085e8 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index 02a6ea8..d8c9097 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 5fc303d..734cd30 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string> diff --git a/values/strings.xml b/values/strings.xml index 6d398c2..461bf86 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -191,7 +191,7 @@ <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Jun '12

29 Jun '12

commit 8fd69db292e6b523a993c9bad251e5ffc9531087 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 29 09:15:04 2012 +0000 Update translations for gettor --- ko/gettor.po | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 455 insertions(+), 0 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po new file mode 100644 index 0000000..2193a2b --- /dev/null +++ b/ko/gettor.po @@ -0,0 +1,455 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <cwt967(a)naver.com>, 2012. +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-06-29 09:14+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" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "안녕하세요, 이것은 \"Gettor\" 로봇입니다." + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "귀하의 요청에 감사드립니다." + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "불행하게도, 우리는 이 주소로 답변을 보내지 않을 것입니다. GMAIL.COM, YAHOO.COM, YAHOO.CN 의 메일 주소를 만드시고 그 메일로 다시 메일을 보내 주십시오." + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "원하는 Tor 패키지를 이름을 보낸다면, Tor 패키지를 보내 드립니다.\n아래와 같은 패키지 이름 중 하나를 선택해 주십시오.\n\n windows\n macos-i386\n macos-ppc\n linux-i386\n linux-x86_64\n source" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "이 메일에 답변해 주십시오. 그리도 하나의 패키지 이름을 메일 본문 중 어디든지 써서 보내 주십시오." + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "사용할 수 있는 언어의 목록:" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr " gettor+ar(a)torproject.org: 아라비아어\n gettor+de(a)torproject.org: 독일어\n gettor+en(a)torproject.org: 영어\n gettor+es(a)torproject.org: 스페인어\n gettor+fa(a)torproject.org: 페르시아어(이란)\n gettor+fr(a)torproject.org: 프랑스어\n gettor+it(a)torproject.org: 이탈이아어\n gettor+nl(a)torproject.org: 네덜란드어\n gettor+pl(a)torproject.org: 폴란드어\n gettor+ru(a)torproject.org: 러시아어\n gettor+zh(a)torproject.org: 중국어" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "언어를 선택하지 않으면, 영어 버전을 보내드립니다." + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "작은 크기 패키지\n===========" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "귀하의 대역폭이 낮거나 귀하의 ISP가 이메일에서 큰 첨부파일을 허용하지 않을경우, GetTor는 큰 파일 대신 작은 여러 개의 압축 파일을 보낼 수 있습니다." + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "간단히 'split' 을 다음 줄에 써 주십시오. 예시는 다음과 같습니다:\n \n windows\n split" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "지원\n=====" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "막혀진 접근 / 검열\n===========================" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "패키지가 곧 도착할 것입니다. 모든 패키지를 압축을 풀려고 하기 전에, 모든 패키지가 받아졌는지 확실히 해 주십시오." + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "파일 압축 풀기\n=============" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "이 메일에 답변해 주십시오. 그리고 원하는 하나의 패키지 이름을 답변 어디든지 적어 주십시오. 여기 이 패키지가 무엇인지에 대한 짧은 설명이 있습니다." + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "windows : \n윈도우 운영 체제를 위한 Tor browser bundle입니다. Windows XP, Windows Vista, Windows 7 등을 사용하고 계신다면, 이 패키지가 필요합니다." + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "macos-i386:\nIntel 아키렉처를 사용하고 있는 OS X를 위한 Tor Browser Bundle입니다. 일반적으로, 최근의 Mac 하드웨어는 이 패키지가 필요합니다." + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "macos-ppc:\nPowerPC CPU를 사용하는 Mac을 위한 이것은 오래된 인스톨러(Vidalia bundle)입니다. 이 패키지는 곧 사라질 것입니다." + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "linux-i386:\n리눅스 32bit 버전을 위한 Tor Browser Bundle입니다." + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "주의 : 이 패키지는 30MB보다 크므로 이메일 제공자가 30MB 이상의 첨부 파일을 허용해야 합니다." + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[githax/master] Update make-tor-next script to handle multiple repositories
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit afa55796e75a3c3b18310c46986a164b5c30e459 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:41:12 2012 -0400 Update make-tor-next script to handle multiple repositories --- scripts/make-tor-next | 66 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 11 deletions(-) diff --git a/scripts/make-tor-next b/scripts/make-tor-next index 2997a75..1fb5df1 100755 --- a/scripts/make-tor-next +++ b/scripts/make-tor-next @@ -8,6 +8,10 @@ import subprocess import sys import time +if len(sys.argv) != 2 or sys.argv[1] not in ["023", "master"]: + print >>sys.stderr, "I want an argument: 023 or master." + sys.exit(1) + # Where to build the tor-next tree. this needs to be a clone of the main tor repo DIR = os.path.expanduser("~/src/tor-next") # What file in that directory do you use for your list of branches to include? @@ -26,28 +30,68 @@ GRANDFATHERED_REPOS = set(""" BASE_BRANCH = "origin/master" # To which repository do we push the pu branch and the tor-next branch? TARGET_REPO = "tor-next" +TARGET_BRANCH = "tor-next" + +TMP_BRANCH_PREFIX = "pu-" logging.basicConfig(level="INFO", format=">>>> %(levelname)s: %(message)s") +if sys.argv[1] == "023": + DIR = os.path.expanduser("~/src/tor-next-023") + BRANCHLIST = os.path.join(DIR, "TOR_NEXT_BRANCHES") + BASE_BRANCH = "origin/release-0.2.3" + TARGET_REPO = "tor-next" + TARGET_BRANCH = "tor-next-023" + TMP_BRANCH_PREFIX = "pu-023-" # 0. PARSE STUFF. +def parseRemoteConfigLine(line): + m = re.match(r'remote\s+(\S+)\s*=\s*(\S+)', line) + if not m: + return None + return m.groups() + +branchlist_contents = [] + def read_remotes_and_branches(fname): branches = [] + specialRemotes = [] + with open(fname) as f: for line in f: + line_orig = line line = re.sub(r'#.*', '', line) line = line.strip() + if line.startswith("include "): + fname2 = line.split()[1] + branchlist_contents.append("# BEGIN: %s"%line) + r,b = read_remotes_and_branches(os.path.expanduser(fname2)) + branchlist_contents.append("# END: %s"%line) + specialRemotes.extend([(k,v) for k,v in r.iteritems()]) + branches.extend(b) + continue + + branchlist_contents.append(line_orig) + if not line: continue + rmt = parseRemoteConfigLine(line) + if rmt != None: + specialRemotes.append(rmt) + continue + if "/" not in line: logging.warn("Bogus absolute branch %s", line) branches.append(line) - remotes = set() + remotes = {} for b in branches: - remotes.add(b.split("/")[0]) + remotes[b.split("/")[0]] = None + for rmt, url in specialRemotes: + if rmt in remotes: + remotes[rmt] = url return remotes, branches @@ -72,8 +116,9 @@ def fix_remotes(want_remotes): if fields[2] != "(fetch)": continue have_remotes[fields[0]] = fields[1] - for rmt in want_remotes: - repo = repoName(rmt) + for rmt, repo in want_remotes.iteritems(): + if repo == None: + repo = repoName(rmt) if rmt not in have_remotes: logging.info("Adding remote %s", rmt) subprocess.check_call(["git", "remote", "add", rmt, repo]) @@ -96,7 +141,7 @@ update_remotes(remotes) # 2. MERGE STUFF INTO A NEW TEMP BRANCH -temp_branch_name = time.strftime("pu-%Y%m%d%H%M%S", time.gmtime()) +temp_branch_name = TMP_BRANCH_PREFIX+time.strftime("%Y%m%d%H%M%S", time.gmtime()) subprocess.check_call(["git", "branch", "-f", temp_branch_name, BASE_BRANCH]) subprocess.check_call(["git", "checkout", temp_branch_name]) @@ -134,7 +179,7 @@ with open("README.tor-next", 'w') as f: # Here are the branches I used: """% temp_branch_name) - f.write( open(BRANCHLIST).read() ) + f.write( "".join(branchlist_contents) ) f.write("\n") subprocess.check_call(["git", "add", "README.tor-next"]) @@ -146,7 +191,7 @@ logging.info("Looks okay to me. Will it compile?") try: logfile = temp_branch_name+".log" with open(logfile, 'w') as f: - logging.info("(logging output to %s", logfile) + logging.info("(logging output to %s)", logfile) logging.info("configuring...") subprocess.check_call(["sh", "autogen.sh"], stdout=f,stderr=f) subprocess.check_call(["./configure", "--enable-gcc-warnings"], @@ -154,16 +199,15 @@ try: logging.info("building...") subprocess.check_call(["make", "clean"], stdout=f, stderr=f) subprocess.check_call(["make", "-j4"], stdout=f, stderr=f) -except CalledProcessError: +except subprocess.CalledProcessError: logging.warn("Build wasn't clean. Exiting") sys.exit(1) logging.info("Build seemed to work. Pushing it!") - subprocess.check_call(["git", "push", TARGET_REPO, temp_branch_name]) -subprocess.check_call(["git", "push", TARGET_REPO, "+%s:tor-next"%(temp_branch_name)]) -logging.info("Pushed tor-next. It's a great big beautiful tomorrow.") +subprocess.check_call(["git", "push", TARGET_REPO, "+%s:%s"%(temp_branch_name,TARGET_BRANCH)]) +logging.info("Pushed %s. It's a great big beautiful tomorrow.",TARGET_BRANCH) LICENSE = """

1 0

[tor/master] Fix crash bug from 4a8eaad7 (Bug 6255)
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit 6abdcdf11641b9d7e84d438ece781dcfb689a705 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:32:27 2012 -0400 Fix crash bug from 4a8eaad7 (Bug 6255) We were doing a tor_strclear() on client_keys_str when it might not even be set. Fix for bug 6255; bug not in any release of Tor. Thanks to katmagic for finding this one! --- src/or/rendservice.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8acc226..689cfb1 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -724,7 +724,6 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) } else { log_info(LD_CONFIG, "Parsed %d previously stored client entries.", strmap_size(parsed_clients)); - tor_free(client_keys_str); } } @@ -870,8 +869,10 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) if (open_hfile) abort_writing_to_file(open_hfile); done: - tor_strclear(client_keys_str); - tor_free(client_keys_str); + if (client_keys_str) { + tor_strclear(client_keys_str); + tor_free(client_keys_str); + } strmap_free(parsed_clients, rend_authorized_client_strmap_item_free); memset(cfname, 0, sizeof(cfname));

1 0

[tor/master] Merge branch 'bug6255'
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit ed2601f2be0978c37c0ae086b2a8d2f7d94078fc Merge: 630677f 6abdcdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:43:59 2012 -0400 Merge branch 'bug6255' src/or/rendservice.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] bump version to 0.2.3.18-rc-dev
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit 9c5a118272bfbb7d4c287f4310237bf90a404c63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 16:01:55 2012 -0400 bump version to 0.2.3.18-rc-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e9ef4f8..1db7d08 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc) +AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 75b2567..2133a47 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.18-rc" +!define VERSION "0.2.3.18-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a5bd2ee..d780d5d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.18-rc" +#define VERSION "0.2.3.18-rc-dev"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 29 Jun '12

29 Jun '12

commit 630677f339dda6fbb720380d42cfe247b85eb1a8 Merge: da3edc4 9c5a118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 00:38:30 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3'

1 0