September 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'teor/ticket27467'
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit bcfab63ca5713638cc2155a8870e51657a2a0ef2 Merge: b8a2bdbdc d0965561a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:24:47 2018 -0400 Merge remote-tracking branch 'teor/ticket27467' changes/ticket27467 | 3 +++ src/lib/net/address.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-)

1 0

[tor/master] Remove GetAdaptersAddresses_fn_t
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit d0965561a53ffc3707f4466e4470dbb072a47f10 Author: teor <teor(a)torproject.org> Date: Thu Sep 6 12:54:03 2018 +1000 Remove GetAdaptersAddresses_fn_t The code that used it was removed as part of the 26481 refactor. Closes ticket 27467. --- changes/ticket27467 | 3 +++ src/lib/net/address.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/changes/ticket27467 b/changes/ticket27467 new file mode 100644 index 000000000..6f0df024c --- /dev/null +++ b/changes/ticket27467 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove GetAdaptersAddresses_fn_t. The code that used it was removed + as part of the 26481 refactor. Closes ticket 27467. diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 619fa13e9..d49ffe706 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1205,11 +1205,6 @@ tor_addr_parse(tor_addr_t *addr, const char *src) return result; } -#ifdef _WIN32 -typedef ULONG (WINAPI *GetAdaptersAddresses_fn_t)( - ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG); -#endif - #ifdef HAVE_IFADDRS_TO_SMARTLIST /* * Convert a linked list consisting of <b>ifaddrs</b> structures

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 06 Sep '18

06 Sep '18

commit 6a42c3943a70b76cf1eac2d911eb53dd086c9dfb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 6 11:15:16 2018 +0000 Update translations for bridgedb_completed --- ko/LC_MESSAGES/bridgedb.po | 414 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 353 insertions(+), 61 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index e877b870b..22fe38ae8 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -1,104 +1,396 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 +# Chris Park <utopinator(a)gmail.com>, 2016 +# snotree <cknblue(a)gmail.com>, 2017 # cwt96 <cwt967(a)naver.com>, 2012 -# Dr.what <javrick6(a)naver.com>, 2014 -# pCsOrI <pcsori(a)gmail.com>, 2012 +# 고영욱 <greenknite(a)naver.com>, 2015 +# Hyuntae Chun, 2017 +# Jamin <bakzaa(a)gmail.com>, 2014 +# Dr.what <javrick6(a)naver.com>, 2014-2015 +# Gu Hong Min <placidmoon1(a)gmail.com>, 2015 +# 류종헌, 2015 +# Myeongjin <aranet100(a)gmail.com>, 2016 +# 이피시소리 <pcsori(a)gmail.com>, 2012 +# Philipp Sauter <qt123(a)pm.me>, 2018 +# Sam Ryoo <samryoo(a)gmail.com>, 2014 +# Sangmin Lee <sangminlee7648(a)gmail.com>, 2016 +# Revi_, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-05-06 06:40+0000\n" -"Last-Translator: ilbe123 <a3057016(a)drdrb.net>\n" -"Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2018-09-06 11:07+0000\n" +"Last-Translator: Philipp Sauter <qt123(a)pm.me>\n" +"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: bridgedb/https/server.py:167 +msgid "Sorry! Something went wrong with your request." +msgstr "죄송합니다! 당신의 요청에 무언가 문제가 있습니다." + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "버그 보고하기" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "소스 코드" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "변경 기록" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "연락하기" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "모두 선택" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "QR코드 보기" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "브릿지 행을 위한 QR코드" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "어머나, 뭔가 잘못되었습니다!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "QR 코드를 불러 오는 중 오류가 생긴 것 같습니다." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "이 QR코드는 당신의 브릿지 행을 포함하고 있습니다. 브릿지 행을 다른 기기로 복사하려면 QR코드 리더로 스캔하세요." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "현재 사용할 수 있는 브릿지가 없습니다..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "%s 되돌아가서 %s 다른 브릿지 타입도 골라보세요!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "%s1%s번째 단계 " + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "%s Tor 브라우저 %s 다운로드" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "%s2%s번째 단계 " + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "%s 브릿지 %s를 입수" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "%s3%s번째 단계 " + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "이제 %s 그 브릿지를 Tor 브라우저에 더합니다 %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%s그%s냥 브릿지 주세요!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "고급 옵션" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "아니오" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "없음" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%s네!%s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%s브%s릿지 얻기" + +#: bridgedb/strings.py:43 +msgid "[This is an automated message; please do not reply.]" +msgstr "[이것은 자동으로 생성된 메시지입니다; 회신하지 마십시오.]" + +#: bridgedb/strings.py:45 +msgid "Here are your bridges:" +msgstr "당신의 브릿지는 다음과 같습니다:" + +#: bridgedb/strings.py:47 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "속도 제한을 초과하였습니다. 속도를 낮추세요! 이메일 간의 최소 간격은\n%s 시간입니다. 이 기간 동안의 추가적인 모든 이메일은 무시될 것입니다." + +#: bridgedb/strings.py:50 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (COMMANDs를 섞어서 여러 옵션을 동시에 구체화 하세요)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: bridgedb/strings.py:53 +msgid "Welcome to BridgeDB!" +msgstr "BridgeDB 에 오신 것을 환영합니다!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: bridgedb/strings.py:55 +msgid "Currently supported transport TYPEs:" +msgstr "지원이 되는 transport TYPEs" + +#: bridgedb/strings.py:56 +#, python-format +msgid "Hey, %s!" +msgstr "저기, %s야! " + +#: bridgedb/strings.py:57 +msgid "Hello, friend!" +msgstr "안녕 친구!" + +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +msgid "Public Keys" +msgstr "공개 키" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: bridgedb/strings.py:62 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "이 이메일은 %s를 위해 %s에 %s에서\n무지개, 유니콘 그리고 반짝이로 작성되었습니다." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: bridgedb/strings.py:72 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB 는 여러 종류의 %s삽입형 장치%s 와의 브릿지를 제공합니다.\n이것은 Tor 네트워크와의 연결을 난독화 시키며 누군가 인터넷 트래픽을\n감시하는 사람이 당신이 Tor 네트워크를 사용하고 있다는 것을 식별하기 어렵게 합니다.\n\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: bridgedb/strings.py:79 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "몇몇 브리지는 IPv6 주소도 지원하나,\nPluggable Transports는 IPv6를 지원하지 않습니다.\n\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: bridgedb/strings.py:88 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "게다가 BridgeDB는 상투적인 브릿지가 수많아요. %s 그리고 아무\nPluggable Transports 없습니다. %s 아마도 시원하지 않았던 것이 같지만\n여러모로 인터넷 검열 우회가 도와주겠어요.\n\n" + +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "'브릿지'란?" -#: lib/bridgedb/templates/base.html:34 +#: bridgedb/strings.py:102 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "중계 서버 브릿지 %s 중에서, %s 가 여러분의 검열 우회를 도와줄 수 있는 Tor 중계 서버 입니다." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridges %s는 당신이 검열을 피할수 있게 하는 Tor 릴레이입니다. " -#: lib/bridgedb/templates/base.html:39 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "브릿지를 얻는 다른 방법이 없을까요?" -#: lib/bridgedb/templates/base.html:40 +#: bridgedb/strings.py:108 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "공개된 브릿지 주소를 찾을 때, 통신선에 'get brides'라고 이메일을 적어서 보내는 방법도 있습니다.(메일을 보내는 사람의 주소 표기는 from %s 또는 %s 주소)" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "브릿지를 얻을 수 있는 다른 방법은 %s 로 이메일을 보내주시는 것입니다.\n이 이메일 서비스를 통해서 보내셔야 한다는 것을 명심해 주세요 :\n%s, %s, %s" -#: lib/bridgedb/templates/base.html:48 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "브릿지가 맛이 갔어요! 도와줘요!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:117 #, python-format -msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "귀하의 토르가 작동하지 않는다면, %s의 이메일을 보내셔야 합니다. 가능한 한 많은 정보를 포함해서 보내주세요. 예를 들면 귀하가 사용한 브릿지의 목록, 귀하가 사용하는 번들의 파일 이름과 버전, 귀하의 토르가 맛 갔을 때 나온 메세지. 이 외에도 적을 수 있는 여러 가지." +msgid "If your Tor doesn't work, you should email %s." +msgstr "만약 당신의 Tor가 작동되지 않으면, %s로 이메일을 해야 되요. " -#: lib/bridgedb/templates/bridges.html:10 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:121 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "위 통신선을 사용하시려면 'Vidalia's Network settings'-비달리아 네트워크 설정-페이지에 들어간 후, 'My ISP blocks connections to the Tor network'-Tor 네트워크에 내 ISP 연결을 차단-을 클릭합니다. 그러면 한번에 각각의 브릿지 주소를 추가 할 수 있습니다." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "가능한 한 많은 정보를 포함 시키십시오.\n예를 들어 브리지 목록 및 사용하려는 Pluggable Transport,\nTor 브라우저 버전, Tor가 준 메시지 등." -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "현재 이용 가능한 브릿지 없음" +#: bridgedb/strings.py:128 +msgid "Here are your bridge lines:" +msgstr "당신의 브릿지 행들은 다음과 같습니다:" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "당신의 브라우저를 파이어폭스로 업그레이드 하세요!" +#: bridgedb/strings.py:129 +msgid "Get Bridges!" +msgstr "브릿지를 얻으세요!" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "두개의 단어를 입력하십시오" +#: bridgedb/strings.py:133 +msgid "Please select options for bridge type:" +msgstr "브릿지 종류에 관한 옵션을 골라 주세요:" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "1단계" +#: bridgedb/strings.py:134 +msgid "Do you need IPv6 addresses?" +msgstr "IPv6 주소가 필요합니까?" -#: lib/bridgedb/templates/index.html:8 +#: bridgedb/strings.py:135 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Tor %s Browser Bundle %s를 입수" +msgid "Do you need a %s?" +msgstr "%s 가 필요합니까?" -#: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "2단계" +#: bridgedb/strings.py:139 +msgid "Your browser is not displaying images properly." +msgstr "당신의 브라우저는 사진을 정상적으로 불러오지 못합니다." -#: lib/bridgedb/templates/index.html:15 -#, python-format -msgid "Get %s bridges %s" -msgstr "%s 브릿지 %s를 입수" +#: bridgedb/strings.py:140 +msgid "Enter the characters from the image above..." +msgstr "위 그림의 문자를 입력하십시오..." -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "3단계" +#: bridgedb/strings.py:144 +msgid "How to start using your bridges" +msgstr "브릿지를 사용하는 방법" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: bridgedb/strings.py:146 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "곧 바로 %s Tor 브리지를 추가 %s" +msgid "" +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "Tor 브라우저에 브리지를 입력하려면 먼저 %s Tor 브라우저 다운로드로 이동하십시오.\n페이지 %s로 이동 후 다음 지침에 따라 다운로드 및 시작을 수행하십시오.\nTor 브라우저." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:151 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "'Tor 네트워크 설정' 이라는 대화창이 뜨면, " + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:155 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "당신의 인터넷 서비스 제공자(ISP)가 Tor 네트워크 접속을 차단 또는 검열하나요?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:159 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "'예' 혹은 'Yes' 버튼을 누르신 후 '다음' 혹은 'Next' 버튼을 눌러 주세요.\n브릿지를 설정하시려면, 이 메일로 받으신 브릿지를 텍스트 박스에 복사하신 다음,\n'접속' 혹은 'Connect'를 눌러 주시면 작동될 것입니다!\n만약 문제가 있다면, 'Tor 네트워크 설정' 마법사의 '도움말' 혹은 'Help' 버튼을 눌러 도움을 받으세요." + +#: bridgedb/strings.py:167 +msgid "Displays this message." +msgstr "이 메시지를 표시합니다." + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: bridgedb/strings.py:171 +msgid "Request vanilla bridges." +msgstr "바닐라 브릿지를 요청합니다." + +#: bridgedb/strings.py:172 +msgid "Request IPv6 bridges." +msgstr "IPv6 브릿지를 요청합니다." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: bridgedb/strings.py:174 +msgid "Request a Pluggable Transport by TYPE." +msgstr "삽입형 장치를 TYPE를 통해서 요청하세요." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: bridgedb/strings.py:177 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "BridgeDB의 공개 GnuPG 키를 얻습니다."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Sep '18

06 Sep '18

commit 5b5f4f3cc7d3eea3ec07d215eb214a9728de6edb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 6 11:15:11 2018 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 5c5c90ebc..22fe38ae8 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -15,6 +15,7 @@ # 류종헌, 2015 # Myeongjin <aranet100(a)gmail.com>, 2016 # 이피시소리 <pcsori(a)gmail.com>, 2012 +# Philipp Sauter <qt123(a)pm.me>, 2018 # Sam Ryoo <samryoo(a)gmail.com>, 2014 # Sangmin Lee <sangminlee7648(a)gmail.com>, 2016 # Revi_, 2014 @@ -23,8 +24,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-12 18:54+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-09-06 11:07+0000\n" +"Last-Translator: Philipp Sauter <qt123(a)pm.me>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -260,7 +261,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "게다가 BridgeDB는 상투적인 브릿지가 수많아요. %s 그리고 아무\nPluggable Transports 없습니다. %s 아마도 시원하지 않았던 것이 같지만\n여러모로 인터넷 검열 우회가 도와주겠어요.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?"

1 0

[tor-browser-build/maint-8.0] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 018a2e972bb8963ee3250e7b4926fda46b3c8577 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:33:35 2018 +0200 Bug 26570: Redirect pre-8.0 stable users to a separate update directory --- projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..a66ba41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -56,3 +56,6 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + release: | + # bug 26570: Redirect pre-8.0 stable users to a separate update directory + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]

1 0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit f71743e229b4a696fabccb4632df919bed2b1ee3 Merge: 80410af 018a2e9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:33:44 2018 +0000 Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0 projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26570'
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 01d1537144fc2ecd5a9c1f346b0d889234666051 Merge: 6c19357 018a2e9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:31:20 2018 +0000 Merge remote-tracking branch 'boklm/bug_26570' projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 018a2e972bb8963ee3250e7b4926fda46b3c8577 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:33:35 2018 +0200 Bug 26570: Redirect pre-8.0 stable users to a separate update directory --- projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..a66ba41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -56,3 +56,6 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + release: | + # bug 26570: Redirect pre-8.0 stable users to a separate update directory + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]

1 0

[tor-browser-build/master] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 6c1935752caf9c72595d9e20cbf0da2300783ab6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0

[tor-browser-build/maint-8.0] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit e16754013b11c941efe92f19ff2b041fffca8906 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0