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

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit 1f4cf5d084312235a6b2cf4bf4410581cb0124a9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:45:37 2014 +0000 Update translations for tor-launcher-properties_completed --- zh_TW/torlauncher.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index 5f4bdba..d6fe9e6 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor 未預期的關閉。 torlauncher.please_restart_app=請重新啟動應用程式。 torlauncher.tor_controlconn_failed=無法連結至 Tor 控制連接埠。 torlauncher.tor_failed_to_start=Tor 啟動失敗 +torlauncher.tor_control_failed=無法控制 Tor. torlauncher.tor_bootstrap_failed=建立 Tor 網絡連結失敗。 torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=請確定 Tor 正在執行。 torlauncher.error_proxy_addr_missing=想要設定 Tor 透過 Proxy 存取網路，您必須指定一個 IP 位置或主機名稱、以及連接埠號碼。 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。 torlauncher.error_bridges_missing=您必須指定一或多個橋接。 +torlauncher.error_default_bridges_type_missing=你必須選擇一種傳送方式才能提供網橋 +torlauncher.error_bridge_bad_default_type=沒有可用的連線方式為 %S 的網橋。請調整您的設定。 + +torlauncher.recommended_bridge=(建議) torlauncher.connect=連接 torlauncher.quit=離開

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit 1f689ac16e55573353213fa5d76b00681dd5be2c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:45:35 2014 +0000 Update translations for tor-launcher-properties --- zh_TW/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index 812bc79..d6fe9e6 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -25,9 +25,9 @@ torlauncher.error_proxy_addr_missing=想要設定 Tor 透過 Proxy 存取網路 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。 torlauncher.error_bridges_missing=您必須指定一或多個橋接。 torlauncher.error_default_bridges_type_missing=你必須選擇一種傳送方式才能提供網橋 -# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_bridge_bad_default_type=沒有可用的連線方式為 %S 的網橋。請調整您的設定。 -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(建議) torlauncher.connect=連接 torlauncher.quit=離開

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit 42a70eec535a8938ba65f41b723f912869b5b67d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:45:27 2014 +0000 Update translations for tails-greeter_completed --- da/da.po | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 83 insertions(+), 17 deletions(-) diff --git a/da/da.po b/da/da.po index 1c66f4d..1ee2d87 100644 --- a/da/da.po +++ b/da/da.po @@ -3,15 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# autofunk78 <villum(a)autofunk.dk>, 2014 # mort3n <nalholm(a)yahoo.dk>, 2013 +# cookiefox <neoleo(a)gmail.com>, 2014 # torebjornson <tore.bjornson(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: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-07-19 19:10+0000\n" -"Last-Translator: mort3n <nalholm(a)yahoo.dk>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-06 17:16+0100\n" +"PO-Revision-Date: 2014-03-13 06:40+0000\n" +"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,26 +38,30 @@ msgid "Use persistence?" msgstr "Brug vedholdenhed?" #: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>" + +#: ../glade/persistencewindow.glade.h:6 msgid "Yes" msgstr "Ja" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "No" msgstr "Nej" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" msgstr "Kodeord:" -#: ../glade/persistencewindow.glade.h:8 +#: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" msgstr "Skrivebeskyttet?" -#: ../glade/persistencewindow.glade.h:9 +#: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." msgstr "Forkert kodeord. Forsøg venligst igen." -#: ../glade/persistencewindow.glade.h:10 +#: ../glade/persistencewindow.glade.h:11 msgid "More options?" msgstr "Flere muligheder?" @@ -65,36 +71,96 @@ msgstr "Administrations kodeord" #: ../glade/optionswindow.glade.h:4 msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." msgstr "Indtast et administrations kodeord, hvis De har behov for at udføre administrative opgaver.\nAlternativt vil det blive deaktiveret for at optimere sikkerheden." -#: ../glade/optionswindow.glade.h:6 +#: ../glade/optionswindow.glade.h:7 msgid "Password:" msgstr "Kodeord:" -#: ../glade/optionswindow.glade.h:7 +#: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" msgstr "Bekræft kodeord:" -#: ../glade/optionswindow.glade.h:8 +#: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" msgstr "Kodeord passer ikke" -#: ../glade/optionswindow.glade.h:9 -msgid "Windows Camouflage" -msgstr "Windows Camouflage" - #: ../glade/optionswindow.glade.h:10 +msgid "Windows camouflage" +msgstr "Windows camouflage" + +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentation</a>" + +#: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." msgstr "Denne indstilling lader Tails ligne Microsoft Windows XP. Dette kan være brugbart ved offentlige lokationer for at minimere mistanke." -#: ../glade/optionswindow.glade.h:11 +#: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows XP Camouflage" msgstr "Aktivér Microsoft Windows XP Camouflage" +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "MAC address spoofing" + +#: ../glade/optionswindow.glade.h:15 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "Ved at ændre MAC addressen skjules netværksenhedens serienummer for det lokale netværk. Dette kan hjælpe med at skjule din geografiske placering." + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "Det er generelt mere sikkert at ændre MAC addresser, men det kan potentielt også virke mistænkeligt eller give forblemer med forbindelsen." + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "Ændre alle MAC adresser" + +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Netværkskonfiguration" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "Denne computers Internetforbindelse er fri for problemer. Du kan forbinde direkte til Tor netværket." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "Denne computers Internetforbindelse er censureret, filtreret eller proxiet. Du skal konfigurere bro, firewall eller proxy indstillinger." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit d826976ade2163558cd4c48145491446b3743927 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:45:25 2014 +0000 Update translations for tails-greeter --- da/da.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/da/da.po b/da/da.po index 1db54a6..1ee2d87 100644 --- a/da/da.po +++ b/da/da.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# autofunk78 <villum(a)autofunk.dk>, 2014 # mort3n <nalholm(a)yahoo.dk>, 2013 # cookiefox <neoleo(a)gmail.com>, 2014 # torebjornson <tore.bjornson(a)gmail.com>, 2013 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-13 06:40+0000\n" +"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "Brug vedholdenhed?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -72,7 +73,7 @@ msgstr "Administrations kodeord" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -94,13 +95,13 @@ msgstr "Kodeord passer ikke" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Windows camouflage" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentation</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -114,13 +115,13 @@ msgstr "Aktivér Microsoft Windows XP Camouflage" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" -msgstr "" +msgstr "MAC address spoofing" #: ../glade/optionswindow.glade.h:15 msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -140,25 +141,25 @@ msgstr "Ændre alle MAC adresser" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Netværkskonfiguration" #: ../glade/optionswindow.glade.h:20 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>" #: ../glade/optionswindow.glade.h:21 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "" +msgstr "Denne computers Internetforbindelse er fri for problemer. Du kan forbinde direkte til Tor netværket." #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "Denne computers Internetforbindelse er censureret, filtreret eller proxiet. Du skal konfigurere bro, firewall eller proxy indstillinger." #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit 54efa61a25fb93a4483a06acbb98568274b63fe3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:45:19 2014 +0000 Update translations for liveusb-creator --- zh_TW/zh_TW.po | 81 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 483dae7..d71fff2 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -8,13 +8,14 @@ # muraji <muraji(a)tormail.org>, 2013 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 +# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-13 06:45+0000\n" +"Last-Translator: xatier 同學@提不起勁 <xatierlike(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" @@ -45,7 +46,7 @@ msgstr "" #: ../liveusb/creator.py:1020 #, python-format msgid "%s already bootable" -msgstr "" +msgstr "%s 已經是可開機的" #: ../liveusb/launcher_ui.py:165 msgid "" @@ -85,7 +86,7 @@ msgstr "" #: ../liveusb/dialog.py:163 msgid "Alt+B" -msgstr "" +msgstr "Alt+B" #: ../liveusb/dialog.py:162 msgid "Browse" @@ -102,11 +103,11 @@ msgstr "" #: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "計算 %s 的 SHA1" #: ../liveusb/creator.py:1333 msgid "Cannot find" -msgstr "" +msgstr "找不到" #: ../liveusb/creator.py:542 #, python-format @@ -130,7 +131,7 @@ msgstr "" #: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "新增 %sMB 永久覆蓋" #: ../liveusb/gui.py:567 msgid "" @@ -157,7 +158,7 @@ msgstr "正在下載 %s..." #: ../liveusb/creator.py:1118 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "磁碟是 loopback，跳過 MBR 設定" #: ../liveusb/creator.py:813 #, python-format @@ -166,7 +167,7 @@ msgstr "" #: ../liveusb/creator.py:1198 msgid "Error probing device" -msgstr "" +msgstr "設備探測失敗" #: ../liveusb/gui.py:227 msgid "" @@ -187,15 +188,15 @@ msgstr "" #: ../liveusb/creator.py:1063 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "" +msgstr "將 %(device)s 格式化成 FAT32 格式" #: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" -msgstr "" +msgstr "ISO MD5 checksum 成功" #: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" -msgstr "" +msgstr "ISO MD5 checksum 驗證失敗" #: ../liveusb/dialog.py:165 msgid "" @@ -222,7 +223,7 @@ msgstr "安裝已完成，按“確定”以關閉該程式。" #: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 msgid "Installing bootloader..." -msgstr "" +msgstr "安裝 bootloader ..." #: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" @@ -232,7 +233,7 @@ msgstr "LiveUSB 建立失敗！" msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "" +msgstr "在執行這個程式之前確認解壓縮整個 libusb-creator zip 檔案。" #: ../liveusb/creator.py:1210 msgid "" @@ -242,7 +243,7 @@ msgstr "請確認您的 USB 磁碟已插入，並以 FAT 檔案系統進行格 #: ../liveusb/creator.py:835 #, python-format msgid "Mount %s exists after unmounting" -msgstr "" +msgstr "卸載後 %s 掛載仍存在" #: ../liveusb/gui.py:573 #, python-format @@ -251,7 +252,7 @@ msgstr "%(device)s 裝置上的剩餘空間不足。" #: ../liveusb/creator.py:802 msgid "No mount points found" -msgstr "" +msgstr "找不到掛載點" #: ../liveusb/creator.py:393 msgid "Not enough free space on device." @@ -293,16 +294,16 @@ msgstr "" #: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 #, python-format msgid "Removing %(file)s" -msgstr "" +msgstr "移除 %(file)s" #: ../liveusb/creator.py:469 msgid "Removing existing Live OS" -msgstr "" +msgstr "移除已存在的 Live OS" #: ../liveusb/creator.py:1112 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "重新設定 %s 的 MBR 主開機紀錄" #: ../liveusb/gui.py:793 msgid "Select Live ISO" @@ -310,7 +311,7 @@ msgstr "選取 Live ISO" #: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." -msgstr "" +msgstr "設定 OLPC 開機檔案..." #: ../liveusb/creator.py:716 #, python-format @@ -322,11 +323,11 @@ msgstr "" #: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "該分數類型不提供 ISO MD5 checksum 驗證方式，略過。" #: ../liveusb/creator.py:1146 msgid "Synchronizing data on disk..." -msgstr "" +msgstr "同步資料到硬碟..." #: ../liveusb/dialog.py:168 msgid "Target Device" @@ -389,17 +390,17 @@ msgstr "" #: ../liveusb/creator.py:911 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "" +msgstr "無法改變 volume 標籤: %(message)s" #: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "無法以 chmod 變更權限 %(file)s: %(message)s" #: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "無法複製 %(infile)s 到 %(outfile)s: %(message)s" #: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" @@ -411,12 +412,12 @@ msgstr "" #: ../liveusb/creator.py:1040 msgid "Unable to find partition" -msgstr "" +msgstr "無法找到分割區" #: ../liveusb/creator.py:1280 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "無法取得 Win32_LogicalDisk; win32com 查詢沒有返回任何結果" #: ../liveusb/gui.py:695 msgid "Unable to mount device" @@ -425,22 +426,22 @@ msgstr "無法移除裝置" #: ../liveusb/creator.py:790 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "無法掛載設備: %(message)s" #: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "無法從之前的 LiveOS 移除資料夾: %(message)s" #: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "無法從之前的 LiveOS 移除檔案: %(message)s" #: ../liveusb/creator.py:1115 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "無法重設 MBR。您可能沒有安裝 `syslinux` 套件" #: ../liveusb/gui.py:802 msgid "" @@ -451,20 +452,20 @@ msgstr "無法使用已選取的檔案，您可能有更好的運氣，如果您 #: ../liveusb/creator.py:697 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "無法寫入 %(device)s, 略過." #: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "未知的 ISO，跳過 checksum 驗證" #: ../liveusb/creator.py:786 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "掛載設備時發生未知的 dbus 例外: %(message)s" #: ../liveusb/creator.py:765 ../liveusb/creator.py:890 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "未知的檔案系統。您的設備可能無法被重新格式化。" #: ../liveusb/gui.py:84 #, python-format @@ -515,15 +516,15 @@ msgstr "" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" -msgstr "" +msgstr "校驗 ISO MD5 checksum" #: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "驗證 LiveCD 映像黨的 SHA1 checksum" #: ../liveusb/creator.py:360 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "驗證 LiveCD 映像黨的 SHA256 checksum" #: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 msgid "Verifying filesystem..." @@ -551,7 +552,7 @@ msgstr "警告：此工具需以系統管理員身分執行。請右鍵圖標點 #: ../liveusb/creator.py:152 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "以 %(speed)d MB/sec 的速度寫入設備" #: ../liveusb/gui.py:703 #, python-format @@ -572,7 +573,7 @@ msgstr "" msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "您正在使用舊版 syslinux-extlinux ，不支援 ext4 檔案系統" #: ../liveusb/gui.py:787 msgid "You can try again to resume your download"

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit cb2466149d6a764bac80fb9b0b603732673ebec4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:15:33 2014 +0000 Update translations for tor-launcher-properties --- zh_TW/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index 85ca59b..812bc79 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor 未預期的關閉。 torlauncher.please_restart_app=請重新啟動應用程式。 torlauncher.tor_controlconn_failed=無法連結至 Tor 控制連接埠。 torlauncher.tor_failed_to_start=Tor 啟動失敗 -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=無法控制 Tor. torlauncher.tor_bootstrap_failed=建立 Tor 網絡連結失敗。 torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 @@ -24,7 +24,7 @@ torlauncher.ensure_tor_is_running=請確定 Tor 正在執行。 torlauncher.error_proxy_addr_missing=想要設定 Tor 透過 Proxy 存取網路，您必須指定一個 IP 位置或主機名稱、以及連接埠號碼。 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。 torlauncher.error_bridges_missing=您必須指定一或多個橋接。 -# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=你必須選擇一種傳送方式才能提供網橋 # torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. # torlauncher.recommended_bridge=(recommended)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit e073dcee14240769e4462f6edccba9fcae438542 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 06:15:19 2014 +0000 Update translations for liveusb-creator --- sr/sr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sr/sr.po b/sr/sr.po index 88d9426..541f0b4 100644 --- a/sr/sr.po +++ b/sr/sr.po @@ -5,13 +5,14 @@ # Translators: # Igor Miletic <grejigl-gnomeprevod(a)yahoo.ca>, 2008 # milos123, 2013 +# Небојша Јаковљевић <nebojsa(a)nebjak.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-13 06:00+0000\n" +"Last-Translator: Небојша Јаковљевић <nebojsa(a)nebjak.net>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -169,7 +170,7 @@ msgstr "" msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "Greska: postavljanje oznake ili citanje UUID vaseg uredjaja neuspelo. Nije moguce nastaviti." +msgstr "Gresška: postavljanje oznake ili čitanje UUID vašeg uređaja neuspelo. Nije moguće nastaviti." #: ../liveusb/creator.py:376 msgid ""

1 0

[tor-browser-bundle/master] Update and add additional Tor patch backports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit f8d4e17956f34936129e47e9865fb4919324e3a6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 12 20:53:34 2014 -0700 Update and add additional Tor patch backports. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 6 +- gitian/descriptors/mac/gitian-tor.yml | 6 +- gitian/descriptors/windows/gitian-tor.yml | 6 +- gitian/patches/bug11069.patch | 164 ++++++++++++++++++----------- gitian/patches/bug11156.patch | 164 +++++++++++++++++++++++++++++ gitian/patches/bug5018.patch | 64 ++++++++--- gitian/patches/bug9229.patch | 46 ++++++++ 8 files changed, 376 insertions(+), 82 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ccf31b0..b82ccd7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,7 +17,9 @@ Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 * Update Tor to 0.2.4.21 * Backport Pending Tor Patches: * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 9229: Eliminate 60 second stall during bootstrap with some PTs * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 11156: Prevent spurious warning about missing pluggable transports * Bug 10237: Disable the media cache to prevent disk leaks for videos * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index a83d8a4..f0cb682 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,8 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" @@ -82,10 +84,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 1596c8e..8b049b0 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,8 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -98,10 +100,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9033939..3d05eaa 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,8 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" @@ -94,10 +96,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch index 563aafb..b6032e9 100644 --- a/gitian/patches/bug11069.patch +++ b/gitian/patches/bug11069.patch @@ -1,16 +1,24 @@ -From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From 67c70b2566fc9bef4527fb8a0c24ce7d8c4d0647 Mon Sep 17 00:00:00 2001 From: George Kadianakis <desnacked(a)riseup.net> -Date: Fri, 28 Feb 2014 15:19:30 +0000 -Subject: [PATCH] Throw control port warning if we failed connecting to briges. +Date: Mon, 10 Mar 2014 22:52:07 +0000 +Subject: [PATCH] Throw control port warning if we failed to connect to all our + bridges. +Conflicts: + src/or/connection.c + src/or/control.c + src/or/control.h + src/test/test_extorport.c --- - changes/bug11069 | 4 ++++ - src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- - src/or/connection.h | 2 ++ - src/or/control.c | 7 ++++--- - src/or/entrynodes.c | 21 --------------------- - src/or/entrynodes.h | 1 - - 6 files changed, 42 insertions(+), 34 deletions(-) + changes/bug11069 | 4 ++++ + src/or/connection.c | 25 +++++++++++++++++++++++++ + src/or/connection.h | 2 ++ + src/or/connection_or.c | 8 +++++--- + src/or/control.c | 13 ++++++++----- + src/or/control.h | 3 ++- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 8 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 changes/bug11069 diff --git a/changes/bug11069 b/changes/bug11069 @@ -24,57 +32,27 @@ index 0000000..5aa3085 + connect to all of our bridges. Fixes bug 11069; bugfix on + tor-0.2.1.2-alpha. diff --git a/src/or/connection.c b/src/or/connection.c -index 77565ee..12f2b01 100644 +index 4f74a1d..ba28d81 100644 --- a/src/or/connection.c +++ b/src/or/connection.c -@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) - before = buf_datalen(conn->inbuf); - if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { - /* There's a read error; kill the connection.*/ -- if (conn->type == CONN_TYPE_OR) { -- connection_or_notify_error(TO_OR_CONN(conn), -- socket_error != 0 ? -- errno_to_orconn_end_reason(socket_error) : -- END_OR_CONN_REASON_CONNRESET, -- socket_error != 0 ? -- tor_socket_strerror(socket_error) : -- "(unknown, errno was 0)"); -- } - if (CONN_IS_EDGE(conn)) { - edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - connection_edge_end_errno(edge_conn); -@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) - * connection_or_notify_error() above. - */ - connection_mark_for_close_internal(conn); -+ -+ /* If it's an OR connection, notify the other components of its -+ failure. */ -+ if (conn->type == CONN_TYPE_OR) { -+ connection_or_notify_error(TO_OR_CONN(conn), -+ socket_error != 0 ? -+ errno_to_orconn_end_reason(socket_error) : -+ END_OR_CONN_REASON_CONNRESET, -+ socket_error != 0 ? -+ tor_socket_strerror(socket_error) : -+ "(unknown, errno was 0)"); -+ } -+ - return -1; - } - n_read += buf_datalen(conn->inbuf) - before; -@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, +@@ -3846,6 +3846,31 @@ connection_get_by_type_purpose(int type, int purpose) return NULL; } -+/** Return 1 if there are any active OR connections. We use this to -+ * guess if we should tell the controller that we didn't manage to -+ * connect to any of our bridges. */ ++/** Return 1 if there are any active OR connections apart from ++ * this_conn. ++ * ++ * We use this to guess if we should tell the controller that we ++ * didn't manage to connect to any of our bridges. */ +int -+any_active_or_conns(void) ++any_other_active_or_conns(const or_connection_t *this_conn) +{ + smartlist_t *conns = get_connection_array(); + SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn == TO_CONN(this_conn)) { /* don't consider this conn */ ++ continue; ++ } ++ + if (conn->type == CONN_TYPE_OR && + !conn->marked_for_close) { + log_debug(LD_DIR, "%s: Found an OR connection: %s", @@ -90,23 +68,71 @@ index 77565ee..12f2b01 100644 int connection_is_listener(connection_t *conn) diff --git a/src/or/connection.h b/src/or/connection.h -index fa07650..47c70c5 100644 +index c78fe6e..9bd5f88 100644 --- a/src/or/connection.h +++ b/src/or/connection.h -@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, +@@ -180,6 +180,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, dir_connection_t *connection_dir_get_by_purpose_and_resource( int state, const char *resource); -+int any_active_or_conns(void); ++int any_other_active_or_conns(const or_connection_t *this_conn); + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) int connection_is_listener(connection_t *conn); int connection_state_is_open(connection_t *conn); +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 8e7cd9e..8684f18 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -645,7 +645,8 @@ connection_or_about_to_close(or_connection_t *or_conn) + reason); + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem( +- orconn_end_reason_to_control_string(reason), reason); ++ orconn_end_reason_to_control_string(reason), ++ reason, or_conn); + } + } + } else if (conn->hold_open_until_flushed) { +@@ -1008,7 +1009,7 @@ connection_or_connect_failed(or_connection_t *conn, + { + control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, reason); + if (!authdir_mode_tests_reachability(get_options())) +- control_event_bootstrap_problem(msg, reason); ++ control_event_bootstrap_problem(msg, reason, conn); + } + + /** conn got an error in connection_handle_read_impl() or +@@ -1638,7 +1639,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem( + "Unexpected identity in router certificate", +- END_OR_CONN_REASON_OR_IDENTITY); ++ END_OR_CONN_REASON_OR_IDENTITY, ++ conn); + return -1; + } + if (authdir_mode_tests_reachability(options)) { diff --git a/src/or/control.c b/src/or/control.c -index 05ff9a6..198fb18 100644 +index a88de12..cd2c55c 100644 --- a/src/or/control.c +++ b/src/or/control.c -@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) +@@ -4696,10 +4696,12 @@ control_event_bootstrap(bootstrap_status_t status, int progress) + + /** Called when Tor has failed to make bootstrapping progress in a way + * that indicates a problem. warn gives a hint as to why, and +- * reason provides an "or_conn_end_reason" tag. ++ * reason provides an "or_conn_end_reason" tag. or_conn ++ * is the connection that caused this problem. + */ + void +-control_event_bootstrap_problem(const char *warn, int reason) ++control_event_bootstrap_problem(const char *warn, int reason, ++ const or_connection_t *or_conn) + { + int status = bootstrap_percent; + const char *tag, *summary; +@@ -4721,9 +4723,10 @@ control_event_bootstrap_problem(const char *warn, int reason) if (reason == END_OR_CONN_REASON_NO_ROUTE) recommendation = "warn"; @@ -116,15 +142,29 @@ index 05ff9a6..198fb18 100644 + /* If we are using bridges and all our OR connections are now + closed, it means that we totally failed to connect to our + bridges. Throw a warning. */ -+ if (get_options()->UseBridges && !any_active_or_conns()) ++ if (get_options()->UseBridges && !any_other_active_or_conns(or_conn)) recommendation = "warn"; if (we_are_hibernating()) +diff --git a/src/or/control.h b/src/or/control.h +index 61062da..1d90a90 100644 +--- a/src/or/control.h ++++ b/src/or/control.h +@@ -85,7 +85,8 @@ void enable_control_logging(void); + void monitor_owning_controller_process(const char *process_spec); + + void control_event_bootstrap(bootstrap_status_t status, int progress); +-void control_event_bootstrap_problem(const char *warn, int reason); ++void control_event_bootstrap_problem(const char *warn, int reason, ++ const or_connection_t *or_conn); + + void control_event_clients_seen(const char *controller_str); + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c -index d463303..17c5b13 100644 +index 2aa063c..b145c94 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c -@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) +@@ -2134,27 +2134,6 @@ any_bridge_descriptors_known(void) return choose_random_entry(NULL) != NULL; } @@ -153,10 +193,10 @@ index d463303..17c5b13 100644 * (bridge or member of EntryNodes) and all descriptors we know are * down. Else return 0. If act is 1, then mark the down guards diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h -index 772c666..73ac017 100644 +index 52b8dc0..f6c07d9 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h -@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); +@@ -104,7 +104,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(const or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); int any_bridge_descriptors_known(void); diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch new file mode 100644 index 0000000..ba6e266 --- /dev/null +++ b/gitian/patches/bug11156.patch @@ -0,0 +1,164 @@ +From af42f9b9125fb3f50f7383e63fb02bab1df82db9 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Wed, 12 Mar 2014 20:25:05 -0700 +Subject: [PATCH] Don't do directory fetches before all PTs have been + configured. + +--- + src/or/microdesc.c | 2 +- + src/or/networkstatus.c | 36 ++++++++++++++++++++++++++++++------ + src/or/networkstatus.h | 2 +- + src/or/nodelist.c | 8 ++++---- + src/or/routerlist.c | 6 +++--- + 5 files changed, 39 insertions(+), 15 deletions(-) + +diff --git a/src/or/microdesc.c b/src/or/microdesc.c +index 90ac0ac..1f12347 100644 +--- a/src/or/microdesc.c ++++ b/src/or/microdesc.c +@@ -725,7 +725,7 @@ update_microdesc_downloads(time_t now) + smartlist_t *missing; + digestmap_t *pending; + +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (directory_too_idle_to_fetch_descriptors(options, now)) + return; +diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c +index 1b5c6db..bcadc52 100644 +--- a/src/or/networkstatus.c ++++ b/src/or/networkstatus.c +@@ -31,6 +31,7 @@ + #include "router.h" + #include "routerlist.h" + #include "routerparse.h" ++#include "transports.h" + + /* For tracking v2 networkstatus documents. Only caches do this now. */ + +@@ -1380,14 +1381,37 @@ update_consensus_networkstatus_fetch_time(time_t now) + + /** Return 1 if there's a reason we shouldn't try any directory + * fetches yet (e.g. we demand bridges and none are yet known). +- * Else return 0. */ ++ * Else return 0. ++ ++ * If we return 1 and msg_out is provided, set msg_out ++ * to an explanation of why directory fetches are delayed. (If we ++ * return 0, we set msg_out to NULL.) ++ */ + int +-should_delay_dir_fetches(const or_options_t *options) ++should_delay_dir_fetches(const or_options_t *options, const char **msg_out) + { +- if (options->UseBridges && !any_bridge_descriptors_known()) { +- log_info(LD_DIR, "delaying dir fetches (no running bridges known)"); +- return 1; ++ if (msg_out) { ++ *msg_out = NULL; + } ++ ++ if (options->UseBridges) { ++ if (!any_bridge_descriptors_known()) { ++ if (msg_out) { ++ *msg_out = "No running bridges"; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (no running bridges known)"); ++ return 1; ++ } ++ ++ if (pt_proxies_configuration_pending()) { ++ if (msg_out) { ++ *msg_out = "Pluggable transport proxies still configuring"; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (pt proxies still configuring)"); ++ return 1; ++ } ++ } ++ + return 0; + } + +@@ -1397,7 +1421,7 @@ void + update_networkstatus_downloads(time_t now) + { + const or_options_t *options = get_options(); +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) + update_v2_networkstatus_cache_downloads(now); +diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h +index 761f8e7..f50f6f1 100644 +--- a/src/or/networkstatus.h ++++ b/src/or/networkstatus.h +@@ -69,7 +69,7 @@ int networkstatus_nickname_is_unnamed(const char *nickname); + void networkstatus_consensus_download_failed(int status_code, + const char *flavname); + void update_consensus_networkstatus_fetch_time(time_t now); +-int should_delay_dir_fetches(const or_options_t *options); ++int should_delay_dir_fetches(const or_options_t *options,const char **msg_out); + void update_networkstatus_downloads(time_t now); + void update_certificate_downloads(time_t now); + int consensus_is_waiting_for_certs(void); +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 178f084..600a1fd 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1439,6 +1439,7 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; ++ const char *delay_fetches_msg = NULL; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1451,10 +1452,9 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options())) { +- log_notice(LD_DIR, "no known bridge descriptors running yet; stalling"); +- strlcpy(dir_info_status, "No live bridge descriptors.", +- sizeof(dir_info_status)); ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg); ++ strlcpy(dir_info_status, "%s", sizeof(dir_info_status)); + res = 0; + goto done; + } +diff --git a/src/or/routerlist.c b/src/or/routerlist.c +index cb39729..d78c7bb 100644 +--- a/src/or/routerlist.c ++++ b/src/or/routerlist.c +@@ -684,7 +684,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) + char id_digest_str[2*DIGEST_LEN+1]; + char sk_digest_str[2*DIGEST_LEN+1]; + +- if (should_delay_dir_fetches(get_options())) ++ if (should_delay_dir_fetches(get_options(), NULL)) + return; + + pending_cert = fp_pair_map_new(); +@@ -4901,7 +4901,7 @@ void + update_router_descriptor_downloads(time_t now) + { + const or_options_t *options = get_options(); +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (!we_fetch_router_descriptors(options)) + return; +@@ -4925,7 +4925,7 @@ update_extrainfo_downloads(time_t now) + int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0; + if (! options->DownloadExtraInfo) + return; +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (!router_have_minimum_dir_info()) + return; +-- +1.8.1.2 + diff --git a/gitian/patches/bug5018.patch b/gitian/patches/bug5018.patch index 4784027..b0ac8e6 100644 --- a/gitian/patches/bug5018.patch +++ b/gitian/patches/bug5018.patch @@ -1,14 +1,14 @@ -From e967595b931c92650250cc385ef7f6aeabd887f5 Mon Sep 17 00:00:00 2001 +From 3394daa34842a397561e65002a33c13355df651d Mon Sep 17 00:00:00 2001 From: George Kadianakis <desnacked(a)riseup.net> Date: Thu, 28 Feb 2013 18:58:36 +0200 -Subject: [PATCH 1/3] Only launch transport proxies that provide useful +Subject: [PATCH 1/4] Only launch transport proxies that provide useful transports. --- - changes/bug5018 | 3 +++ - src/or/config.c | 20 ++++++++++++++++---- - src/or/entrynodes.c | 23 +++++++++++++++++++++++ - src/or/entrynodes.h | 1 + + changes/bug5018 | 3 +++ + src/or/config.c | 20 ++++++++++++++++---- + src/or/entrynodes.c | 23 +++++++++++++++++++++++ + src/or/entrynodes.h | 1 + 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 changes/bug5018 @@ -22,7 +22,7 @@ index 0000000..c5c12ef + - Don't launch pluggable transport proxies that contribute + transports we don't need. Resolves ticket 5018. diff --git a/src/or/config.c b/src/or/config.c -index 3984755..5f905d5 100644 +index ef02946..47510c5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4242,7 +4242,8 @@ parse_client_transport_line(const char *line, int validate_only) @@ -118,17 +118,17 @@ index 52b8dc0..b02cd48 100644 double pathbias_get_close_success_count(entry_guard_t *guard); -- -1.7.9.5 +1.8.1.2 -From d222f04e3a4093efc7be19f43def04d9c0704653 Mon Sep 17 00:00:00 2001 +From 54f75531a9613ee7b964be93b0051bc75322e7e3 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Sat, 26 Oct 2013 14:34:48 -0700 -Subject: [PATCH 2/3] Simplify transport_is_needed. +Subject: [PATCH 2/4] Simplify transport_is_needed. By Roger at https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- - src/or/entrynodes.c | 14 ++++---------- + src/or/entrynodes.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c @@ -163,21 +163,21 @@ index 4062cee..98a01c5 100644 /** Remember a new bridge at addr:port. If digest -- -1.7.9.5 +1.8.1.2 -From c1e396e66773813e051e8c96df86b585031a833b Mon Sep 17 00:00:00 2001 +From 936ff64974b00a898fa0e77e3fd6f9b2df57f448 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Sat, 26 Oct 2013 14:37:50 -0700 -Subject: [PATCH 3/3] Document that unneeded transports are ignored. +Subject: [PATCH 3/4] Document that unneeded transports are ignored. Suggested by Roger in https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- - src/or/config.c | 3 ++- + src/or/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c -index 5f905d5..3ae0216 100644 +index 47510c5..435d981 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4220,7 +4220,8 @@ parse_bridge_line(const char *line, int validate_only) @@ -191,5 +191,35 @@ index 5f905d5..3ae0216 100644 * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */ -- -1.7.9.5 +1.8.1.2 + +From a4cf8514af1d2dbfd15857af83076577b7dcc4ee Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Mon, 10 Mar 2014 22:05:31 +0000 +Subject: [PATCH 4/4] Tone down the log message for when we don't need a PT + proxy. + +Conflicts: + changes/bug5018 +--- + src/or/config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/or/config.c b/src/or/config.c +index 435d981..914c3de 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -4295,8 +4295,8 @@ parse_client_transport_line(const char *line, int validate_only) + + if (is_managed) { /* managed */ + if (!validate_only && is_useless_proxy) { +- log_warn(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " +- "any needed transports and will not be launched.", line); ++ log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " ++ "any needed transports and will not be launched.", line); + } + + /* If we are not just validating, use the rest of the line as the +-- +1.8.1.2 diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch new file mode 100644 index 0000000..6b1115c --- /dev/null +++ b/gitian/patches/bug9229.patch @@ -0,0 +1,46 @@ +From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 10 Mar 2014 15:01:27 -0400 +Subject: [PATCH] Update ns downloads when we receive a bridge descriptor + +This prevents long stalls when we're starting with a state file but +with no bridge descriptors. Fixes bug 9229. I believe this bug has +been present since 0.2.0.3-alpha. +--- + changes/bug9229 | 5 +++++ + src/or/entrynodes.c | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 changes/bug9229 + +diff --git a/changes/bug9229 b/changes/bug9229 +new file mode 100644 +index 0000000..ad7fd22 +--- /dev/null ++++ b/changes/bug9229 +@@ -0,0 +1,5 @@ ++ o Minor bugfixes: ++ - Avoid 60-second delays in the bootstrapping process when Tor ++ is launching for a second time while using bridges. Fixes bug 9229; ++ bugfix on 0.2.0.3-alpha. ++ +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index 2aa063c..59770fa 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) + * our entry node list */ + entry_guard_register_connect_status(ri->cache_info.identity_digest, + 1, 0, now); +- if (first) ++ if (first) { ++ /* XXXX apparently, this is never called. See bug #9229. */ + routerlist_retry_directory_downloads(now); ++ } ++ ++ update_networkstatus_downloads(now); + } + } + } +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Install argparse in windows pluggable-transports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit e68a2db0e6753f3d1d6839c17b88ba987c1c8f14 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 2 04:25:52 2014 +0000 Install argparse in windows pluggable-transports. coderman on IRC noticed that the building of obfsproxy in the windows pluggable transports descriptor was downloading argparse: Processing dependencies for obfsproxy==unknown Searching for argparse Reading https://pypi.python.org/simple/argparse/ Application tried to create a window, but no driver could be loaded. Make sure that your X server is running and that $DISPLAY is set correctly. err:systray:initialize_systray Could not create tray window fixme:toolhelp:CreateToolhelp32Snapshot Unimplemented: heap list snapshot fixme:toolhelp:Heap32ListFirst : stub Best match: argparse 1.2.1 Downloading http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz#md5=2fbef8cb61e5… Processing argparse-1.2.1.tar.gz argparse was already being installed in the linux and mac descriptors. It was not needed in the windows descriptor, because the windows build uses Python 2.7, and Python 2.7 has argparse in the standard library; and the "py2exe" target was able to find the standard module. However commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 changed obfsproxy to additionally call the "install" target (so that fteproxy could use obfsproxy), and apparently "install" can't find argparse. (Maybe because it's a .py file instead of a directory or an egg?) --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 48efba5..9b0e8ec 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -31,6 +31,7 @@ files: - "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" +- "argparse.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -156,6 +157,12 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + tar xzf argparse.tar.gz + cd argparse-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 13 Mar '14

13 Mar '14

commit ea2b633d65de492f74139e2e6da2fc2751136c82 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 13 03:45:40 2014 +0000 Update translations for tor-launcher-network-settings_completed --- km/network-settings.dtd | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/km/network-settings.dtd b/km/network-settings.dtd index fede001..a435e66 100644 --- a/km/network-settings.dtd +++ b/km/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "ពីមុន Tor Browser Bundle ព្យាយាមភ្ជាប់ទៅបណ្ដាញ Tor អ្នកត្រូវផ្ដល់ព័ត៌មានអំពីការភ្ជាប់អ៊ីនធឺណិតរបស់កុំព្យូទ័រនេះ។"> +<!ENTITY torsettings.prompt "មុនពេលអ្នកភ្ជាប់ទៅបណ្ដាញ Tor អ្នកត្រូវផ្ដល់ព័ត៌មានអំពីការភ្ជាប់អ៊ីនធឺណិតកុំព្យូទ័រនេះ។"> <!ENTITY torSettings.yes "បាទ/ចាស"> <!ENTITY torSettings.no "ទេ"> @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "បញ្ជីបញ្ជីច្រកដែលបំបែកដោយសញ្ញាក្បៀសដែលត្រូវបានអនុញ្ញាតដោយជញ្ជាំងភ្លើង។"> <!ENTITY torSettings.bridgeQuestion "តើក្រុមហ៊ុនផ្ដល់អ៊ីនធឺណិតរបស់អ្នក (ISP) ទប់ស្កាត់ ឬបើមិនដូច្នេះទេការភ្ជាប់ឧបករណ៍ចាប់សញ្ញាទៅបណ្ដាញ Tor ?"> <!ENTITY torSettings.bridgeHelp "បើអ្នកប្រាកដពីវិធីឆ្លើយសំណួរនេះ ជ្រើសទេ។ &#160; បើអ្នកជ្រើសបាទ/ចាស អ្នកនឹងត្រូវបានស្នើឲ្យកំណត់រចនាសម្ព័ន្ធប៊្រីត Tor ដែលជាការបញ្ជូនបន្តមិនបានរាយដែលធ្វើឲ្យវាកាន់តែលំបាកក្នុងការទប់ស្កាត់ការភ្ជាប់ទៅបណ្ដាញ Tor ។"> -<!ENTITY torSettings.bridgeSettingsPrompt "អ្នកអាចប្រើការកំណត់ប៊្រីតលំនាំដើម ឬអ្នកអាចទទួល និងបញ្ចូលការកំណត់ប្រ៊ីតផ្ទាល់ខ្លួន។"> +<!ENTITY torSettings.bridgeSettingsPrompt "អ្នកអាចប្រើការកំណត់ប៊្រីតដែលបានផ្ដល់ ឬអ្នកអាចយក និងបញ្ចូលការកំណត់ប៊្រីតផ្ទាល់ខ្លួន។">  @@ -46,15 +46,16 @@ <!ENTITY torsettings.firewall.checkbox "កុំព្យូទ័រនេះឆ្លងកាត់ជញ្ជាំងភ្លើងដែលអនុញ្ញាតតែការភ្ជាប់ទៅច្រកជាក់លាក់"> <!ENTITY torsettings.firewall.allowedPorts "ច្រកបានអនុញ្ញាត៖"> <!ENTITY torsettings.useBridges.checkbox "ក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) របស់ខ្ញុំទប់ស្កាត់ការភ្ជាប់ទៅបណ្ដាញ Tor ។"> -<!ENTITY torsettings.useBridges.default "ប្រើប្រភេទប្រ៊ីតលំនាំដើម"> -<!ENTITY torsettings.useBridges.custom "ប្រើប៊្រីតផ្ទាល់ខ្លួន"> +<!ENTITY torsettings.useBridges.default "ភ្ជាប់ជាមួយប៊្រីតបានផ្ដល់"> +<!ENTITY torsettings.useBridges.type "ប្រភេទបញ្ជូន៖"> +<!ENTITY torsettings.useBridges.custom "បញ្ចូលប៊្រីតផ្ទាល់ខ្លួន"> <!ENTITY torsettings.useBridges.label "បញ្ចូលការបញ្ជូនប្រ៊ីតបន្តមួយ ឬច្រើន (មួយក្នុងមួយជួរ)។"> <!ENTITY torsettings.useBridges.placeholder "បញ្ចូល address:port"> <!ENTITY torsettings.copyLog "ចម្លងកំណត់ហេតុ Tor ទៅក្ដារតម្បៀតខ្ទាស់"> <!ENTITY torsettings.bridgeHelpTitle "ជំនួយបញ្ជូនប្រ៊ីតបន្ត"> <!ENTITY torsettings.bridgeHelp1 "បើអ្នកមិនអាចភ្ជាប់ទៅបណ្ដាញ Tor វាអាចមកពីក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) ឬភ្នាក់ងារផ្សេងកំពុងទប់ស្កាត់ Tor ។ &#160; ជារឿយៗអ្នកអាចស្វែងយល់ពីបញ្ហានេះ ដោយប្រើប៊្រីត Tor ដែលត្រូវបានលាក់ការបញ្ជូនបន្តដែលពិបាកទប់ស្កាត់។"> -<!ENTITY torsettings.bridgeHelp1B "អ្នកអាចប្រើអាសយដ្ឋានបានកំណត់ជាមុន ការកំណត់អាសយដ្ឋានប្រ៊ីតលំនាំដើម ឬអ្នកអាចយកការកំណត់អាសយដ្ឋានផ្ទាល់ខ្លួនដោយប្រើវិធីសាស្ត្រមួយក្នុងចំណោមវិធីសាស្ត្រទាំងបី៖"> +<!ENTITY torsettings.bridgeHelp1B "អ្នកអាចប្រើការកំណត់រចនាសម្ព័ន្ធជាមុន ការកំណត់អាសយដ្ឋានប៊្រីតដែលបានផ្ដល់ ឬអ្នកអាចយកការកំណត់អាសយដ្ឋានផ្ទាល់ខ្លួនដោយប្រើវិធីមួយក្នុងចំណោមវិធីសាស្ត្រទាំងបី៖"> <!ENTITY torsettings.bridgeHelp2Heading "តាមរយៈបណ្ដាញ"> <!ENTITY torsettings.bridgeHelp2 "ប្រើកម្មវិធីរុករកបណ្ដាញ ដើម្បីមើល https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "តាមរយៈការឆ្លើយតបដោយស្វ័យប្រវត្តិរបស់អ៊ីមែល">

1 0