October 2020 - tor-commits - lists.torproject.org

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 7d18c4728ad0818a58f52c60c79c358dfeb73da8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 13:17:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ko.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+ko.po b/contents+ko.po index 2cae6b26c8..682cd3215b 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -7,6 +7,7 @@ # Philipp Sauter <qt123(a)pm.me>, 2020 # edfcf61188be1fdc09edea36af6d8e18_dc16ee2, 2020 # 김진서 <7020kjs(a)naver.com>, 2020 +# 장민준 <mizizang(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: 김진서 <7020kjs(a)naver.com>, 2020\n" +"Last-Translator: 장민준 <mizizang(a)gmail.com>, 2020\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2850,7 +2851,7 @@ msgstr "배너 닫기" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "추적, 감시, 검열은 온라인상에서 널리 퍼져 있습니다." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 166b885b4bce4e94d5964a65dbc5dd2b81d1ebbf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 13:16:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt.po b/lt.po index 76da5771a0..7291b4d92a 100644 --- a/lt.po +++ b/lt.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-27 19:02+0100\n" -"PO-Revision-Date: 2020-10-30 00:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-10-30 13:13+0000\n" +"Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 05cfb7f7e1d9e298cb857f66e6f617a5610a9fed Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 13:16:01 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lt.po b/lt.po index 23ff132eff..5e70a6fd67 100644 --- a/lt.po +++ b/lt.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-27 19:02+0100\n" -"PO-Revision-Date: 2020-10-30 00:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-10-30 13:13+0000\n" +"Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2019,7 +2019,7 @@ msgstr "Sužinoti daugiau apie Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-installer.desktop.in.h:2 msgid "Install, clone, upgrade Tails" -msgstr "" +msgstr "Įdiegti, kopijuoti, naujinti Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:1 msgid "Delete persistent volume"

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit b17368f8460e099e0fae7466bbf5868551f18810 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 13:15:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ko.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code_of_conduct+ko.po b/code_of_conduct+ko.po index 4b14d91396..ba7bcd6f0a 100644 --- a/code_of_conduct+ko.po +++ b/code_of_conduct+ko.po @@ -718,6 +718,8 @@ msgid "" "This code of conduct uses some language and framing from the Citizen Code of" " Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" msgstr "" +"이 행동 강령은 CC-BY-SA 라이센스에 따라 공유되는 시민 행동 강령의 일부 언어와 프레임을 사용합니다: " +"citizencodeofconduct.org" #. type: Plain text #: ../code_of_conduct.txt:289 @@ -725,3 +727,5 @@ msgid "" "[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " "https://gitweb.torproject.org/community/policies.git/tree/community_council…" msgstr "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…"

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 7f0d39ba6e95a9e8bbf79b43951cf540f2573e89 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 13:15:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ko/LC_MESSAGES/messages.po | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/locale/ko/LC_MESSAGES/messages.po b/locale/ko/LC_MESSAGES/messages.po index 347f1affa1..a065a7e893 100644 --- a/locale/ko/LC_MESSAGES/messages.po +++ b/locale/ko/LC_MESSAGES/messages.po @@ -7,23 +7,24 @@ # Emma Peel, 2019 # erinm, 2019 # Min Hong <silverdel(a)se.works>, 2019 +# 장민준 <mizizang(a)gmail.com>, 2020 # msgid "" msgstr "" -"Last-Translator: Min Hong <silverdel(a)se.works>, 2019\n" +"Last-Translator: 장민준 <mizizang(a)gmail.com>, 2020\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "추적, 감시, 검열은 온라인상에서 널리 퍼져 있습니다." #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 msgid "Take back the internet with Tor" -msgstr "" +msgstr "Tor와 함께 인터넷을 되찾으세요." #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112 msgid "Give today, and Mozilla will match your donation." @@ -129,7 +130,7 @@ msgstr "암호화폐 지갑 주소를 이용하여 기부" msgid "" "Please fill out this form and then send your coins to the appropriate " "wallet." -msgstr "" +msgstr "이 양식을 작성한 후 적절한 지갑으로 코인을 보내주시기 바랍니다." #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:135 msgid "" @@ -137,6 +138,8 @@ msgid "" "your donation quickly, allow us to send you an acknowledgement, and let us " "know your communication preferences." msgstr "" +"양식을 작성할 필요는 없지만, 양식을 작성하면 기부 사실을 신속히 알려드리고, 확인서를 보내드리며, 귀하의 커뮤니케이션 선호 사항을 " +"알려드립니다." #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:141 msgid ""

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 297b60136dc87ff3bb4031e09eafa40f4679f0e3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 13:15:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ko/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 3accf7e86c..794cf8687f 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-10-29 12:58+0000\n" +"PO-Revision-Date: 2020-10-30 13:14+0000\n" "Last-Translator: 장민준 <mizizang(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -110,7 +110,7 @@ msgstr "이 QR코드는 당신의 브릿지 행을 포함하고 있습니다. #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB에 오류가 발생했습니다." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -212,7 +212,7 @@ msgstr "속도 제한을 초과하였습니다. 속도를 낮추세요! 이메 msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "이러한 브릿지가 필요한 것이 아닌 경우 다음 중 하나로 이 이메일에 회신하십시오.\n메시지 본문의 다음 명령:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 5500d0471013d502bc162038d53bc7a1e63b580e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 12:45:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ko.po | 68 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/code_of_conduct+ko.po b/code_of_conduct+ko.po index 5ccb7bdce3..4b14d91396 100644 --- a/code_of_conduct+ko.po +++ b/code_of_conduct+ko.po @@ -187,7 +187,7 @@ msgid "" "socioeconomic status, body size, race, ethnicity, age, religion, " "nationality, or membership in a disadvantaged and/or underrepresented group." msgstr "" -"Tor 공동체의 주요 목표는 다양한 기여자들을 포함하는 것입니다. 우리는 가능한 가장 다양하고 다양한 배경의 기여자들을 포함하고 " +"Tor 커뮤니티의 주요 목표는 다양한 기여자들을 포함하는 것입니다. 우리는 가능한 가장 다양하고 다양한 배경의 기여자들을 포함하고 " "싶습니다. 따라서 우리는 경험, 성별 정체성 또는 표현, 성적 지향, 가족, 관계, 능력 (신체 또는 정신적으로), 개인 외모, 사회 " "경제적 지위, 신체 크기, 인종, 민족성, 나이, 종교, 국적 또는 소외된 그룹의 구성원에 관계없이 모든 사람들에게 친절하고 안전하고 " "환영받는 환경을 제공하는 데 전념하고 있습니다." @@ -209,7 +209,7 @@ msgstr "" msgid "" "This code of conduct outlines our expectations for all those who participate" " in our community, as well as the consequences for unacceptable behavior." -msgstr "이 행동 강령은 우리 공동체에 참여하는 모든 사람들에 대한 우리의 기대와 용납할 수 없는 행동에 대한 결과를 요약합니다." +msgstr "이 행동 강령은 우리 커뮤니티에 참여하는 모든 사람들에 대한 우리의 기대와 용납할 수 없는 행동에 대한 결과를 요약합니다." #. type: Plain text #: ../code_of_conduct.txt:74 @@ -239,7 +239,7 @@ msgstr "모든 커뮤니티 구성원에게 다음과 같은 행동이 요구됩 msgid "" "Participate in an honest and active way. In doing so, you contribute to the " "health and longevity of this community." -msgstr "정직하고 적극적인 방법으로 참여하세요. 그렇게 함으로써, 여러분은 이 공동체의 건강과 장수에 기여합니다." +msgstr "정직하고 적극적인 방법으로 참여하세요. 그렇게 함으로써, 여러분은 이 커뮤니티의 건강과 장수에 기여합니다." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:85 @@ -492,8 +492,8 @@ msgid "" "authority. People in formal or informal leadership roles must model the " "highest standards of behavior." msgstr "" -"우리는 어떤 공동체 구성원으로부터도 용납할 수 없는 행동을 용납하지 않을 것입니다. 스폰서 및 의사결정 권한이 있는 사람은 예외로 하지 " -"않습니다. 공식적인 또는 비공식적인 리더쉽 역할을 하는 사람들은 행동의 최고 기준을 모델링해야 합니다." +"우리는 어떤 커뮤니티 구성원으로부터도 용납할 수 없는 행동을 용납하지 않을 것입니다. 스폰서 및 의사결정 권한이 있는 사람은 예외로 하지" +" 않습니다. 공식적인 또는 비공식적인 리더쉽 역할을 하는 사람들은 행동의 최고 기준을 모델링해야 합니다." #. type: Plain text #: ../code_of_conduct.txt:192 @@ -502,8 +502,8 @@ msgid "" "expected to comply immediately. Please don't step in on someone else's " "behalf without their consent." msgstr "" -"용납할 수 없는 행동을 멈추라고 다른 지역 사회 구성원이 요청하는 사람은 즉시 응할 것으로 예상됩니다. 다른 사람의 동의 없이 다른 " -"사람을 대신해서 끼어들지 마세요." +"용납할 수 없는 행동을 멈추라고 다른 커뮤니티 구성원이 요청하는 사람은 즉시 응할 것으로 예상됩니다. 다른 사람의 동의 없이 다른 사람을" +" 대신해서 끼어들지 마세요." #. type: Plain text #: ../code_of_conduct.txt:195 @@ -523,18 +523,18 @@ msgid "" "and information can be found on the Community Council wiki [1]. You can " "contact the whole Community council:" msgstr "" -"커뮤니티 협의회는 지역 사회 분쟁 해결을 도울 수 있는 Tor 코어 기여자의 선출된 조직입니다. 커뮤니티 협의회 정책 및 정보는 커뮤니티" -" 협의회 위키 [1]에서 찾을 수 있습니다. 전체 주민자치회에 문의할 수 있습니다:" +"커뮤니티 협의회는 커뮤니티 분쟁 해결을 도울 수 있는 Tor 코어 기여자의 선출된 조직입니다. 커뮤니티 협의회 정책 및 정보는 커뮤니티 " +"협의회 위키 [1]에서 찾을 수 있습니다. 전체 커뮤니티 협의회에 문의할 수 있습니다:" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:203 msgid "if you have questions or concerns about the code of conduct, or" -msgstr "" +msgstr "행동 강령에 대한 질문이나 우려가 있다면, 또는" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:205 msgid "if you feel that you have witnessed a code of conduct violation" -msgstr "" +msgstr "만약 당신이 행동강령 위반을 목격했다고 느끼신다면" #. type: Plain text #: ../code_of_conduct.txt:212 @@ -546,6 +546,9 @@ msgid "" "involved in any discussion or documentation of the incident. More about the " "Community Council can be found in the guidelines [2]." msgstr "" +"다만, 의원 누구와도 이해충돌이 있다고 판단될 경우 의원별로 연락할 수 있습니다. 의회 구성원의 GPG 키는 커뮤니티 협의회 위키에 " +"나열되어 있습니다. 이해 상충이 있을 경우, 영향을 받은 의원은 자신을 회유할 것입니다. 이들은 사건에 대한 어떠한 논의나 문서화에도 " +"관여하지 않을 것입니다. 커뮤니티 협의회에 대한 자세한 내용은 지침 [2]에서 확인할 수 있습니다." #. type: Plain text #: ../code_of_conduct.txt:215 @@ -554,6 +557,8 @@ msgid "" "6. What to do if you witness unacceptable behavior\n" "============================================================\n" msgstr "" +"6. 용납할 수 없는 행동을 목격할 경우 어떻게 해야 하는가\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:230 @@ -572,6 +577,13 @@ msgid "" "danger or harm to anyone. More information about the Community Council's " "incident reporting and response policies can be found on their wiki [1]." msgstr "" +"용납할 수 없는 행동을 당하거나 목격하거나 다른 문제가 있는 경우, 가능한 한 빨리 커뮤니티 협의회에 통보해 주십시오. 커뮤니티 협의회에" +" 직접 문의하시거나, tor-property-council(a)lists.torproject.xn--org-k94n91q 문의하실 수 있습니다. 현재 의원은 " +"위키[1]에 등록되어 있습니다. 커뮤니티 협의회의 사고 대응은 사례별로 다를 것입니다. 의회는 이 사건에 즉각 대응하기 위해 모든 노력을" +" 다할 것입니다. 의회는 피해를 입었거나 피해를 입을 위험이 있는 사람의 안전을 최우선으로 할 것입니다. 피해를 입었거나 피해를 입을 " +"위험이 있는 사람은 언제든지 사고 보고서를 철회할 수 있습니다. 누구에게도 임박한 위험이나 위해의 위협이 있는 경우를 제외하고는 피해를 " +"입었거나 위해의 위험이 있는 사람의 동의 없이는 어떤 것도 하지 않을 것입니다. 커뮤니티 협의회의 사고 보고 및 대응 정책에 대한 자세한" +" 내용은 위키[1]에서 확인할 수 있습니다." #. type: Plain text #: ../code_of_conduct.txt:233 @@ -580,6 +592,8 @@ msgid "" "7. What the person reporting a violation can expect\n" "============================================================\n" msgstr "" +"7. 위반을 신고한 사람이 예상할 수 있는 사항\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:242 @@ -593,6 +607,10 @@ msgid "" "format. The next steps in an incident response will vary on a case-by-case " "basis." msgstr "" +"커뮤니티 협의회는 피해를 입었거나 피해를 입을 위험이 있다고 느끼는 사람의 안전과 복지를 최우선으로 합니다. 커뮤니티 협의회에 문제를 " +"보고하는 사람은 누구나 자신들의 보고서가 심각하게 받아들여질 것이라고 기대할 수 있습니다. 초기 보고서는 서면 또는 구두 형식으로 작성할" +" 수 있습니다. 사고 발생 시 즉각적인 해결이 필요하지 않은 경우, 서면 보고서를 암호화 형식으로 커뮤니티 협의회와 공유할 수 있습니다." +" 사고 대응의 다음 단계는 사례별로 다릅니다." #. type: Plain text #: ../code_of_conduct.txt:245 @@ -601,6 +619,8 @@ msgid "" "8. How the Community Council responds to incidents\n" "============================================================\n" msgstr "" +"8. 커뮤니티 협의회가 사고에 어떻게 대응합니까?\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:252 @@ -612,6 +632,9 @@ msgid "" "appealed by following the appeals process in the Community Council " "Guidelines [1]." msgstr "" +"커뮤니티 구성원이 용납할 수 없는 행동을 하는 경우, 커뮤니티 협의회는 경고, 비공식적 중재, 임시 금지 또는 커뮤니티로부터의 영구적 " +"제명을 포함하되 이에 국한되지 않는 적절한 조치를 취할 수 있습니다. 커뮤니티 협의회의 모든 조치와 결정은 커뮤니티 협의회 지침[1]의 " +"이의 신청 절차를 준수하여 항소할 수 있습니다." #. type: Plain text #: ../code_of_conduct.txt:255 @@ -620,41 +643,43 @@ msgid "" "9. Scope of this document\n" "============================================================\n" msgstr "" +"9. 이 문서의 범위\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:258 msgid "This code of conduct covers all community participants:" -msgstr "" +msgstr "이 행동 강령은 모든 커뮤니티 참여자를 대상으로 합니다:" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:260 msgid "paid and unpaid contributors" -msgstr "" +msgstr "유급 및 무급 기부자" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:262 msgid "sponsors" -msgstr "" +msgstr "스폰서" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:264 msgid "other guests" -msgstr "" +msgstr "다른 손님들" #. type: Plain text #: ../code_of_conduct.txt:266 msgid "when interacting:" -msgstr "" +msgstr "상호 작용할 때:" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:268 msgid "in all online and in-person community venues" -msgstr "" +msgstr "모든 온라인 및 실제 커뮤니티 장소에서" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:270 msgid "in one-on-one communications that relate to community work" -msgstr "" +msgstr "커뮤니티 업무와 관련된 일대일 커뮤니케이션에서" #. type: Plain text #: ../code_of_conduct.txt:277 @@ -666,6 +691,9 @@ msgid "" "this Code while we are working on Tor, and take care not to undermine it in " "the rest of our time." msgstr "" +"또한 이 행동 강령과 관련 절차는 커뮤니티 활동 범위 밖에서 일어나는 용납할 수 없는 행동에도 적용되며, 이러한 행동은 커뮤니티 구성원의" +" 안전과 복지에 부정적인 영향을 미칠 수 있습니다. Tor 커뮤니티의 구성원으로서, Tor를 연구하는 동안 이 강령을 지지하고 준수하며," +" 남은 시간 동안 Tor를 훼손하지 않도록 주의합니다." #. type: Plain text #: ../code_of_conduct.txt:280 @@ -674,13 +702,15 @@ msgid "" "10. License and attribution\n" "============================================================\n" msgstr "" +"10: 라이센스 및 속성\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:284 msgid "" "This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " "International license." -msgstr "" +msgstr "이 행동 강령은 Creative Commons CC-BY-SA 4.0 International 라이센스에 따라 공유됩니다." #. type: Plain text #: ../code_of_conduct.txt:287

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 30 Oct '20

30 Oct '20

commit 59f1afb26d867176be176b4b727aead3f01e711f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 30 12:15:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ko.po | 697 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 697 insertions(+) diff --git a/code_of_conduct+ko.po b/code_of_conduct+ko.po new file mode 100644 index 0000000000..5ccb7bdce3 --- /dev/null +++ b/code_of_conduct+ko.po @@ -0,0 +1,697 @@ +# Code of conduct of the tor project +# Copyright (C) 2019 tor project. +# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0 +# International license.e. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# Bluephoenix Lol <diamondphonix(a)gmail.com>, 2019 +# 장민준 <mizizang(a)gmail.com>, 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Code of conduct of the Tor Project\n" +"POT-Creation-Date: 2019-08-02 12:00+0000\n" +"PO-Revision-Date: 2019-08-27 18:54+0000\n" +"Last-Translator: 장민준 <mizizang(a)gmail.com>, 2020\n" +"Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\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" + +#. type: Plain text +#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24 +#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75 +#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180 +#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213 +#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243 +#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278 +#, no-wrap +msgid "============================================================\n" +msgstr "============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:3 +#, no-wrap +msgid "" +"Tor Project Code of Conduct\n" +"============================================================\n" +msgstr "" +"토르 프로젝트 행동 강령 ============================================= ============\n" + +#. type: Plain text +#: ../code_of_conduct.txt:6 +msgid "Statement of Intent:" +msgstr "의향서:" + +#. type: Plain text +#: ../code_of_conduct.txt:10 +msgid "" +"The Tor Project is committed to fostering an inclusive environment and " +"community. Tor is a place where people should feel safe to engage, share " +"their point of view, and participate." +msgstr "" +"Tor 프로젝트는 포괄적인 환경과 커뮤니티를 육성하기 위해 노력하고 있습니다. Tor는 사람들이 안전하게 참여하고, 그들의 관점을 " +"공유하고, 참여할 수 있어야 하는 장소입니다." + +#. type: Plain text +#: ../code_of_conduct.txt:15 +msgid "" +"This code of conduct applies to The Tor Project as a whole. It is intended " +"to provide guidelines for contributors. Employees and contractors of The Tor" +" Project, Inc. (TPI) are also subject to company policies and procedures. " +"Those people should feel free to contact HR with questions or concerns." +msgstr "" +"이 행동 강령은 Tor 프로젝트에 전체적으로 적용됩니다. 기여자를 위한 가이드라인을 제공하기 위한 것입니다. Tor Project, " +"Inc. (TPI) 의 직원 및 계약업체도 회사 정책과 절차를 따릅니다. 그 사람들은 궁금한 점이나 고민이 있으면 인사부에 연락하세요." + +#. type: Plain text +#: ../code_of_conduct.txt:23 +msgid "" +"This code of conduct is not exhaustive or complete. It is an ongoing effort " +"to summarize our shared understanding. We want to provide a welcoming, safe " +"environment, so we can work together to pursue powerful solutions. We " +"reserve the right to deviate from strictly enforcing this code. Any " +"deviations must produce an outcome which is fairer, and aligned with our " +"values. We understand that keeping a living document relevant and “patched” " +"involves sustained effort." +msgstr "" +"이 행동 강령은 완전하거나 완전하지 않습니다. 우리의 공통된 이해를 요약하기 위한 지속적인 노력입니다. 우리는 환영받고 안전한 환경을 " +"제공함으로써 강력한 솔루션을 추구하기 위해 함께 노력할 수 있기를 원합니다. 우리는 이 코드를 엄격히 집행하는 것에서 벗어날 권리를 " +"보유합니다. 모든 편차는 더 공정하고 우리의 가치에 부합하는 결과를 낳아야 합니다. 우리는 살아있는 문서를 관련성이 있고 \"패치된\" " +"상태로 유지하는 것은 지속적인 노력을 수반한다는 것을 알고 있습니다." + +#. type: Plain text +#: ../code_of_conduct.txt:26 +#, no-wrap +msgid "" +"0. Summary: Don't be a jerk. Be awesome instead.\n" +"============================================================\n" +msgstr "" +"0. 요약: 바보같이 굴지 마세요. 대신 멋있어지세요.\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:29 +msgid "The Tor community should be a good place where people are glad to be." +msgstr "Tor 커뮤니티는 사람들이 기뻐하는 좋은 장소가 되어야 합니다." + +#. type: Plain text +#: ../code_of_conduct.txt:31 +#, no-wrap +msgid " DO: Be kind, thoughtful, and considerate.\n" +msgstr " 해야 할 일: 친절하고, 사려 깊고, 배려심이 있어야 합니다.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:33 +#, no-wrap +msgid " DO: Make Tor a place where people are happy and comfortable.\n" +msgstr " 해야 할 일: Tor를 사람들이 행복하고 편안한 곳으로 만들어요.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:36 +#, no-wrap +msgid "" +" DO: Remember: We are all contributing; we are all learning. Nobody was born\n" +" an expert.\n" +msgstr "" +" 해야 할 일: 기억하세요: 우리는 모두 기여하고 있습니다; 우리는 모두 배우고 있습니다. 아무도 전문가로\n" +" 태어나지 않았습니다.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:38 +#, no-wrap +msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" +msgstr " 해야 할 일: 바닥을 양보하세요. 들어보세요. 모두 잘 들으세요.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:40 +#, no-wrap +msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n" +msgstr " 하지 말아야 할 것: 모욕하고, 괴롭히고, 위협하거나, 바보같이 굴지 마세요.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:43 +#, no-wrap +msgid "" +" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n" +" learning.\n" +msgstr "" +" 하지 말아야 할 것: 솔직한 실수를 사람들을 성가시게 하는 핑계로 대하세요. 실수는 학습을\n" +" 위한 것입니다.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:46 +#, no-wrap +msgid "" +" DON'T: Hunt for ways to uphold the letter of this code while violating its\n" +" spirit.\n" +msgstr "" +" 하지 말아야 할 것: 이 강령의 정신을 어기는 동안 이 강령의 편지를 지킬 방법을\n" +" 찾아보세요.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:50 +#, no-wrap +msgid "" +" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n" +" questions or concerns. Public key:\n" +" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" +msgstr "" +" 그리고 해야 할 일: 이메일을 보내 주십시오: 질문 또는 문제가 있으면\n" +" tor-community-council(a)lists.torproject.org 에 이메일을 보내주십시오. 공개 키:\n" +"https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" + +#. type: Plain text +#: ../code_of_conduct.txt:53 +#, no-wrap +msgid "" +"1. Purpose\n" +"============================================================\n" +msgstr "" +"1. 목적\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:63 +msgid "" +"A primary goal of the Tor community is to be inclusive of many different " +"contributors. We want to include contributors from the most varied and " +"diverse backgrounds possible. As such, we are committed to providing a " +"friendly, safe and welcoming environment for all, regardless of their " +"experience, gender identity or expression, sexual orientation, family, " +"relationships, ability (whether bodily or mental), personal appearance, " +"socioeconomic status, body size, race, ethnicity, age, religion, " +"nationality, or membership in a disadvantaged and/or underrepresented group." +msgstr "" +"Tor 공동체의 주요 목표는 다양한 기여자들을 포함하는 것입니다. 우리는 가능한 가장 다양하고 다양한 배경의 기여자들을 포함하고 " +"싶습니다. 따라서 우리는 경험, 성별 정체성 또는 표현, 성적 지향, 가족, 관계, 능력 (신체 또는 정신적으로), 개인 외모, 사회 " +"경제적 지위, 신체 크기, 인종, 민족성, 나이, 종교, 국적 또는 소외된 그룹의 구성원에 관계없이 모든 사람들에게 친절하고 안전하고 " +"환영받는 환경을 제공하는 데 전념하고 있습니다." + +#. type: Plain text +#: ../code_of_conduct.txt:68 +msgid "" +"A safe environment means one free from abuse, whether isolated or systemic. " +"We explicitly acknowledge that tolerating abuse is a security problem. " +"Allowing abusers and malicious people to disrupt our community puts our " +"software, developers, and users at risk." +msgstr "" +"안전한 환경은 고립된 환경이든 시스템적인 환경이든 간에 학대로부터 자유로운 환경을 의미합니다. 우리는 남용을 용인하는 것이 보안상의 " +"문제라는 것을 명시적으로 인정합니다. 남용자와 악의적인 사람들이 커뮤니티를 방해하도록 허용하면 소프트웨어, 개발자 및 사용자가 위험에 " +"처하게 됩니다." + +#. type: Plain text +#: ../code_of_conduct.txt:71 +msgid "" +"This code of conduct outlines our expectations for all those who participate" +" in our community, as well as the consequences for unacceptable behavior." +msgstr "이 행동 강령은 우리 공동체에 참여하는 모든 사람들에 대한 우리의 기대와 용납할 수 없는 행동에 대한 결과를 요약합니다." + +#. type: Plain text +#: ../code_of_conduct.txt:74 +msgid "" +"We invite all those who participate in The Tor Project to help us create " +"safe and positive experiences for everyone." +msgstr "Tor 프로젝트에 참여하는 모든 분들을 초대하여 모두에게 안전하고 긍정적인 경험을 할 수 있도록 도와드립니다." + +#. type: Plain text +#: ../code_of_conduct.txt:77 +#, no-wrap +msgid "" +"2. Be your best self\n" +"============================================================\n" +msgstr "" +"2. 최고가 되세요\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:80 +msgid "" +"The following behaviors are expected and requested of all community members:" +msgstr "모든 커뮤니티 구성원에게 다음과 같은 행동이 요구됩니다:" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:83 +msgid "" +"Participate in an honest and active way. In doing so, you contribute to the " +"health and longevity of this community." +msgstr "정직하고 적극적인 방법으로 참여하세요. 그렇게 함으로써, 여러분은 이 공동체의 건강과 장수에 기여합니다." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:85 +msgid "Exercise consideration and respect in your speech and actions." +msgstr "여러분의 말과 행동에서 배려와 존중을 실천하세요." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:87 +msgid "Attempt collaboration and dialog before engaging in conflict." +msgstr "충돌을 일으키기 전에 협업 및 대화를 시도합니다." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:89 +msgid "" +"Refrain from demeaning, discriminatory, or harassing behavior and speech." +msgstr "품위를 떨어뜨리거나 차별적이거나 괴롭히는 행동과 말을 삼가세요." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:92 +msgid "" +"Be mindful of your surroundings and of your fellow participants. Alert " +"community leaders if you notice:" +msgstr "여러분의 주변 환경과 여러분의 동료 참가자들을 주의하세요. 다음과 같은 경우 커뮤니티 리더에게 경고합니다:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:94 +msgid "a dangerous situation" +msgstr "위험한 상황" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:96 +msgid "someone in distress" +msgstr "곤경에 처한 사람" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:98 +msgid "violations of this code of conduct, even if they seem minor" +msgstr "사소한 것처럼 보일지라도, 이 행동 강령을 위반하는 것" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:101 +msgid "" +"Remember that community event venues may be shared with members of the " +"public. Please be respectful to everyone using these locations." +msgstr "" +"커뮤니티 행사 장소는 일반 대중과 공유할 수 있다는 점을 기억하세요. 이 장소를 이용하는 모든 분들께 경의를 표해 주시기 바랍니다." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:103 +msgid "Respect the privacy of your fellow community members." +msgstr "동료 커뮤니티 구성원의 사생활을 존중하십시오." + +#. type: Plain text +#: ../code_of_conduct.txt:106 +#, no-wrap +msgid "" +"3. Unacceptable behaviors\n" +"============================================================\n" +msgstr "" +"3. 용납할 수 없는 행동\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:109 +msgid "The following behaviors are unacceptable within our community:" +msgstr "다음 행동은 커뮤니티 내에서 허용되지 않습니다:" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:114 +msgid "" +"Violence, sexual assault, threats of violence, or violent language directed " +"against another person, especially violence against a person or group based " +"on a protected characteristic. (Display of weapons may constitute " +"intimidation or a threat of violence.)" +msgstr "" +"폭력, 성폭행, 폭력의 위협 또는 다른 사람을 향한 폭력적인 언어, 특히 보호된 특성에 기반한 사람 또는 그룹에 대한 폭력. (무기의 " +"폐기는 협박이나 폭력의 위협이 될 수 있습니다.)" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:117 +msgid "" +"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory" +" jokes and language." +msgstr "성차별주의자, 인종차별주의자, 동성애 혐오자, 트랜스 혐오자, 능력자 또는 다른 차별적 농담과 언어." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:122 +msgid "" +"Spontaneously posting or displaying sexually explicit or violent material. " +"(If it is necessary to share such material when working on Tor's mission, do" +" so with sensitivity. Be aware that many people don't want to see it.)" +msgstr "" +"성적으로 노골적이거나 폭력적인 자료를 자발적으로 게시하거나 표시. (Tor의 임무를 수행할 때 그러한 자료를 공유할 필요가 있다면, " +"민감하게 공유하세요. 많은 사람들이 그것을 보고 싶어하지 않는다는 것을 알아두세요.)" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:125 +msgid "" +"Posting or threatening to post other people’s personally identifying " +"information (\"doxing\") without their consent." +msgstr "본인의 동의 없이 타인의 개인 식별 정보 (\"신상 털기\") 를 게시하거나 협박하는 행위." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:127 +msgid "Personal insults or attacks, particularly those related to:" +msgstr "개인적인 모욕이나 공격, 특히 다음과 관련된 공격:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:129 +msgid "experience" +msgstr "경험" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:131 +msgid "gender identity or expression" +msgstr "성 정체성 또는 표현" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:133 +msgid "sexual orientation" +msgstr "성적 지향" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:135 +msgid "family" +msgstr "가족" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:137 +msgid "relationships" +msgstr "관계들" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:139 +msgid "ability (whether bodily or mental)" +msgstr "능력 (신체적 또는 정신적이든)" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:141 +msgid "personal appearance" +msgstr "개인적 외모" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:143 +msgid "socioeconomic status" +msgstr "사회경제적 지위" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:145 +msgid "body size" +msgstr "체격" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:147 +msgid "race" +msgstr "경쟁" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:149 +msgid "ethnicity" +msgstr "민족성" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:151 +msgid "age" +msgstr "나이" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:153 +msgid "religion" +msgstr "종교" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:155 +msgid "nationality" +msgstr "국적" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:157 +msgid "membership in a disadvantaged and/or underrepresented group" +msgstr "혜택이 없는 그룹 및 또는 낮은 대표 그룹에 속한 구성원" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:161 +msgid "" +"Inappropriate photography, audio recording, or recording of personal " +"information. You should have someone's consent before recording these " +"things, and before posting them publicly." +msgstr "" +"부적절한 사진 촬영, 오디오 녹음 또는 개인 정보 녹음. 이러한 내용을 기록하기 전, 그리고 공개적으로 게시하기 전에 다른 사람의 동의를" +" 얻어야 합니다." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:164 +msgid "" +"Inappropriate physical contact. You should have someone’s consent before " +"touching them." +msgstr "부적절한 신체 접촉. 당신은 손을 대기 전에 누군가의 동의를 얻어야 합니다." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:167 +msgid "" +"Unwelcome sexual attention: this includes sexualized comments or jokes, " +"inappropriate touching, groping, and unwelcome sexual advances." +msgstr "달갑지 않은 성적 관심: 여기에는 성적인 발언이나 농담, 부적절한 스킨십, 더듬기, 반갑지 않은 성적 진보가 포함됩니다." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:169 +msgid "Deliberate intimidation, stalking or following (online or in person)." +msgstr "고의적인 협박, 스토킹 또는 팔로우(온라인 또는 직접)." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:172 +msgid "" +"Deliberately undermining the spirit of this code while following the letter." +msgstr "편지를 따라가면서 의도적으로 이 코드의 정신을 훼손하는 행위." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:175 +msgid "" +"Sustained disruption of any community events, including talks, " +"presentations, and online conversations." +msgstr "대화, 프리젠테이션 및 온라인 대화를 포함한 모든 커뮤니티 이벤트의 지속적인 중단." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:177 +msgid "Deliberately pushing against someone's stated boundaries." +msgstr "의도적으로 누군가의 규정된 경계를 넘어서는 것." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:179 +msgid "Advocating for, or encouraging, any of the above behavior." +msgstr "위의 행동 중 어느 하나를 옹호하거나 격려하는 것." + +#. type: Plain text +#: ../code_of_conduct.txt:182 +#, no-wrap +msgid "" +"4. Unacceptable behavior has consequences\n" +"============================================================\n" +msgstr "" +"4. 용납할 수 없는 행동이 결과를 낳는다\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:188 +msgid "" +"We will not tolerate unacceptable behavior from any community member. We " +"will not make exceptions for sponsors and those with decision-making " +"authority. People in formal or informal leadership roles must model the " +"highest standards of behavior." +msgstr "" +"우리는 어떤 공동체 구성원으로부터도 용납할 수 없는 행동을 용납하지 않을 것입니다. 스폰서 및 의사결정 권한이 있는 사람은 예외로 하지 " +"않습니다. 공식적인 또는 비공식적인 리더쉽 역할을 하는 사람들은 행동의 최고 기준을 모델링해야 합니다." + +#. type: Plain text +#: ../code_of_conduct.txt:192 +msgid "" +"Anyone asked by another community member to stop unacceptable behavior is " +"expected to comply immediately. Please don't step in on someone else's " +"behalf without their consent." +msgstr "" +"용납할 수 없는 행동을 멈추라고 다른 지역 사회 구성원이 요청하는 사람은 즉시 응할 것으로 예상됩니다. 다른 사람의 동의 없이 다른 " +"사람을 대신해서 끼어들지 마세요." + +#. type: Plain text +#: ../code_of_conduct.txt:195 +#, no-wrap +msgid "" +"5. Where to go for help\n" +"============================================================\n" +msgstr "" +"5. 도움을 받을 수 있는 곳\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:201 +msgid "" +"The Community Council is an elected body of Tor Core Contributors who can " +"assist with intra-community conflict resolution. Community Council policies " +"and information can be found on the Community Council wiki [1]. You can " +"contact the whole Community council:" +msgstr "" +"커뮤니티 협의회는 지역 사회 분쟁 해결을 도울 수 있는 Tor 코어 기여자의 선출된 조직입니다. 커뮤니티 협의회 정책 및 정보는 커뮤니티" +" 협의회 위키 [1]에서 찾을 수 있습니다. 전체 주민자치회에 문의할 수 있습니다:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:203 +msgid "if you have questions or concerns about the code of conduct, or" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:205 +msgid "if you feel that you have witnessed a code of conduct violation" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:212 +msgid "" +"However, if you feel that there is a conflict of interest with any council " +"member, you may contact members individually. Council members' GPG keys are " +"listed on the Community Council wiki. If there is a conflict of interest, " +"the affected council member will recuse themselves. They will not be " +"involved in any discussion or documentation of the incident. More about the " +"Community Council can be found in the guidelines [2]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:215 +#, no-wrap +msgid "" +"6. What to do if you witness unacceptable behavior\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:230 +msgid "" +"If you are subject to or witness unacceptable behavior, or have any other " +"concerns, please notify the Community Council as soon as possible. You can " +"contact the community council in person, or at tor-community-" +"council(a)lists.torproject.org. Current councilmembers are listed on the wiki " +"[1]. The Community Council's incident response will vary on a case-by-case " +"basis. The council will make every effort to respond to the incident " +"immediately. The council will prioritize the safety of the person who has " +"been harmed, or is at risk of harm. Person(s) who have been harmed or are at" +" risk of harm can withdraw the incident report at any time. We will never do" +" anything without the consent of the person who has been harmed or is at " +"risk of harm, except in situations where there is a threat of imminent " +"danger or harm to anyone. More information about the Community Council's " +"incident reporting and response policies can be found on their wiki [1]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:233 +#, no-wrap +msgid "" +"7. What the person reporting a violation can expect\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:242 +msgid "" +"The Community Council prioritizes the safety and well-being of any person " +"who feels that they have been harmed or may be in danger of being harmed. " +"Anyone reporting an issue to the Community Council can expect that their " +"report will be taken seriously. Initial reports can be taken in written or " +"verbal form. If the incident does not require an immediate resolution, then " +"a written report can be shared with the Community Council in an encrypted " +"format. The next steps in an incident response will vary on a case-by-case " +"basis." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:245 +#, no-wrap +msgid "" +"8. How the Community Council responds to incidents\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:252 +msgid "" +"If a community member engages in unacceptable behavior, the Community " +"Council may take any action they deem appropriate, including but not limited" +" to a warning, informal mediation, temporary ban or permanent expulsion from" +" the community. Any actions and decisions by the Community Council may be " +"appealed by following the appeals process in the Community Council " +"Guidelines [1]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:255 +#, no-wrap +msgid "" +"9. Scope of this document\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:258 +msgid "This code of conduct covers all community participants:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:260 +msgid "paid and unpaid contributors" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:262 +msgid "sponsors" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:264 +msgid "other guests" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:266 +msgid "when interacting:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:268 +msgid "in all online and in-person community venues" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:270 +msgid "in one-on-one communications that relate to community work" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:277 +msgid "" +"This code of conduct and its related procedures also applies to unacceptable" +" behavior occurring outside the scope of community activities when such " +"behavior has the potential to adversely affect the safety and well-being of " +"community members. As members of the Tor community, we support and follow " +"this Code while we are working on Tor, and take care not to undermine it in " +"the rest of our time." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:280 +#, no-wrap +msgid "" +"10. License and attribution\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:284 +msgid "" +"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " +"International license." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:287 +msgid "" +"This code of conduct uses some language and framing from the Citizen Code of" +" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:289 +msgid "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…" +msgstr ""

1 0

[tor/master] Fix up vote tests in test_dir_handle_get.
by asn＠torproject.org 30 Oct '20

30 Oct '20

commit acf4225441fbb20eebedf32d15cb7ccd0488da9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 16 09:26:41 2020 -0400 Fix up vote tests in test_dir_handle_get. These tests used a hardcoded vote with a hardcoded digest. That vote didn't have any pr lines, and so it is now invalid. I've adjusted the testing code so that it mocks the signature-checking, so that we can more easily change the contents of the vote. --- src/feature/dirparse/sigcommon.c | 6 +++--- src/feature/dirparse/sigcommon.h | 12 +++++------ src/test/test_dir_handle_get.c | 46 ++++++++++++++++++++++++++++++++++------ src/test/vote_descriptors.inc | 8 ++++++- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/src/feature/dirparse/sigcommon.c b/src/feature/dirparse/sigcommon.c index 8b970d7d1f..fb81b2da6e 100644 --- a/src/feature/dirparse/sigcommon.c +++ b/src/feature/dirparse/sigcommon.c @@ -139,13 +139,13 @@ signed_digest_equals, (const uint8_t *d1, const uint8_t *d2, size_t len)) * the document when generating log messages. Return 0 on success, negative * on failure. */ -int -check_signature_token(const char *digest, +MOCK_IMPL(int, +check_signature_token,(const char *digest, ssize_t digest_len, directory_token_t *tok, crypto_pk_t *pkey, int flags, - const char *doctype) + const char *doctype)) { char *signed_digest; size_t keysize; diff --git a/src/feature/dirparse/sigcommon.h b/src/feature/dirparse/sigcommon.h index c2ed9df494..c7f370f8e8 100644 --- a/src/feature/dirparse/sigcommon.h +++ b/src/feature/dirparse/sigcommon.h @@ -20,12 +20,12 @@ int router_get_hash_impl(const char *s, size_t s_len, char *digest, #define CST_NO_CHECK_OBJTYPE (1<<0) struct directory_token_t; -int check_signature_token(const char *digest, - ssize_t digest_len, - struct directory_token_t *tok, - crypto_pk_t *pkey, - int flags, - const char *doctype); +MOCK_DECL(int, check_signature_token,(const char *digest, + ssize_t digest_len, + struct directory_token_t *tok, + crypto_pk_t *pkey, + int flags, + const char *doctype)); int router_get_hash_impl_helper(const char *s, size_t s_len, const char *start_str, diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index f446bbb5eb..31b44f8de0 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -31,6 +31,7 @@ #include "feature/nodelist/nodelist.h" #include "feature/client/entrynodes.h" #include "feature/dirparse/authcert_parse.h" +#include "feature/dirparse/sigcommon.h" #include "feature/nodelist/networkstatus.h" #include "core/proto/proto_http.h" #include "lib/geoip/geoip.h" @@ -73,6 +74,23 @@ ENABLE_GCC_WARNING("-Woverlength-strings") #define consdiffmgr_add_consensus consdiffmgr_add_consensus_nulterm +static int +mock_ignore_signature_token(const char *digest, + ssize_t digest_len, + struct directory_token_t *tok, + crypto_pk_t *pkey, + int flags, + const char *doctype) +{ + (void)digest; + (void)digest_len; + (void)tok; + (void)pkey; + (void)flags; + (void)doctype; + return 0; +} + static dir_connection_t * new_dir_conn(void) { @@ -1976,7 +1994,8 @@ test_dir_handle_get_status_vote_current_not_found(void* data) tor_free(header); } -#define VOTE_DIGEST "312A4890D4D832597ABBD3089C782DBBFB81E48D" +/* What vote do we ask for, to get the vote in vote_descriptors.inc ? */ +#define VOTE_DIGEST "78400095d8e834d87135cfc46235c909f0e99911" static void status_vote_current_d_test(char **header, char **body, size_t *body_l) @@ -2058,6 +2077,7 @@ test_dir_handle_get_status_vote_d(void* data) const char digest[DIGEST_LEN] = ""; (void) data; + MOCK(check_signature_token, mock_ignore_signature_token); clear_dir_servers(); dirvote_free_all(); @@ -2094,7 +2114,7 @@ test_dir_handle_get_status_vote_d(void* data) tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); tt_assert(strstr(header, "Content-Type: text/plain\r\n")); tt_assert(strstr(header, "Content-Encoding: identity\r\n")); - tt_assert(strstr(header, "Content-Length: 4135\r\n")); + tt_assert(strstr(header, "Content-Length: 4403\r\n")); tt_str_op(VOTE_BODY_V3, OP_EQ, body); @@ -2107,11 +2127,12 @@ test_dir_handle_get_status_vote_d(void* data) tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); tt_assert(strstr(header, "Content-Type: text/plain\r\n")); tt_assert(strstr(header, "Content-Encoding: identity\r\n")); - tt_assert(strstr(header, "Content-Length: 4135\r\n")); + tt_assert(strstr(header, "Content-Length: 4403\r\n")); tt_str_op(VOTE_BODY_V3, OP_EQ, body); done: + UNMOCK(check_signature_token); tor_free(header); tor_free(body); or_options_free(mock_options); mock_options = NULL; @@ -2188,6 +2209,7 @@ test_dir_handle_get_status_vote_current_authority_not_found(void* data) (void) data; MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); + MOCK(check_signature_token, mock_ignore_signature_token); conn = new_dir_conn(); tt_int_op(0, OP_EQ, directory_handle_command_get(conn, @@ -2199,6 +2221,7 @@ test_dir_handle_get_status_vote_current_authority_not_found(void* data) tt_str_op(NOT_FOUND, OP_EQ, header); done: + UNMOCK(check_signature_token); UNMOCK(connection_write_to_buf_impl_); connection_free_minimal(TO_CONN(conn)); tor_free(header); @@ -2212,6 +2235,7 @@ test_dir_handle_get_status_vote_next_authority_not_found(void* data) (void) data; MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); + MOCK(check_signature_token, mock_ignore_signature_token); conn = new_dir_conn(); tt_int_op(0, OP_EQ, directory_handle_command_get(conn, @@ -2223,6 +2247,7 @@ test_dir_handle_get_status_vote_next_authority_not_found(void* data) tt_str_op(NOT_FOUND, OP_EQ, header); done: + UNMOCK(check_signature_token); UNMOCK(connection_write_to_buf_impl_); connection_free_minimal(TO_CONN(conn)); tor_free(header); @@ -2236,7 +2261,7 @@ test_dir_handle_get_status_vote_next_bandwidth_not_found(void* data) (void) data; MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); - + MOCK(check_signature_token, mock_ignore_signature_token); conn = new_dir_conn(); tt_int_op(0, OP_EQ, directory_handle_command_get(conn, @@ -2248,6 +2273,7 @@ test_dir_handle_get_status_vote_next_bandwidth_not_found(void* data) tt_str_op(NOT_FOUND, OP_EQ, header); done: + UNMOCK(check_signature_token); UNMOCK(connection_write_to_buf_impl_); connection_free_minimal(TO_CONN(conn)); tor_free(header); @@ -2428,6 +2454,7 @@ test_dir_handle_get_status_vote_next_authority(void* data) const char digest[DIGEST_LEN] = ""; (void) data; + MOCK(check_signature_token, mock_ignore_signature_token); clear_dir_servers(); routerlist_free_all(); dirvote_free_all(); @@ -2477,11 +2504,12 @@ test_dir_handle_get_status_vote_next_authority(void* data) tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); tt_assert(strstr(header, "Content-Type: text/plain\r\n")); tt_assert(strstr(header, "Content-Encoding: identity\r\n")); - tt_assert(strstr(header, "Content-Length: 4135\r\n")); + tt_assert(strstr(header, "Content-Length: 4403\r\n")); tt_str_op(VOTE_BODY_V3, OP_EQ, body); done: + UNMOCK(check_signature_token); UNMOCK(connection_write_to_buf_impl_); UNMOCK(get_my_v3_authority_cert); connection_free_minimal(TO_CONN(conn)); @@ -2587,6 +2615,7 @@ test_dir_handle_get_status_vote_current_authority(void* data) dir_server_t *ds = NULL; (void) data; + MOCK(check_signature_token, mock_ignore_signature_token); clear_dir_servers(); routerlist_free_all(); dirvote_free_all(); @@ -2640,11 +2669,12 @@ test_dir_handle_get_status_vote_current_authority(void* data) tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); tt_assert(strstr(header, "Content-Type: text/plain\r\n")); tt_assert(strstr(header, "Content-Encoding: identity\r\n")); - tt_assert(strstr(header, "Content-Length: 4135\r\n")); + tt_assert(strstr(header, "Content-Length: 4403\r\n")); tt_str_op(VOTE_BODY_V3, OP_EQ, body); done: + UNMOCK(check_signature_token); UNMOCK(connection_write_to_buf_impl_); UNMOCK(get_my_v3_authority_cert); connection_free_minimal(TO_CONN(conn)); @@ -2672,6 +2702,7 @@ test_dir_handle_get_status_vote_too_late(void* data) dir_server_t *ds = NULL; const char* mode = (const char *)data; + MOCK(check_signature_token, mock_ignore_signature_token); clear_dir_servers(); routerlist_free_all(); dirvote_free_all(); @@ -2817,11 +2848,12 @@ test_dir_handle_get_status_vote_too_late(void* data) tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header); tt_assert(strstr(header, "Content-Type: text/plain\r\n")); tt_assert(strstr(header, "Content-Encoding: identity\r\n")); - tt_assert(strstr(header, "Content-Length: 4135\r\n")); + tt_assert(strstr(header, "Content-Length: 4403\r\n")); tt_str_op(VOTE_BODY_V3, OP_EQ, body); done: + UNMOCK(check_signature_token); UNMOCK(connection_write_to_buf_impl_); UNMOCK(get_my_v3_authority_cert); connection_free_minimal(TO_CONN(conn)); diff --git a/src/test/vote_descriptors.inc b/src/test/vote_descriptors.inc index 895dc6c65c..51cf465170 100644 --- a/src/test/vote_descriptors.inc +++ b/src/test/vote_descriptors.inc @@ -1,3 +1,6 @@ +/* Not sure where we got this; it appears to be hand-generated and signed. + * It's been edited so that the signature doesn't verify any more; + * you need to mock check_signature_token for this to work. */ static const char* VOTE_BODY_V3 = "network-status-version 3\n" "vote-status vote\n" @@ -60,6 +63,7 @@ static const char* VOTE_BODY_V3 = "w Bandwidth=30 Measured=30\n" "p reject 1-65535\n" "id ed25519 none\n" +"pr Cons=1-2 Desc=1-2 DirCache=1-2 FlowCtrl=1 HSDir=1-2 HSIntro=3-5\n" "m 9,10,11,12,13,14,15,16,17 sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa0\n" "r router1 BQUFBQUFBQUFBQUFBQUFBQUFBQU TU1NTU1NTU1NTU1NTU1NTU1NTU0 2015-09-02 19:17:35 153.0.153.1 443 0\n" "a [1:2:3::4]:4711\n" @@ -68,6 +72,7 @@ static const char* VOTE_BODY_V3 = "w Bandwidth=120 Measured=120\n" "p reject 1-65535\n" "id ed25519 none\n" +"pr Cons=1-2 Desc=1-2 DirCache=1-2 FlowCtrl=1 HSDir=1-2 HSIntro=3-5\n" "m 9,10,11,12,13,14,15,16,17 sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa1\n" "r router3 MzMzMzMzMzMzMzMzMzMzMzMzMzM T09PT09PT09PT09PT09PT09PT08 2015-09-02 19:17:35 170.0.153.1 400 9999\n" "s Authority Exit Fast Guard Running Stable V2Dir Valid\n" @@ -75,6 +80,7 @@ static const char* VOTE_BODY_V3 = "w Bandwidth=120\n" "p reject 1-65535\n" "id ed25519 none\n" +"pr Cons=1-2 Desc=1-2 DirCache=1-2 FlowCtrl=1 HSDir=1-2 HSIntro=3-5\n" "m 9,10,11,12,13,14,15,16,17 " "sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa2\n" "r router4 NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ Ly8vLy8vLy8vLy8vLy8vLy8vLy8 2015-09-02 19:17:35 192.0.2.3 500 1999\n" @@ -83,6 +89,7 @@ static const char* VOTE_BODY_V3 = "w Bandwidth=30\n" "p reject 1-65535\n" "id ed25519 none\n" +"pr Cons=1-2 Desc=1-2 DirCache=1-2 FlowCtrl=1 HSDir=1-2 HSIntro=3-5\n" "m 9,10,11,12,13,14,15,16,17 sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa3\n" "directory-footer\n" "directory-signature D867ACF56A9D229B35C25F0090BC9867E906BE69 CBF56A83368A5150F1A9AAADAFB4D77F8C4170E2\n" @@ -91,4 +98,3 @@ static const char* VOTE_BODY_V3 = "TXQWGUq9Z7jdSVnzWT3xqPA4zjw6eZkj+DKUtwq+oEDZGlf8eHTFmr0NAWfwZbk9\n" "NAjbMTUXUP37N2XAZwkoCWwFCrrfMwXrL7OhZbj7ifo=\n" "-----END SIGNATURE-----\n"; -

1 0

[tor/master] Mark as required fields from prop315.
by asn＠torproject.org 30 Oct '20

30 Oct '20

commit e934d713b3847401ee08581dae88bb4a4eea5c14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 18:02:16 2020 -0400 Mark as required fields from prop315. This change breaks some unit tests; it's time to fix those in subsequent commits. --- changes/ticket40132 | 4 ++++ src/feature/dirparse/microdesc_parse.c | 2 +- src/feature/dirparse/ns_parse.c | 2 +- src/feature/dirparse/routerparse.c | 18 +++++++++--------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/changes/ticket40132 b/changes/ticket40132 new file mode 100644 index 0000000000..848a0c8e38 --- /dev/null +++ b/changes/ticket40132 @@ -0,0 +1,4 @@ + o Minor features (specification update): + - Several fields in microdescriptors, router descriptors, and consensus + documents that were formerly optional are now required. Implements + proposal 315; closes ticket 40132. diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index 9231080aaa..31415f3fb7 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -31,7 +31,7 @@ // clang-format off static token_rule_t microdesc_token_table[] = { T1_START("onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024), - T01("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ), + T1("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ), T0N("id", K_ID, GE(2), NO_OBJ ), T0N("a", K_A, GE(1), NO_OBJ ), T01("family", K_FAMILY, CONCAT_ARGS, NO_OBJ ), diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 927870c4aa..d24b0cb18d 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -54,7 +54,7 @@ static token_rule_t rtrstatus_token_table[] = { T01("w", K_W, ARGS, NO_OBJ ), T0N("m", K_M, CONCAT_ARGS, NO_OBJ ), T0N("id", K_ID, GE(2), NO_OBJ ), - T01("pr", K_PROTO, CONCAT_ARGS, NO_OBJ ), + T1("pr", K_PROTO, CONCAT_ARGS, NO_OBJ ), T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), END_OF_TABLE }; diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 42a53101b0..687d699dfb 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -91,24 +91,24 @@ const token_rule_t routerdesc_token_table[] = { T01("ipv6-policy", K_IPV6_POLICY, CONCAT_ARGS, NO_OBJ), T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ), T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ), - T01("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ), + T1("ntor-onion-key", K_ONION_KEY_NTOR, GE(1), NO_OBJ ), T1_END( "router-signature", K_ROUTER_SIGNATURE, NO_ARGS, NEED_OBJ ), T1( "published", K_PUBLISHED, CONCAT_ARGS, NO_OBJ ), T01("uptime", K_UPTIME, GE(1), NO_OBJ ), T01("fingerprint", K_FINGERPRINT, CONCAT_ARGS, NO_OBJ ), T01("hibernating", K_HIBERNATING, GE(1), NO_OBJ ), T01("platform", K_PLATFORM, CONCAT_ARGS, NO_OBJ ), - T01("proto", K_PROTO, CONCAT_ARGS, NO_OBJ ), + T1("proto", K_PROTO, CONCAT_ARGS, NO_OBJ ), T01("contact", K_CONTACT, CONCAT_ARGS, NO_OBJ ), T01("read-history", K_READ_HISTORY, ARGS, NO_OBJ ), T01("write-history", K_WRITE_HISTORY, ARGS, NO_OBJ ), T01("extra-info-digest", K_EXTRA_INFO_DIGEST, GE(1), NO_OBJ ), T01("hidden-service-dir", K_HIDDEN_SERVICE_DIR, NO_ARGS, NO_OBJ ), - T01("identity-ed25519", K_IDENTITY_ED25519, NO_ARGS, NEED_OBJ ), - T01("master-key-ed25519", K_MASTER_KEY_ED25519, GE(1), NO_OBJ ), - T01("router-sig-ed25519", K_ROUTER_SIG_ED25519, GE(1), NO_OBJ ), - T01("onion-key-crosscert", K_ONION_KEY_CROSSCERT, NO_ARGS, NEED_OBJ ), - T01("ntor-onion-key-crosscert", K_NTOR_ONION_KEY_CROSSCERT, + T1("identity-ed25519", K_IDENTITY_ED25519, NO_ARGS, NEED_OBJ ), + T1("master-key-ed25519", K_MASTER_KEY_ED25519, GE(1), NO_OBJ ), + T1("router-sig-ed25519", K_ROUTER_SIG_ED25519, GE(1), NO_OBJ ), + T1("onion-key-crosscert", K_ONION_KEY_CROSSCERT, NO_ARGS, NEED_OBJ ), + T1("ntor-onion-key-crosscert", K_NTOR_ONION_KEY_CROSSCERT, EQ(1), NEED_OBJ ), T01("allow-single-hop-exits",K_ALLOW_SINGLE_HOP_EXITS, NO_ARGS, NO_OBJ ), @@ -131,8 +131,8 @@ const token_rule_t routerdesc_token_table[] = { static token_rule_t extrainfo_token_table[] = { T1_END( "router-signature", K_ROUTER_SIGNATURE, NO_ARGS, NEED_OBJ ), T1( "published", K_PUBLISHED, CONCAT_ARGS, NO_OBJ ), - T01("identity-ed25519", K_IDENTITY_ED25519, NO_ARGS, NEED_OBJ ), - T01("router-sig-ed25519", K_ROUTER_SIG_ED25519, GE(1), NO_OBJ ), + T1("identity-ed25519", K_IDENTITY_ED25519, NO_ARGS, NEED_OBJ ), + T1("router-sig-ed25519", K_ROUTER_SIG_ED25519, GE(1), NO_OBJ ), T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), T01("read-history", K_READ_HISTORY, ARGS, NO_OBJ ), T01("write-history", K_WRITE_HISTORY, ARGS, NO_OBJ ),

1 0