January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Merge branch 'fix/update-translations' into develop
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9b96886048535e66774a760b9917b025bb295d32 Merge: 792cfd9 d1e50e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 12 13:50:20 2013 +0000 Merge branch 'fix/update-translations' into develop lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.mo | Bin 3224 -> 3278 bytes lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 6 +- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.mo | Bin 3320 -> 0 bytes lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 74 ------------ lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.mo | Bin 3211 -> 2676 bytes lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 137 +++++++++++++--------- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.mo | Bin 2673 -> 2727 bytes lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.mo | Bin 3836 -> 3826 bytes lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 8 +- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.mo | Bin 3061 -> 0 bytes lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 74 ------------ lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.mo | Bin 3179 -> 3212 bytes lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 6 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.mo | Bin 2773 -> 2827 bytes lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.mo | Bin 3485 -> 3007 bytes lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 137 +++++++++++++--------- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.mo | Bin 3196 -> 2714 bytes lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 139 ++++++++++++++--------- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.mo | Bin 3294 -> 0 bytes lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 73 ------------ lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.mo | Bin 3387 -> 0 bytes lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 74 ------------ lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.mo | Bin 2660 -> 2715 bytes lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.mo | Bin 3370 -> 2762 bytes lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 137 +++++++++++++--------- lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.mo | Bin 4868 -> 0 bytes lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.po | 72 ------------ lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.mo | Bin 3230 -> 2733 bytes lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 138 +++++++++++++--------- lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.mo | Bin 3433 -> 0 bytes lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.po | 73 ------------ lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.mo | Bin 3235 -> 0 bytes lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 73 ------------ lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.mo | Bin 3228 -> 2713 bytes lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 137 +++++++++++++--------- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 ++++++++++++++++ lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.mo | Bin 2525 -> 2586 bytes lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 12 +- 41 files changed, 622 insertions(+), 855 deletions(-)

1 0

[bridgedb/master] Remove old .po catalogues whose replacements are still incomplete.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 6ce2cf30cee9ad2ee8da40e9a6c74d1fa1982685 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 12 08:02:21 2013 +0000 Remove old .po catalogues whose replacements are still incomplete. --- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 74 ----------------------- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 73 ---------------------- lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 74 ----------------------- lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.po | 72 ---------------------- lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.po | 73 ---------------------- lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 73 ---------------------- 6 files changed, 439 deletions(-) diff --git a/lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po deleted file mode 100644 index 2968de1..0000000 --- a/lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po +++ /dev/null @@ -1,74 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# <eeemsi(a)googlemail.com>, 2012. -# trio <trio(a)esperanto.org>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: identity <eeemsi(a)googlemail.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: eo\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "Jen viaj pontaj plusendiloj:" - -#: lib/bridgedb/I18n.py:23 -msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Pontaj plusendiloj (aŭ \"pontoj\" mallonge) estas plusendiloj de Tor ne listigitaj en la ĉefa enhavlisto. Ĉar ne ekzistas tuta publika list de tiuj, eĉ se via ISP-o filtras ligojn por ĉiuj konataj plusendiloj de Tor, si probable ne povos bari ĉiujn pontojn." - -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "Por uzi la suprajn ligojn, ĉe la paĝo de Network Settings pere de Vidalia, klaku \"Mia ISP baras ligojn al la reto de Tor\". Tiam aldonu ĉiujn pontajn adresojn unu post la alia." - -#: lib/bridgedb/I18n.py:32 -msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Pli ol unu ponto stabiliĝos vian ligon al Tor, se iuj pontoj nehavebliĝus." - -#: lib/bridgedb/I18n.py:35 -msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Alia vojo por trovi adreson de publika ponto estas sendi retposxtmesagxon al bridges(a)torproject.org kun nur la linio \"get bridges\" en la korpo de la mesagxo. Tamen, por malfaciligi la malkovro de multon da pontoj al atakantoj, vi devas sendi la peton el retposxtadreso cxe unu el la sekvaj retregionoj:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[Ĉi tiu estas aŭtomate kreita mesaĝo; bonvole ne respondu.]" - -#: lib/bridgedb/I18n.py:43 -msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Alia vojo por trovi adreson de publika ponto estas viziti https://bridges.torproject.org/. La respondoj, kiujn vi ricevos de tiu pagxo, sxangxigxas preskaux tage, do kontrolu ofte se vi bezonas pliajn pontadresojn." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(neniaj plusendiloj haveblas nun)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(retpoŝtaj petoj ne nun subtenataj)" diff --git a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po deleted file mode 100644 index 500eee5..0000000 --- a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po +++ /dev/null @@ -1,73 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# <viktor.varga(a)gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "Az Ön Hídkapcsolati elosztói:" - -#: lib/bridgedb/I18n.py:23 -msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "A Hídkapcsolati Elosztók (röviden Hidak) olyan Tor Elosztók, amik nem kerülnek listázásra a központi címtárban. Mivel nincs publikus listájuk, még ha az Internet szolgáltatója szűri is az ismert Tor Elosztókhoz történő kapcsolódást, nem fogják tudni az összes hidat blokkolni." - -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "A fenti sorok használatához navigáljon a Vidalia Hálózati beállítások oldalára, és kattintson \"Az Internet szolgáltatóm blokkolja a Tor hálózat elérését\" opcióra, majd adja hozzá egyesével az összes hídkapcsolatot." - -#: lib/bridgedb/I18n.py:32 -msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Egynél több hídkapcsolat engedélyezésével a Tor kapcsolat sokkal stabilabb lesz, abban az esetben, ha néhány hídkapcsolat elérhetetlenné válna." - -#: lib/bridgedb/I18n.py:35 -msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Másik lehetőség elérhető hídkapcsolat keresésére a egy levél küldése a \nbridges(a)torproject.org címre \"get bridges\" tartalommal a levél szövegében.\nHogy még nehezebbé tegyük a támadó számára a hídkapcsolati címek megtanulását, a levelet az alábbi domainek valamelyikéről kell küldenie:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[Ez egy automata levél, kérjük ne válaszoljon.]" - -#: lib/bridgedb/I18n.py:43 -msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Másik lehetőség elérhető hídkapcsolat keresésére, ha ellátogat a \nhttps://bridges.torproject.org/ oldalra. Az itt található lista néhány naponta változik, szóval látogasson vissza ha több hídkapcsolati címre van szüksége." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(nincs elérhető hídkapcsolat jelenleg)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(az e-mail kérések jelenleg nem támogatottak)" diff --git a/lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po deleted file mode 100644 index 9507f87..0000000 --- a/lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po +++ /dev/null @@ -1,74 +0,0 @@ -# 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. -# <pcsori(a)gmail.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: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-07-10 04:08+0000\n" -"Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "여기 귀하의 브릿지 중계가 있습니다. " - -#: lib/bridgedb/I18n.py:23 -msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "브릿지 릴레이 (또는 간단히 \"브릿지\")는 주 디렉토리에 나열되지 않은 \n토르 릴레이입니다. ISP가 모든 알려진 토르 릴레이에 대한 연결을 \n필터링하는 경우에도 그들에 대한 전체 공개리스트가 없기 때문에, \n그들은 모든 브릿지를 차단할 수 없습니다." - -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "위의 라인을 사용하려면, Vidalia의 네트워크 설정 페이지로 이동하고, \n\"토르 네트워크에 내 ISP 블록 연결\"을 클릭하십시오. 다음 각 브리지 \n주소에게 한 번에 하나씩 추가합니다." - -#: lib/bridgedb/I18n.py:32 -msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "토르의 연결이 보다 안정적인 겨우에 브릿지의 일부에 연결할 수 있도록 하나 이상의 브릿지 주소 구성 만들 것입니다." - -#: lib/bridgedb/I18n.py:35 -msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "공용 브릿지 주소를 찾는 다른 방법은 자체 메일의 본문에\n \"브릿지 가져오기\"와 함께 bridges(a)torproject.xn--org-ky7m 메일을 보내는 \n것입니다. 그러나 우리는 브릿지 주소 많이 배워야 공격자를 어렵게 \n만들 수 있으므로, 다음 도메인 중 하나로 요청 이메일 주소를 보내야 \n합니다." - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[이것은 자동으로 생성된 메시지입니다; 회신하지 마십시오.]" - -#: lib/bridgedb/I18n.py:43 -msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "공용 브릿지 주소를 찾는 다른 방법은 \nhttps://bridges.torproject.org/ 을 방문하십시오. \n답변은 자주 변경되므로 더 많은 브릿지 주소가 필요하면 \n정기적으로 확인하십시오." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(현재 사용 가능한 브릿지 없음)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(전자 메일 요청은 현재 지원되지 않음)" diff --git a/lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.po deleted file mode 100644 index c158222..0000000 --- a/lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.po +++ /dev/null @@ -1,72 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-05-11 04:08+0000\n" -"Last-Translator: Thura Hlaing <trhura(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: my\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "သင့်၏ဘရစ်ချ်ရီလေးများသည့် ဒီနေရာတွင်ရှိသည့်" - -#: lib/bridgedb/I18n.py:23 -msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "ဘရစ်ချ်ရီလေး(or \"bridges\"အတိုအားဖြင့်)သည့် ပင်မလမ်းကြောင်းတွင် စာရင်းမသွင်းထားသည့် \n Tor ရီလေးဖြစ်သည် ။ ဘရစ်ချ်နှင့်ပတ်သတ်သည့် ပြီးပြည့်စုံသည့်ဘုံသုံးစာရင်းမရှိပါ \nသင်၏ISP သည့် Tor relys ဟုတ်ထင်ရသည့် ချိတ်ဆက်မှု့အားလုံးအား \nစစ်ထုတ်နေသော်လည်း သူတို့သည့် ဘရစ်ချ်အားလုံးအားမပိတ်ဆို့နိုင်ပါ" - -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "အထက်ပါလိုင်းအားအသုံးပြု၍ Vidalia ၏ကွန်ယက်" - -#: lib/bridgedb/I18n.py:32 -msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "ဘရစ်ချ်လိပ်စာများအားသင့်၏ Tor ချိတ်ဆက်မှု့တွင်အသုံးပြုရန်ပြင်ဆင်ထားခြင်းဖြင့် ပိုမိုတည်ငြိမ်စွာအသုံးပြုနိုင်သည် ။ အဆင်ပြေမှု့များဖြစ်ပေါ်လာခဲ့လျင်ဖြေရှင်းရန်အတွက်ပါ ။" - -#: lib/bridgedb/I18n.py:35 -msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "ဘုံသုံး ဘရစ်ချ်လိပ်စာများကိုရှာဖွေရန်အခြားနည်းလမ်းမှာ\n bridges(a)torproject.org သို့ မေးလ်ပိုပြီး တောင်းဆိုနိုင်ပါသည် ။ \nမေးလ်ပို့ရာတွင် စာကို၌ \"get bridges\"ဟုရေးထားပါ ။\n\" \"ဤအရာများအားလေ့လာရန်ခက်ခဲနေပါသည် ။" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[ဒီစာသည် အလိုအလျှောက်ပို့သည့်စာ ဖြစ်သည့်အတွက် ပြန်လည်ပေးပို့ရန်မလိုပါ ။]" - -#: lib/bridgedb/I18n.py:43 -msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "ဘုံသုံး ဘရစ်ချ်လိပ်စာအားအခြားနေရာတွင်ရှာမည်ဆိုလျှင် https://bridges.torproject.org/ တွင်ကြည့်ပါ ။ ဤစာမျက်နှာတွင်ရှိသည့်အဖြေသည် မကြာခဏပြောင်းလည်းတတ်သဖြင့် ဘရစ်ချ်လိပ်စာများထပ်မံလိုအပ်ပါက ပုံမှတ်စစ်ဆေးသင့်ပါသည်" - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(မည်သည့်ဘရချ်မျ အသုံးမပြုနိုင်ပါ)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(အီးမေလ်းဖြင့်တောင်းဆိုခြင်းအား ယခုအခြေအနေတွင် လက်မခံသေးပါ)" diff --git a/lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.po deleted file mode 100644 index d144505..0000000 --- a/lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.po +++ /dev/null @@ -1,73 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# bogdrozd <bog.d(a)gazeta.pl>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\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: pl_PL\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" - -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "Oto Twoje przekaźniki mostkowe: " - -#: lib/bridgedb/I18n.py:23 -msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Mostkowe przekaźniki sieci (lub po prostu \"mostki\") to węzły sieci Tora, \nktóre nie są wpisane do głównego katalogu. Jako że nie ma pełnej publicznej\nlisty mostków, to nawet jeśli Twój dostawca internetu blokuje połączenia do\nwszystkich znanychwęzłów Tora, prawdopodobnie nie będzie mógł zablokować wszystkich mostków." - -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "By skorzystać z powyższych linii, wejdź do ustawień sieciowych programu Vidalia i kliknij\n \"Mój dostawca blokuje połączenia do sieci Tor\" (\"My ISP blocks connections to the Tor network\").\n Dodawaj adresy mostków jeden po drugim." - -#: lib/bridgedb/I18n.py:32 -msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Skonfigurowanie więcej niż jednego mostka uczyni Twoje połączenie z\nsiecią Tora bardziej stabilnym, w razie gdyby część z mostków stała się nieosiągalna." - -#: lib/bridgedb/I18n.py:35 -msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Innym sposobem na znalezienie publicznych adresów mostków jest wysłanie\nlistue-mail na adres bridges(a)torproject.org o treści zawierającej tylko\njedną linię mówiącą \"get bridges\". Aby utrudnić napastnikom poznanie mnóstwa\nadresów mostków, musisz wysłać swój list z konta na jednej z poniższych domen:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[To jest automatyczna wiadomość; proszę nie odpowiadać.]" - -#: lib/bridgedb/I18n.py:43 -msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Innym sposobem na znalezienie publicznych adresów mostków jest odwiedzenie\nhttps://bridges.torproject.org/. Odpowiedzi, które otrzymasz na tej stronie\nbędą się zmieniać co kilka dni, więc sprawdzają ją okresowo, jeśli potrzebujesz\nwięcej adresów mostków." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(aktualnie nie ma dostępnych mostków)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(żądania e-mail aktualnie nie są obsługiwane)" diff --git a/lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po deleted file mode 100644 index a216b29..0000000 --- a/lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po +++ /dev/null @@ -1,73 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# marko <mr.marko(a)gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: marko <mr.marko(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: sl_SI\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n" - -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "Tukaj so vaši mostni releji:" - -#: lib/bridgedb/I18n.py:23 -msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Mostni releji (ali \"mostovi\" na kratko), so Tor releji, ki niso na seznamu v glavnem imeniku. Ker popoln javni seznam Tor relejev ne obstaja, tudi če vaš ISP filtrira povezave do vseh znanih Tor relejev, verjetno ne bo mogel blokirati vseh mostov." - -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "Za uporabo zgornjih vrstic, pojdite na Vidalia Network stran z nastavitvami in kliknite »Moj ISP blokira povezave na Tor omrežje\". Nato posamično dodajte naslov vsakega mostu." - -#: lib/bridgedb/I18n.py:32 -msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Nastavitev več kot enega naslova mostu vam bo omogočila bolj stabilno Tor povezavo v primeru, da kateri izmed mostov postane nedosegljiv." - -#: lib/bridgedb/I18n.py:35 -msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Drug način, kako poiskati naslove javnih mostov, je, da pošljete e-pošto na bridges(a)torproject.org, ki bo imela v vsebini sporočila samo vrstico \"get bridges\". Da bi onemogočili napadalcem poizvedbo velikega števila naslovov mostov, je zahtevo potrebno poslati iz e-poštnega naslova ene izmed naslednjih domen:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[To je samodejno sporočilo, prosimo, da nanj ne odgovarjate.]" - -#: lib/bridgedb/I18n.py:43 -msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Drug način, kako poiskati naslove javnih mostov, je, da obiščete https://bridges.torproject.org/. Odgovor, ki ga boste dobili na tej strani, se bo spremenil vsakih nekaj dni, zato v primeru, da potrebujete več naslovov mostov, preverjajte to stran redno." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(Trenutno ni na voljo nobenega mostu)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(Zahteve preko e-pošte trenutno niso podprte)"

1 0

[bridgedb/master] Also remove the "bridge" prefix from returned pluggable transport lines.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 20d6171844d275f768229a1a4052a31fd42cd4bd Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 12 18:58:45 2013 +0000 Also remove the "bridge" prefix from returned pluggable transport lines. --- lib/bridgedb/Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 98724d8..9fc94e8 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -464,7 +464,7 @@ class PluggableTransport: if isinstance(self.address,ipaddr.IPv6Address): address = "[%s]" % self.address else: address = self.address - host = "bridge %s %s:%d" % (self.methodname, address, self.port) + host = "%s %s:%d" % (self.methodname, address, self.port) fp = '' if includeFingerprint: fp = "keyid=%s" % self.bridge.fingerprint args = " ".join(["%s=%s"%(k,v) for k,v in self.argdict.items()]).strip()

1 0

[bridgedb/master] Add .PHONY directive to the Makefile.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 443f8c00a06ede144d2f3ad7480823abe8229390 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 19 17:32:13 2013 +0000 Add .PHONY directive to the Makefile. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e9abae4..6f563c1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ +.PHONY: install test + all: python setup.py build

1 0

[bridgedb/master] Change Makefile install directive to record where the files were installed.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c43fbb1ef12faf8d60c35649869404d2d63c9633 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 19 17:32:54 2013 +0000 Change Makefile install directive to record where the files were installed. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f563c1..25e624c 100644 --- a/Makefile +++ b/Makefile @@ -8,4 +8,4 @@ test: python setup.py test install: - python setup.py install + python setup.py install --record installed-files.txt

1 0

[bridgedb/master] Remove unused distutils import from setup.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 9eda48daefc87f143500d2303e9b86a0528ff30c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 19 22:07:25 2013 +0000 Remove unused distutils import from setup.py. --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index e514ea0..ae1e126 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ # Copyright (c) 2007-2009, The Tor Project, Inc. # See LICENSE for licensing information -import distutils import subprocess from distutils.command.install_data import install_data as _install_data import os

1 0

[bridgedb/master] Add automatic installation of dependencies to setup.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 191a47f93659d2ec9e5f17c660f4dcd9ceb5dae9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 19 23:56:57 2013 +0000 Add automatic installation of dependencies to setup.py. * ADD function get_requirements() to setup.py file, for parsing the requirements.txt file and installing the dependencies specified there. This allows us to keep one place for keeping track of dependencies, regardless of whether we are installed from a source distribution (git or a tarball) or with pip. --- setup.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/setup.py b/setup.py index 3a1f737..2f72b9d 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,8 @@ # Copyright (c) 2007-2009, The Tor Project, Inc. # See LICENSE for licensing information +from __future__ import print_function + import subprocess from distutils.command.install_data import install_data as _install_data import os @@ -39,6 +41,21 @@ def get_cmdclass(): cmdclass.update(versioneer.get_cmdclass()) return cmdclass +def get_requirements(): + """Extract the list of requirements from our requirements.txt.""" + requirements_file = os.path.join(os.getcwd(), 'requirements.txt') + requirements = [] + try: + with open(requirements_file) as reqfile: + for line in reqfile.readlines(): + line = line.strip() + if not line.startswith('#'): + requirements.append(line) + except OSError as oserr: + print(oserr) + + return requirements + class installData(_install_data): def run(self): @@ -92,6 +109,7 @@ setuptools.setup( py_modules=['TorBridgeDB'], cmdclass=get_cmdclass(), include_package_data=True, + install_requires=get_requirements(), package_data={'bridgedb': ['i18n/*/LC_MESSAGES/*.mo', 'templates/*.html', 'templates/assets/*']},

1 0

[bridgedb/master] Move README.md → README so that it gets included in packages by setuptools.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 6d3da5ba38c2d6c348c0bc2cb64a46a18022cbb0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 12 14:05:58 2013 +0000 Move README.md → README so that it gets included in packages by setuptools. * CHANGE the "Translations" section to accurately reflect required steps for updateing .pot files with strings which are newly added to BridgeDB's source code, as well as instructions for getting finished translations from gitweb.torproject.org/translations.git. * FIX a couple typos in the README. --- README | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 220 +--------------------------------------------------- 2 files changed, 259 insertions(+), 219 deletions(-) diff --git a/README b/README new file mode 100644 index 0000000..6d390e4 --- /dev/null +++ b/README @@ -0,0 +1,258 @@ +## BridgeDB +----------- + +BridgeDB is a collection of backend servers used to distribute +[Tor Bridges](https://www.torproject.org/docs/bridges). It currently consists +of a webserver with [an HTTPS interface](https://bridges.torproject.org), an +email responder, and an SQLite database. + +#### What are Tor Bridges? +[Tor Bridges](https://www.torproject.org/docs/bridges) are special Tor relays +which are not listed in the public relay directory. They are used to help +circumvent [censorship](https://ooni.torproject.org) by providing users with +connections to the public relays in the Tor network. + +Tor Bridges are different from normal relays in another important way: they +can run what are called *Pluggable* *Transports*. + +#### What's a Pluggable Transport? +A +[Pluggable Transport](https://www.torproject.org/docs/pluggable-transports.html.en) +is a program which is *pluggable* — meaning that it is meant to work with lots +of other anonymity and censorship circumvention software, not just Tor — and +is a *transport* — meaning that it transports your internet traffic, usually +in a way which makes it look different. For example, +[Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) is a +Pluggable Transport which disguises your traffic by adding an obfuscating +layer of encryption. + +#### So how do I use this? +Well, probably, you don't. But if you're looking for bridges, you can use +[BridgeDB's web interface](https://bridges.torproject.org), which has +instructions on getting the Pluggable Transports Tor Browser Bundle, as well +as instructions for getting extra Bridges. + + +## Maintainer Setup + +### Dependencies and installation +BridgeDB requires the following OS-level dependencies: + + - Python>=2.6 + - OpenSSL>=1.0.1e + - [SQLite3](http://www.maxmind.com/app/python) + - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) + - [python-setuptools](https://pypi.python.org/pypi/setuptools) + +As well as the following Python dependencies (from ./requirements.txt): + + Babel==0.9.6 + BeautifulSoup==3.2.1 + Mako==0.8.1 + MarkupSafe==0.18 + Twisted>=13.0.0 + argparse>=1.2.1 + distribute>=0.6.46 + ipaddr>=2.1.10 + pyOpenSSL>=0.13 + pygeoip>=0.2.6 + pygpgme==0.3 + recaptcha>=1.0rc1 + recaptcha-client>=1.0.6 + wsgiref>=0.1.2 + zope.interface>=4.0.5 + +### Deploying BridgeDB in a Python virtualenv + + - Install Python 2.6 or later, and other OS-level dependencies. On Debian, + you can do: + + sudo apt-get install python openssl sqlite3 tor-geoip + + - Install Pip 1.3.1 or later. Debian sid has this version, but if you're + tracking a different release, the easiest way to install a newer Pip is to + use the Pip development teams's + [getpip script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py): + + wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py + + - Use Pip to install virtualenv and [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org): + + sudo pip install --upgrade virtualenv virtualenvwrapper + + - Configure virtualenvwrapper and create a virtualenv for Bridgedb: + + WORKON_HOME=${HOME}/.virtualenvs + export WORKON_HOME + mkdir -p $WORKON_HOME + source $(which virtualenvwrapper.sh) + git clone https://git.torproject.org/bridgedb.git && cd bridgedb + mkvirtualenv -a $PWD -r requirements.txt --unzip-setuptools \ + --setuptools bridgedb + + From now on, to use BridgeDB's virtualenv, just do ```$ workon bridgedb``` + (after sourcing virtualenvwrapper.sh, as before). To exit the virtualenv + without exiting the shell, do ```$ deactivate```. + + - To run unit tests: + + python setup.py test + + - To install BridgeDB: + + python setup.py install + + +### Enabling additional features: + +#### Translations + +**Using New Translations**: This should be done when newly completed + translations are available in Transifex. + +Clone/Update the +[translations repository](https://gitweb.torproject.org/translation.git), +checkout the ```bridgedb_completed``` branch, and copy the .po files into +```lib/bridgedb/i18n/```. + +Assuming a side-by-side repo layout (if you're in the parent directory of the +bridgedb repo): + + git clone https://gitweb.torproject.org/translation.git + git fetch --all + cd translation && git checkout bridgedb_completed + cd .. && rsync -PCAXrv \ + --filter 'include ./translation/*/LC_MESSAGES/bridgedb.po' \ + --filter 'exclude .gitignore' \ + ./translation/ ./bridgedb/lib/bridgedb/i18n/ + +and then convert them to binary (.mo) format so that they can be installed: + + cd bridgedb && python setup.py compile_catalog + +Don't forget to reinstall BridgeDB to update the templates! + + python setup.py install + +[xxx outdated, these commands seem to not exist...] + + python setup.py trans && python setup.py install_data + +**Requesting Translations for Altered/Added Source Code**: This should be done + whenever any of the strings requiring translation -- _("they are formatted + like this") -- are changed, or new ones are added. See + ```lib/bridgedb/I18n.py```. + +Translations for Tor Project repos are kept +[in a separate repo](https://gitweb.torproject.org/translation.git). You'll +need to extract the strings from BridgeDB's source code into .pot templates, +and place these .po files into the ```translation``` repo in the +```bridgedb``` branch. After than the .po files should be put into Transifex +(don't ask me how this works…) and translated. After the translations are +complete, the finished .po files should be placed into the +```bridgedb_completed``` branch. + + - To extract all strings from BridgeDB's source: + + python setup.py extract_messages --input-dirs ./lib/bridgedb/templates + + A .pot file will be created in ./i18n/templates/bridgedb.pot + + - Initialise catalogs for each desired language: + + python setup.py init_catalog -l LANG + + where ```LANG``` is the 2 or 4 letter country-code, eg. 'es'. If you've + already initialised a particular language, do instead: + + python setup.py update_catalog + + +#### Enabling HTTPS +Create a self-signed certificate with: + + openssl req -x509 -new -nodes > cert + +Or, place an existing certificate in the path specified in bridgedb.conf by +the ```HTTPS_CERT_FILE``` option, and a private key where ```HTTPS_KEY_FILE``` +points to. The defaults are 'cert' and 'privkey.pem', respectively. + +#### CAPTCHAs +To enable Captchas on the webserver interface, set these options in +bridgedb.conf: + + RECAPTCHA_ENABLED + RECAPTCHA_PUB_KEY + RECAPTCHA_PRIV_KEY + +A [recaptcha.net](https://www.google.com/recaptcha) account is required. + +#### GnuPG email signing +Add these two options to your bridgedb.conf: + + EMAIL_GPG_SIGNING_ENABLED + EMAIL_GPG_SIGNING_KEY + +The former may be either True or False, and the latter must point to the +ascii-armored private key file. The keyfile must not be passphrase protected. + +#### Preventing already-blocked bridges from being distributed +Uncomment or add ```COUNTRY_BLOCK_FILE``` to your bridgedb.conf. This file +should contain one bridge entry per line, in the format: + + fingerprint <bridge fingerprint> country-code <country code> + +If the ```COUNTRY_BLOCK_FILE``` file is present, bridgedb will filter blocked +bridges from the responses it gives to clients requesting bridges. + +#### Updating the SQL schema +Make sure that SQLite3 is installed. (You should have installed it already +during the setup and installation stage.) To update, do: + + sqlite3 path/to/bridgedist.db.sqlite + +Enter the following commands at the ```sqlite>``` prompt: + + CREATE TABLE BlockedBridges ( id INTEGER PRIMARY KEY NOT NULL, hex_key, blocking_country); + CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key); + CREATE TABLE WarnedEmails ( email PRIMARY KEY NOT NULL, when_warned); + CREATE INDEX WarnedEmailsWasWarned on WarnedEmails ( email ); + REPLACE INTO Config VALUES ( 'schema-version', 2 ); + + +## Running BridgeDB +To run BridgeDB, simply make any necessary changes to bridgedb.conf, and do: + + python -m TorBridgeDB -c bridgedb.conf + +When you have new lists of bridges, replace the old files and send the process +a SIGHUP. + +Make sure that the files and directories referred to in bridgedb.conf +exist. However, many of them, if not found, will be touched on disk so that +attempts to read/write from/to them will not raise excessive errors. + +#### To extract bucket files of all unallocated bridges: +Edit the configuration file value ```FILE_BUCKETS``` according to your +needs. For example, the following is a possible configuration: + + FILE_BUCKETS = { "name1": 10, "name2": 15, "foobar": 3 } + +This configuration for buckets would result in 3 files being created for +bridge distribution: name1-2010-07-17.brdgs, name2-2010-07-17.brdgs and +foobar-2010-07-17.brdgs. The first file would contain 10 bridges from +BridgeDB's 'unallocated' pool. The second file would contain 15 bridges from +the same pool and the third one similarly 3 bridges. These files can then be +handed out to trusted parties via mail or fed to other distribution mechanisms +such as twitter. + +#### To use with HTTPS: +Just connect to the appropriate port. + +#### To use with email: +Any mail sent to the email port with a subject or a single line _exactly_ +equal to "get bridges" will get answered, assuming the domain is okay. + +### Support +Send your questions to isis (A) torproject (circle) org. diff --git a/README.md b/README.md deleted file mode 100644 index 9a50246..0000000 --- a/README.md +++ /dev/null @@ -1,219 +0,0 @@ -## BridgeDB ------------ - -BridgeDB is a collection of backend servers used to distribute -[Tor Bridges](https://www.torproject.org/docs/bridges). It currently consists -of a webserver with [an HTTPS interface](https://bridges.torproject.org), an -email responder, and an SQLite database. - -#### What are Tor Bridges? -[Tor Bridges](https://www.torproject.org/docs/bridges) are special Tor relays -which are not listed in the public relay directory. They are used to help -circumvent [censorship](https://ooni.torproject.org) by providing users with -connections to the public relays in the Tor network. - -Tor Bridges are different from normal relays in another important way: they -can run what are called *Pluggable* *Transports*. - -#### What's a Pluggable Transport? -A -[Pluggable Transport](https://www.torproject.org/docs/pluggable-transports.html.en) -is a program which is *pluggable* — meaning that it is meant to work with lots -of other anonymity and censorship circumvention software, not just Tor — and -is a *transport* — meaning that it transports your internet traffic, usually -in a way which makes it look different. For example, -[Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) is a -Pluggable Transport which disguises your traffic by adding an obfuscating -layer of encryption. - -#### So how do I use this? -Well, probably, you don't. But if you're looking for bridges, you can use -[BridgeDB's web interface](https://bridges.torproject.org), which has -instructions on getting the Pluggable Transports Tor Browser Bundle, as well -as instructions for getting extra Bridges. - - -## Maintainer Setup - -### Dependencies and installation -BridgeDB requires the following OS-level dependencies: - - - Python>=2.6 - - OpenSSL>=1.0.1e - - [SQLite3](http://www.maxmind.com/app/python) - - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) - - [python-setuptools](https://pypi.python.org/pypi/setuptools) - -As well as the following Python dependencies (from ./requirements.txt): - - Babel==0.9.6 - BeautifulSoup==3.2.1 - Mako==0.8.1 - MarkupSafe==0.18 - Twisted>=13.0.0 - argparse>=1.2.1 - distribute>=0.6.46 - ipaddr>=2.1.10 - pyOpenSSL>=0.13 - pygeoip>=0.2.6 - pygpgme==0.3 - recaptcha>=1.0rc1 - recaptcha-client>=1.0.6 - wsgiref>=0.1.2 - zope.interface>=4.0.5 - -### Deploying BridgeDB in a Python virtualenv - - - Install Python 2.6 or later, and other OS-level dependencies. On Debian, - you can do: - - sudo apt-get install python openssl sqlite3 tor-geoip - - - Install Pip 1.3.1 or later. Debian sid has this version, but if you're - tracking a different release, the easiest way to install a newer Pip is to - use the Pip development teams's - [getpip script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py): - - wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py - sudo python get-pip.py - - - Use Pip to install virtualenv and [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org): - - sudo pip install --upgrade virtualenv virtualenvwrapper - - - Configure virtualenvwrapper and create a virtualenv for Bridgedb: - - WORKON_HOME=${HOME}/.virtualenvs - export WORKON_HOME - mkdir -p $WORKON_HOME - source $(which virtualenvwrapper.sh) - git clone https://git.torproject.org/bridgedb.git && cd bridgedb - mkvirtualenv -a $PWD -r requirements.txt --unzip-setuptools \ - --setuptools bridgedb - - From now on, to use BridgeDB's virtualenv, just do ```$ workon bridgedb``` - (after sourcing virtualenvwrapper.sh, as before). To exit the virtualenv - without exiting the shell, do ```$ deactivate```. - - - To run unit tests: - - python setup.py test - - - To install BridgeDB: - - python setup.py install - - -### Enabling additional features: - -#### Translations - - To extract all strings from BridgeDB's source: - - python setup.py extract_messages - - A .pot file will be created in ./i18n/templates/bridgedb.pot - - Initialise catalogs for each desired language: - - python setup.py init_catalog -l LANG - - where ```LANG``` is the 2 or 4 letter country-code, eg. 'es'. - - Edit strings in ./i18n/LANG/bridgedb.po, and then convert them to binary - format: - - python setup.py compile_catalog - - Don't forget to reinstall BridgeDB to update the templates! - - python setup.py install - - - To generate translation files, and then install them, do: - - python setup.py trans && python setup.py install_data - -#### Enabling HTTPS -Create a self-signed certificate with: - - openssl req -x509 -new -nodes > cert - -Or, place an existing certificate in the path specified in bridgedb.conf by -the ```HTTPS_CERT_FILE``` option, and a private key where ```HTTPS_KEY_FILE``` -points to. The defaults are 'cert' and 'privkey.pem', respectively. - -#### CAPTCHAs -To enable Captchas on the webserver interface, set the options in -bridgedb.conf: - - RECAPTCHA_ENABLED - RECAPTCHA_PUB_KEY - RECAPTCHA_PRIV_KEY - -A [recaptcha.net](https://www.google.com/recaptcha) account is required. - -#### GnuPG email signing -Add these two options to your bridgedb.conf: - - EMAIL_GPG_SIGNING_ENABLED - EMAIL_GPG_SIGNING_KEY - -The former may be either True or False, and the latter must point to the -ascii-armored private key file. The keyfile must not be passphrase protected. - -#### Preventing already-blocked bridges from being distributed -Uncomment or add ```COUNTRY_BLOCK_FILE``` to your bridgedb.conf. This file -should contain one bridge entry per line, in the format: - - fingerprint <bridge fingerprint> country-code <country code> - -If the ```COUNTRY_BLOCK_FILE``` file is present, bridgedb will filter blocked -bridges from the responses it gives to clients requesting bridges. - -#### Updating the SQL schema -Make sure that SQLite3 is installed. (You should have installed it already -during the setup and installation stage.) To update, do: - - sqlite3 path/to/bridgedist.db.sqlite - -Enter the following commands at the ```sqlite>``` prompt: - - CREATE TABLE BlockedBridges ( id INTEGER PRIMARY KEY NOT NULL, hex_key, blocking_country); - CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key); - CREATE TABLE WarnedEmails ( email PRIMARY KEY NOT NULL, when_warned); - CREATE INDEX WarnedEmailsWasWarned on WarnedEmails ( email ); - REPLACE INTO Config VALUES ( 'schema-version', 2 ); - - -## Running BridgeDB -To run BridgeDB, simply make any necessary changes to bridgedb.conf, and do: - - python -m TorBridgeDB -c bridgedb.conf - -When you have new lists of bridges, replace the old files and send the process -a SIGHUP. - -Make sure that the files and directories referred to in bridgedb.conf -exist. However, many of them, if not found, will be touched on disk so that -attempts to read/write from/to them will not raise excessive errors. - -#### To extract bucket files of all unallocated bridges: -Edit the configuration file value ```FILE_BUCKETS``` according to your -needs. For example, the following is a possible configuration: - - FILE_BUCKETS = { "name1": 10, "name2": 15, "foobar": 3 } - -This configuration for buckets would result in 3 files being created for -bridge distribution: name1-2010-07-17.brdgs, name2-2010-07-17.brdgs and -foobar-2010-07-17.brdgs. The first file would contain 10 bridges from -BridgeDB's 'unallocated' pool. The second file would contain 15 bridges from -the same pool and the third one similarly 3 bridges. These files can then be -handed out to trusted parties via mail or fed to other distribution mechanisms -such as twitter. - -#### To use with HTTPS: -Just connect to the appropriate port. - -#### To use with email: -Any mail sent to the email port with a subject or a single line _exactly_ -equal to "get bridges" will get answered, assuming the domain is okay. - -### Support -Send your questions to aagbsn(a)torproject.org. diff --git a/README.md b/README.md new file mode 120000 index 0000000..100b938 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +README \ No newline at end of file

1 0

[bridgedb/master] Add uninstall directive to the Makefile.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 4c6c44786380d101f0cd8105aca4cfcee8ec3fd4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Aug 19 17:33:20 2013 +0000 Add uninstall directive to the Makefile. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 25e624c..6812422 100644 --- a/Makefile +++ b/Makefile @@ -9,3 +9,7 @@ test: install: python setup.py install --record installed-files.txt + +uninstall: + touch installed-files.txt + cat installed-files.txt | xargs rm -rf

1 0

[bridgedb/master] Merge branch 'release-0.0.1'
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 0be47e0658ac814b4e566858e8b148599278a461 Merge: 792cfd9 6609e34 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 20 01:27:00 2013 +0000 Merge branch 'release-0.0.1' .gitattributes | 1 + MANIFEST.in | 1 - Makefile | 8 +- README | 258 +++++++++ README.md | 220 +------- lib/TorBridgeDB.py | 4 - lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/__init__.py | 4 + lib/bridgedb/_version.py | 197 +++++++ lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.mo | Bin 3224 -> 3278 bytes lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 6 +- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.mo | Bin 3320 -> 0 bytes lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 74 --- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.mo | Bin 3211 -> 2676 bytes lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 137 +++-- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.mo | Bin 2673 -> 2727 bytes lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.mo | Bin 3836 -> 3826 bytes lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 8 +- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.mo | Bin 3061 -> 0 bytes lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 74 --- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.mo | Bin 3179 -> 3212 bytes lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 6 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.mo | Bin 2773 -> 2827 bytes lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.mo | Bin 3485 -> 3007 bytes lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 137 +++-- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.mo | Bin 3196 -> 2714 bytes lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 139 +++-- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.mo | Bin 3294 -> 0 bytes lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 73 --- lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.mo | Bin 3387 -> 0 bytes lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 74 --- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.mo | Bin 2660 -> 2715 bytes lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.mo | Bin 3370 -> 2762 bytes lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 137 +++-- lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.mo | Bin 4868 -> 0 bytes lib/bridgedb/i18n/my/LC_MESSAGES/bridgedb.po | 72 --- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.mo | Bin 3230 -> 2733 bytes lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 138 +++-- lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.mo | Bin 3433 -> 0 bytes lib/bridgedb/i18n/pl_PL/LC_MESSAGES/bridgedb.po | 73 --- lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.mo | Bin 3235 -> 0 bytes lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 73 --- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.mo | Bin 3228 -> 2713 bytes lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 137 +++-- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 ++++ lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.mo | Bin 2525 -> 2586 bytes lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 12 +- scripts/bridgedb | 4 + setup.py | 106 +++- versioneer.py | 656 +++++++++++++++++++++++ 53 files changed, 1830 insertions(+), 1108 deletions(-)

1 0