August 2013 - tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 20 Aug '13

20 Aug '13

commit 102d17317242a827dba9454b6003332a20cc31db Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 20 08:16:13 2013 +0000 Update translations for orbot --- values-ar/strings.xml | 1 - values-bg/strings.xml | 1 - values-ca/strings.xml | 1 - values-cs/strings.xml | 1 - values-da/strings.xml | 1 - values-de/strings.xml | 1 - values-el/strings.xml | 1 - values-es/strings.xml | 1 - values-eu/strings.xml | 1 - values-fa/strings.xml | 1 - values-fr/strings.xml | 1 - values-he/strings.xml | 1 - values-hr_HR/strings.xml | 1 - values-hu/strings.xml | 1 - values-is/strings.xml | 1 - values-it/strings.xml | 1 - values-ja/strings.xml | 1 - values-ko/strings.xml | 1 - values-lv/strings.xml | 1 - values-mk/strings.xml | 1 - values-ms_MY/strings.xml | 1 - values-nb/strings.xml | 1 - values-nl/strings.xml | 1 - values-pl/strings.xml | 1 - values-pt_BR/strings.xml | 1 - values-ru/strings.xml | 1 - values-si_LK/strings.xml | 1 - values-sv/strings.xml | 1 - values-tr/strings.xml | 1 - values-vi/strings.xml | 1 - values-zh/strings.xml | 1 - values/strings.xml | 7 ++++++- 32 files changed, 6 insertions(+), 32 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 5d46cdb..a87668f 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: برنامج للمراسلة الفورية الآمنة يعمل ببروتوكول التشفير Off-the-Record</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: متصفح مصمّم للخصوصية و يعمل مع تور</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject\n</string>  <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>   - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>   <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> diff --git a/values-ms_MY/strings.xml b/values-ms_MY/strings.xml index c132932..d9d852d 100644 --- a/values-ms_MY/strings.xml +++ b/values-ms_MY/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: sembang app selamat dengan Penyulitan Off-the-Rekod</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> <string name="wizard_tips_play">Cari semua projek Guardian di Google play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 315a87b..5a1b752 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: Sikker chat app med Off-The-Record kryptering</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Personverns-forsterket nettleser som virker gjennom Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> <string name="wizard_tips_play">Finn alle apps fra Guardian Project på Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index cf5c431..e982f51 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: Veilige chat app met Off-the-Record encryptie</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_tips_play">Vind alle Guardian Project apps op Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 5a278be..0401fec 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: Bezpieczny aplikacja chatu z szyfrowaniem Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml index 06fbf05..a4c2bf1 100644 --- a/values-pt_BR/strings.xml +++ b/values-pt_BR/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index e1d1645..5d5bb55 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: приложение для безопасной переписки с конфиденциальным шифрованием</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_tips_play">Найти все приложения Guardian Project на Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-si_LK/strings.xml b/values-si_LK/strings.xml index 7fb2dc5..9bb603e 100644 --- a/values-si_LK/strings.xml +++ b/values-si_LK/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: කථා බස් කිරීමට යොදාගන්නා සුරක්ෂිත, අප්‍රසිද්ධ සංකේතන සහිත යොමුවකි.</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Tor හරහා පෞද්ගලිකත්වය වැඩිකරන බ්‍රව්සරයකි.</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> <string name="wizard_tips_play">Google Play තුලින් Guardian Project apps තෝරාගන්න </string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index ad55a11..a4bbd30 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: Säker chatt app med Off-the-Record Kryptering</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Integritets-förbättrande webbläsare som fungerar genom Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-tr/strings.xml b/values-tr/strings.xml index 2d09b47..c154711 100644 --- a/values-tr/strings.xml +++ b/values-tr/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: Kayıt altına alınmayan şifreleme ile güvenli sohbet uygulaması</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Tor üzerinden çalışabilen, gizliliği artırılmış tarayıcı.</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> <string name="wizard_tips_play">Google Play\'deki tüm Guardian Projesi uygulamalarına bakın</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-vi/strings.xml b/values-vi/strings.xml index db258e4..e6af162 100644 --- a/values-vi/strings.xml +++ b/values-vi/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot: Ứng dụng tin nhắn nhanh và an toàn theo dạng mã hoá</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Trình duyệt có khả năng bảo mật cao được dùng qua mạng Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> <string name="wizard_tips_play">Hãy tìm những ứng dụng của Guardian Project trên Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 2e7718f..262434d 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -107,7 +107,6 @@ <string name="wizard_tips_gibberbot">Gibberbot：加密且不会留下记录的安全聊天应用程序</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb：使用 Tor 网络的隐私保护浏览器</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> diff --git a/values/strings.xml b/values/strings.xml index ddfcda6..fa9eedd 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -107,7 +107,7 @@ <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> @@ -226,4 +226,9 @@ <string name="powered_by">powered by The Tor Project </string> <string name="btn_save_settings">Save Settings</string> <string name="no_internet_connection_tor">No internet connection; Tor is on standby...</string> + <string name="bandwidth_">Bandwidth:</string> + <string name="down">down</string> + <string name="up">up</string> + <string name="pref_disable_network_title">Network Auto-Sleep</string> + <string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string> </resources>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 20 Aug '13

20 Aug '13

commit 265ba13fc9dd2ee707fc5f3095cbb42c14794e5f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 20 06:15:07 2013 +0000 Update translations for gettor --- zh_TW/gettor.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/gettor.po b/zh_TW/gettor.po index 2438bb4..580fdba 100644 --- a/zh_TW/gettor.po +++ b/zh_TW/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-08-20 05:44+0000\n" +"PO-Revision-Date: 2013-08-20 06:00+0000\n" "Last-Translator: chinrur <chinrur(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "您好，這是\"GetTor\"機器人。" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "感謝您的要求。" #: lib/gettor/i18n.py:31 msgid "" @@ -276,13 +276,13 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "" +msgstr "重要注意事項：\n由於這是分割檔案需求的一部分，收到全部檔案之前\n您需要等待，您可以將分割檔案全部儲存\n至同一個資料夾，並藉由滑鼠左鍵點擊第一個檔案兩下\n以進行解壓縮。" #: lib/gettor/i18n.py:185 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "" +msgstr "套件排序尚未到達！請確保您收到\n所有的順序，然後再嘗試解開他們！" #: lib/gettor/i18n.py:188 #, python-format @@ -301,7 +301,7 @@ msgstr "" msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "" +msgstr "不幸的是我們目前遇到一些問題使得我們無法完成\n您的請求。請耐心等候我們嘗試解決這個問題。" #: lib/gettor/i18n.py:197 msgid "" @@ -309,7 +309,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "" +msgstr "不幸的是您沒有分割套件可供使用於\n您的請求，請給我們另一個套件名稱或要求相同的套件\n再一次刪除'分割'關鍵字，在這種情況下，我們會向您發送整個\n套件，請確保這是您想要的。" #: lib/gettor/i18n.py:202 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 20 Aug '13

20 Aug '13

commit 31da06ad54ddc924a7291b21cb1450b0ecbb7e99 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 20 05:45:07 2013 +0000 Update translations for gettor --- zh_TW/gettor.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/zh_TW/gettor.po b/zh_TW/gettor.po index 13b1282..2438bb4 100644 --- a/zh_TW/gettor.po +++ b/zh_TW/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# chinrur <chinrur(a)gmail.com>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2010-11-30 05:01+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-08-20 05:44+0000\n" +"Last-Translator: chinrur <chinrur(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,14 +39,14 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "" +msgstr "我們只處理支援“DKIM”的電子郵件服務請求，\n這是一種讓我們驗證電子郵件地址的功能，\n“寄件者”欄位實際上是未知者發送的郵件。" #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "" +msgstr "(若您沒有要求此郵件，我們深表歉意，由於您的電子郵件\n服務不使用DKIM，我們將發送一個簡短的說明，\n然後我們將忽略此電子郵件地址至隔天左右。)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" @@ -100,11 +101,11 @@ msgstr "" #: lib/gettor/i18n.py:76 msgid " List of supported locales:" -msgstr "" +msgstr "支援的語言環境列表：" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "" +msgstr "下列為所有可用的語言：" #: lib/gettor/i18n.py:80 msgid "" @@ -119,11 +120,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr "" +msgstr " gettor+ar(a)torproject.org: 阿拉伯語 Arabic\n gettor+de(a)torproject.org: 德文 German\n gettor+en(a)torproject.org: 英文 English\n gettor+es(a)torproject.org: 西班牙文 Spanish\n gettor+fa(a)torproject.org: 波斯語 Farsi (Iran)\n gettor+fr(a)torproject.org: 法文 French\n gettor+it(a)torproject.org: 義大利文 Italian\n gettor+nl(a)torproject.org: 荷蘭文 Dutch\n gettor+pl(a)torproject.org: 波蘭語 Polish\n gettor+ru(a)torproject.org: 俄文 Russian\n gettor+zh(a)torproject.org: 中文 Chinese" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "" +msgstr "若您沒有選擇語言，您將收到英文版本。" #: lib/gettor/i18n.py:94 msgid "" @@ -151,17 +152,17 @@ msgstr "" msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "" +msgstr "此文字檔將藉由電子郵件傳至GetTor將會發送給您\nTor瀏覽器套件Tor Browser Bundle為一些1,4 MB的附加檔案。" #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "" +msgstr "之後收到的所有部分，您需要重新組裝它們成\n一包裝檔。這是透過以下步驟：" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "" +msgstr "1.) 將所有收到的附加檔案儲存於您硬碟上的一資料夾。" #: lib/gettor/i18n.py:115 msgid "" @@ -174,7 +175,7 @@ msgstr "" msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "" +msgstr "3.) 確認所有您收到郵件中所敘述的\n每個檔案 (gpg --驗證)" #: lib/gettor/i18n.py:122 msgid "" @@ -188,11 +189,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "" +msgstr "5.) 解壓縮完成後，您應該會找到一個新建立之\n\".exe\"檔案於您的目標資料中，輕點滑鼠左鍵兩下\nTor瀏覽器套件，應於幾秒鐘內就會啟動。" #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "" +msgstr "6.) 就是這樣，您就大功告成了。感謝您使用Tor和祝您使用愉快！" #: lib/gettor/i18n.py:132 msgid "" @@ -245,7 +246,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "" +msgstr "若您的網際網路連結阻止存取Tor網絡，您\n可能需要透過橋接中繼。橋接中繼(或簡稱\"橋接\")\n在Tor中繼尚未於主目錄中列出，由於他們\n沒有完整的公共目錄清單，即使您的ISP過濾\n連結到所有已知的Tor中繼，他們可能也會不能夠\n屏蔽所有的橋接。" #: lib/gettor/i18n.py:167 msgid "" @@ -259,7 +260,7 @@ msgstr "" msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "" +msgstr "此外也可以透過擷取Web瀏覽器的橋接如下列\n網址：https://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid ""

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 20 Aug '13

20 Aug '13

commit c0f8086463f5395dddce39cf1757fca8771a246c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 20 05:16:04 2013 +0000 Update translations for torcheck_completed --- zh_TW/torcheck.po | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po new file mode 100644 index 0000000..e1f92be --- /dev/null +++ b/zh_TW/torcheck.po @@ -0,0 +1,57 @@ +# TorCheck gettext template +# Copyright (C) 2008-2012 The Tor Project, Inc +# +# Translators: +# chinrur <chinrur(a)gmail.com>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2013-08-20 05:10+0000\n" +"Last-Translator: chinrur <chinrur(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "恭喜，您的瀏覽器組態已為使用Tor狀態。" + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "請參考<a href=\"https://www.torproject.org/\">Tor網站</a>以進一步了解如何安全使用Tor，您現在是以匿名方式瀏覽網際網路。" + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Tor瀏覽器套件\"Tor Browser Bundle\"現在已有安全更新可供使用。" + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">按一下這裡以進入下載頁面</a>" + +msgid "Sorry. You are not using Tor." +msgstr "抱歉，您尚未使用Tor" + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "若您正試圖使用Tor客戶端，請參閱<a href=\"https://www.torproject.org/\">Tor網站</a>以及具體說明<a href=\"https://www.torproject.org/docs/faq#DoesntWork\">說明關於Tor客戶端組態</a>。" + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "對不起，您的查詢失敗或收到未預期的回應。" + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "若您的來源IP為<a href=\"https://www.torproject.org/\">Tor</a>節點，臨時服務中斷阻礙了我們測定。" + +msgid "Your IP address appears to be: " +msgstr "您的IP地址顯示為："

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 20 Aug '13

20 Aug '13

commit cd6d455a79bb9161200a4ba40a493ee9b20a15a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 20 05:16:00 2013 +0000 Update translations for torcheck --- zh_TW/torcheck.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index 0a2e1c6..e1f92be 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# chinrur <chinrur(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2010-11-30 04:59+0000\n" -"Last-Translator: Appelbaum <jacob(a)appelbaum.net>\n" +"PO-Revision-Date: 2013-08-20 05:10+0000\n" +"Last-Translator: chinrur <chinrur(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,39 +19,39 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "" +msgstr "恭喜，您的瀏覽器組態已為使用Tor狀態。" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "請參考<a href=\"https://www.torproject.org/\">Tor網站</a>以進一步了解如何安全使用Tor，您現在是以匿名方式瀏覽網際網路。" msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Tor瀏覽器套件\"Tor Browser Bundle\"現在已有安全更新可供使用。" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">按一下這裡以進入下載頁面</a>" msgid "Sorry. You are not using Tor." -msgstr "" +msgstr "抱歉，您尚未使用Tor" msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "若您正試圖使用Tor客戶端，請參閱<a href=\"https://www.torproject.org/\">Tor網站</a>以及具體說明<a href=\"https://www.torproject.org/docs/faq#DoesntWork\">說明關於Tor客戶端組態</a>。" msgid "Sorry, your query failed or an unexpected response was received." -msgstr "" +msgstr "對不起，您的查詢失敗或收到未預期的回應。" msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "若您的來源IP為<a href=\"https://www.torproject.org/\">Tor</a>節點，臨時服務中斷阻礙了我們測定。" msgid "Your IP address appears to be: " -msgstr "" +msgstr "您的IP地址顯示為："

1 0

r26311: {website} publish our 990 and PC filings. (in website/trunk/about: en findoc)
by Andrew Lewman 20 Aug '13

20 Aug '13

Author: phobos Date: 2013-08-20 01:51:57 +0000 (Tue, 20 Aug 2013) New Revision: 26311 Added: website/trunk/about/findoc/2012-TorProject-Form990.pdf website/trunk/about/findoc/2012-TorProject-Form990.pdf.asc website/trunk/about/findoc/2012-TorProject-FormPC.pdf website/trunk/about/findoc/2012-TorProject-FormPC.pdf.asc Modified: website/trunk/about/en/financials.wml Log: publish our 990 and PC filings. Modified: website/trunk/about/en/financials.wml =================================================================== --- website/trunk/about/en/financials.wml 2013-08-16 06:03:34 UTC (rev 26310) +++ website/trunk/about/en/financials.wml 2013-08-20 01:51:57 UTC (rev 26311) @@ -16,6 +16,8 @@ <dt>Fiscal Year 2012</dt> <dd><a href="findoc/2012-TorProject-Annual-Report.pdf">2012 Annual Report</a></dd> + <dd><a href="findoc/2012-TorProject-Form990.pdf">2012 IRS Form 990</a></dd> + <dd><a href="findoc/2012-TorProject-FormPC.pdf">2012 State of MA Form PC</a></dd> <dt>Fiscal Year 2011</dt> <dd><a href="findoc/2011-TorProject-Amended-Final-Report.pdf">2011 Financial Statements and Audit Report</a></dd> Added: website/trunk/about/findoc/2012-TorProject-Form990.pdf =================================================================== (Binary files differ) Property changes on: website/trunk/about/findoc/2012-TorProject-Form990.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/about/findoc/2012-TorProject-Form990.pdf.asc =================================================================== --- website/trunk/about/findoc/2012-TorProject-Form990.pdf.asc (rev 0) +++ website/trunk/about/findoc/2012-TorProject-Form990.pdf.asc 2013-08-20 01:51:57 UTC (rev 26311) @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJSEsnDAAoJEGJ97ihrTWR1UosP+gO7Nl8mE4OSsXfiqJSmTSp3 +0vk9Bh62BOYiW8zoCmFVoxklVwnEyD1ptQaZWqrjYOaT20ubk6Rl7ahF1pUmgdjR +6tKkuojBa3679nzI1e8SQxbUW5MN3b/DXI2LBcs6YLLeTMqCpXHJFgGqB9DQ1wc/ +nHqngxdhUUB8AeJJvAt56uEhxHg9bQVV3nmbeGONU+g/ePhRh0VZ30v2eqSTGtel +fCekYaN0ODH4nS8Rv4PxbfFDXObJEMzgd0GGmVNHiwMrZ4HVmHv8HlsueR5U3VV8 +rlqNKe0tC4zu8KinW+kS+Pzfu/KHMcwjrW6+6M2hWuEf+QQjQUT6SjGsJrTkOljE +aB6pZb9146L9crXlnMvYZDE0AH8jvfX6ucA7Z7TuMyRkhtPFfrUuDlATdBbBE4bU +R1IJ8A4ueac/tNuUUzOts7G2WQZ5+wOX2YNfqC7iFKYR6IBl6Pb9SX+51cDqenQX +r00iGQNiRV6RkDjxDBnJruFwADZnpig6oZxWY3H4rMRLDI6lwrz+TH01tzQXqpMt +FtLkgIajYo1mZ/08zsNqBlC6Ul7as28ZM/iqaxTqyKSCXpjth2P0J2l1VxxFwh2r +dYa1ZUUqsC/dPXVrbkOxNdEd2q1R1o3NegGSLHae/883wq+mi9Oeyw/qos9N6f54 +bNkdCENsPmCl1YxBMOeM +=GTBW +-----END PGP SIGNATURE----- Property changes on: website/trunk/about/findoc/2012-TorProject-Form990.pdf.asc ___________________________________________________________________ Added: svn:mime-type + text/plain Added: website/trunk/about/findoc/2012-TorProject-FormPC.pdf =================================================================== (Binary files differ) Property changes on: website/trunk/about/findoc/2012-TorProject-FormPC.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/about/findoc/2012-TorProject-FormPC.pdf.asc =================================================================== --- website/trunk/about/findoc/2012-TorProject-FormPC.pdf.asc (rev 0) +++ website/trunk/about/findoc/2012-TorProject-FormPC.pdf.asc 2013-08-20 01:51:57 UTC (rev 26311) @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJSEsnNAAoJEGJ97ihrTWR1Q9UP/0RcgJMxyKYdBVm6b+ijIAho +lVymd38sP6Eg7rmTpTjDjqzOA7OwbKjbM/ajJ+Zga9zOR9iTe7+PVWkvfdmbwhbq +89c3o3LBneNZdZnKBniYuj2i6v8Mhq0eiPYyrVoRo5nT9rZdRxJnCBtdQZKLalGA +afTIlsnoSYmnjSKJAzRHBAbWRuMMPWGB5aB5TQD3gJUWwfeg4m53V5rMiqE72360 +rWND9FuA2yuplu/qZ8E9Q6CjxFsh5OKPcdrr4BwMnFpz+NYBXpiy/LH8Vk16Jxjo ++wGBrg4roFJ5eHW8+XQSQoKWMVylGoe6XP+M37nE3UvImQDn2bQClJNAwGKNh25E +o9/bOU+J4snGRHaUgw1jhNL24JAB6d2XEmwE9l3bmZYmEjTvwvhuBP7DBSWVnBhp +fLsVxpHCHodxJ13aTU0vjJB7vjOplFCjSDb7QvtbzfrQa2UAIdrQXb1rnaUEF44o +H4JvU/P9K56UgyUgsJuIRSjiQhr1r0byG1Mf7hxP0qE85VoQADQDIG5LJu/Nv9PL +KJg7bRMFscHTWqut4jNw9d4tPy1qALbxiIfLkadBkCrMui5W2PweDXewK5fb7H7Q +f1da5SpSLaMdlzUnJLbX82fay6ZgfmtrftBubL7Wtw6mzw64jwj58uHSC6Lw9UCu +0qUMlIKF5bFvEwMi13fo +=O/gI +-----END PGP SIGNATURE----- Property changes on: website/trunk/about/findoc/2012-TorProject-FormPC.pdf.asc ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

[stem/master] Validating that votes only have a single authority entry
by atagar＠torproject.org 20 Aug '13

20 Aug '13

commit 4863c2281c26660a249378e65354a00e406fffbc Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 19 18:15:47 2013 -0700 Validating that votes only have a single authority entry Vote documents should only contain an entry from the authority that issued it. I was checking this in my consensus-checker monitor but Karsten made the good point that the check belongs in stem. --- stem/descriptor/networkstatus.py | 3 +++ test/mocking.py | 5 +++++ test/unit/descriptor/networkstatus/document_v3.py | 21 ++++++++++++++++----- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 6258fdc..9142e63 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -518,6 +518,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): extra_args = (self._header.is_vote,), )) + if validate and self._header.is_vote and len(self.directory_authorities) != 1: + raise ValueError("Votes should only have an authority entry for the one that issued it, got %i: %s" % (len(self.directory_authorities), self.directory_authorities)) + if not self._header.is_microdescriptor: router_type = stem.descriptor.router_status_entry.RouterStatusEntryV3 else: diff --git a/test/mocking.py b/test/mocking.py index aebbaac..0d0c2e6 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -589,6 +589,11 @@ def get_network_status_document_v3(attr = None, exclude = (), authorities = None "consensus-methods": "1 9", "published": "2012-09-02 22:00:00", } + + # votes need an authority to be valid + + if authorities is None: + authorities = [get_directory_authority(is_vote = True)] else: extra_defaults = { "consensus-method": "9", diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index ece95de..71ef8b6 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -105,7 +105,6 @@ class TestNetworkStatusDocument(unittest.TestCase): self.assertEqual(expected_known_flags, document.known_flags) self.assertEqual({}, document.flag_thresholds) self.assertEqual(DEFAULT_PARAMS, document.params) - self.assertEqual((), document.directory_authorities) self.assertEqual({}, document.bandwidth_weights) self.assertEqual([DOC_SIG], document.signatures) self.assertEqual([], document.get_unrecognized_lines()) @@ -218,10 +217,12 @@ class TestNetworkStatusDocument(unittest.TestCase): lines = get_network_status_document_v3(attr, content = True).split(b"\n") for index in xrange(len(lines) - 1): - # once we reach the crypto blob we're done since swapping those won't - # be detected + # once we reach the authority entry or later we're done since swapping + # those won't be detected - if lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): + if is_consensus and lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): + break + elif not is_consensus and lines[index].startswith('dir-source'): break # swaps this line with the one after it @@ -243,6 +244,9 @@ class TestNetworkStatusDocument(unittest.TestCase): lines = get_network_status_document_v3(attr, content = True).split(b"\n") for index, line in enumerate(lines): + if not is_consensus and lines[index].startswith('dir-source'): + break + # Stop when we hit the 'directory-signature' for a couple reasons... # - that is the one field that can validly appear multiple times # - after it is a crypto blob, which won't trigger this kind of @@ -856,7 +860,14 @@ class TestNetworkStatusDocument(unittest.TestCase): content = get_network_status_document_v3({"vote-status": vote_status}, authorities = (authority1, authority2), content = True) if is_document_vote == is_authorities_vote: - document = NetworkStatusDocumentV3(content) + if is_document_vote: + # votes can only have a single authority + + self.assertRaises(ValueError, NetworkStatusDocumentV3, content) + document = NetworkStatusDocumentV3(content, validate = False) + else: + document = NetworkStatusDocumentV3(content) + self.assertEquals((authority1, authority2), document.directory_authorities) else: # authority votes in a consensus or consensus authorities in a vote

1 0

[tor-browser-bundle/master] Fix NoScript and mingw-w64 input urls and hashes.
by mikeperry＠torproject.org 19 Aug '13

19 Aug '13

commit de8b076a7694b3154dcf278864d89a4bfbef8159 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 19 15:58:07 2013 -0700 Fix NoScript and mingw-w64 input urls and hashes. --- gitian/fetch-inputs.sh | 7 +++---- gitian/versions | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 6b85791..2e25a5e 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -139,14 +139,13 @@ done cd .. # Noscript and PDF.JS are magikal and special: -wget -N https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi -#wget -N https://addons.mozilla.org/firefox/downloads/latest/352704/addon-352704-lat… -wget -N https://addons.mozilla.org/firefox/downloads/file/201180/pdf_viewer-0.8.1-s… +wget -N https://addons.mozilla.org/firefox/downloads/file/224880/${NOSCRIPT_PACKAGE} +wget -N https://addons.mozilla.org/firefox/downloads/file/201180/${PDFJS_PACKAGE} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; then - svn co -r $MINGW_REV https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk mingw-w64-svn || exit 1 + svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1 # XXX: Path ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn fi diff --git a/gitian/versions b/gitian/versions index 64f2891..83564d8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -20,8 +20,7 @@ FIREFOX_LANG_VER=17.0.8esr ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=addon-722-latest.xpi -#PDFJS_PACKAGE=addon-352704-latest.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.7.1-sm+fn+fx.xpk PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -32,7 +31,7 @@ MSVCR100_PACKAGE=msvcr100.dll OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d5f47fbd4c4cf438a94ee866f04971abeb67f1793def8a56d2ead71be674f4bc +NOSCRIPT_HASH=e9ee8f45b0b025236c5e04e270edeb05de6ed8a73822c74d7122a2ade3d25f33 PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[tor-browser-bundle/master] stop make distclean from killing required dirs
by mikeperry＠torproject.org 19 Aug '13

19 Aug '13

commit dfd1180f79c8bb9de0202d835efa93bb09c4055d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Aug 19 03:12:50 2013 +0200 stop make distclean from killing required dirs gitian-builder contains a path target-bin, which make distclean was blowing away via rm -rf target-*. Make the rule less broad --- gitian/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/Makefile b/gitian/Makefile index a866da6..6aa1647 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -19,7 +19,7 @@ clean: vmclean: rm -rf ../../gitian-builder/*.qcow2 rm -rf ../../gitian-builder/base-* - rm -rf ../../gitian-builder/target-* + rm -rf ../../gitian-builder/target-{lucid,precise}* distclean: vmclean rm -rf ../../gitian-builder/inputs/*

1 0

[tor-browser-bundle/master] Check out latest gitian-builder branch during fetch-inputs
by mikeperry＠torproject.org 19 Aug '13

19 Aug '13

commit b643a8406d76858710cab81193bf8c7b1b598754 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Aug 19 02:54:34 2013 +0200 Check out latest gitian-builder branch during fetch-inputs When using git checkout <name>, and <name> does not correspond to a locally existing branch but does correspond to a remotely existing branch, a local branch of that name is created, set to the contents of the remote branch, and then checked out. If a local branch with that name already exists (which happens when you run git checkout <name> for a second time) then only the local branch is checked out, without any regard for the remote content changes. Make sure we actually update to the remote content. --- gitian/fetch-inputs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 63e7f16..6b85791 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -193,8 +193,9 @@ ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin -git fetch --tags origin +git fetch --tags origin # XXX - why do we fetch tags specifically? git checkout tor-browser-builder-2 +git merge origin/tor-browser-builder-2 cd inputs while read dir url tag; do

1 0