June 2016 - tor-commits - lists.torproject.org

[onionoo/master] Replace submodule with released descriptor.jar.
by karsten＠torproject.org 05 Jun '16

05 Jun '16

commit 48cf80e8db5832ba8cc79b04f38daee5092ecb7c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 5 10:41:25 2016 +0200 Replace submodule with released descriptor.jar. Fixes #19253 and #19260. --- build.xml | 19 ++++----- deps/metrics-lib | 1 - .../onionoo/updater/DummyBridgeStatus.java | 45 ++++++++++++++++++++++ .../onionoo/updater/DummyStatusEntry.java | 5 +++ 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/build.xml b/build.xml index 8de738a..c92fc3a 100644 --- a/build.xml +++ b/build.xml @@ -29,6 +29,7 @@ <include name="commons-lang3-3.1.jar"/> <include name="gson-2.1.jar"/> <include name="junit4-4.10.jar"/> + <include name="hamcrest-all-1.3.jar"/> <include name="servlet-api-3.0.jar"/> <include name="logback-classic-1.0.4.jar"/> <include name="logback-core-1.0.4.jar"/> @@ -44,8 +45,8 @@ <include name="jetty8-continuation-8.1.3.v20120416.jar"/> <include name="jetty8-security-8.1.3.v20120416.jar"/> </fileset> - <fileset dir="deps/metrics-lib"> - <include name="descriptor.jar"/> + <fileset dir="lib"> + <include name="descriptor-1.2.0.jar"/> </fileset> <fileset dir="${config}"> <include name="logback.xml,jetty.xml"/> @@ -66,12 +67,8 @@ </delete> </target> - <target name="metrics-lib"> - <ant dir="deps/metrics-lib"/> - </target> - <target name="compile" - depends="metrics-lib, init"> + depends="init"> <javac destdir="${classes}" srcdir="${javasources}" source="${source-and-target-java-version}" @@ -112,8 +109,8 @@ <war destfile="${warfile}" webxml="${webxmlfile}"> <fileset dir="web"/> - <zipgroupfileset dir="deps/metrics-lib"> - <include name="descriptor.jar"/> + <zipgroupfileset dir="lib"> + <include name="descriptor-1.2.0.jar"/> </zipgroupfileset> <zipgroupfileset dir="/usr/share/java"> <include name="commons-codec-1.6.jar"/> @@ -172,8 +169,8 @@ <include name="logback-core-1.0.4.jar"/> <include name="slf4j-api-1.6.5.jar"/> </zipgroupfileset> - <zipgroupfileset dir="deps/metrics-lib"> - <include name="descriptor.jar"/> + <zipgroupfileset dir="lib"> + <include name="descriptor-1.2.0.jar"/> </zipgroupfileset> <fileset dir="${classes}" excludes="org/torproject/onionoo/server/" /> diff --git a/deps/metrics-lib b/deps/metrics-lib deleted file mode 160000 index bd18dd0..0000000 --- a/deps/metrics-lib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855 diff --git a/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java b/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java index f6a396c..ff6f104 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyBridgeStatus.java @@ -39,5 +39,50 @@ public class DummyBridgeStatus implements BridgeNetworkStatus { public SortedMap<String, NetworkStatusEntry> getStatusEntries() { return this.statusEntries; } + + @Override + public int getEnoughMtbfInfo() { + return 0; + } + + @Override + public long getFastBandwidth() { + return 0; + } + + @Override + public long getGuardBandwidthExcludingExits() { + return 0; + } + + @Override + public long getGuardBandwidthIncludingExits() { + return 0; + } + + @Override + public long getGuardTk() { + return 0; + } + + @Override + public double getGuardWfu() { + return 0; + } + + @Override + public int getIgnoringAdvertisedBws() { + return 0; + } + + @Override + public long getStableMtbf() { + return 0; + } + + @Override + public long getStableUptime() { + return 0; + } } diff --git a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java index 64ef73f..b480c37 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java @@ -88,5 +88,10 @@ public class DummyStatusEntry implements NetworkStatusEntry { public String getPortList() { return null; } + + @Override + public String getMasterKeyEd25519() { + return null; + } }

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit f59bd4dc5ad3d21fd67cd65b4f54c55261f0a667 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:47:42 2016 +0000 Update translations for tails-onioncircuits_completed --- zh_TW/onioncircuits.pot | 88 +++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 47 deletions(-) diff --git a/zh_TW/onioncircuits.pot b/zh_TW/onioncircuits.pot index 93986d6..bfe2db9 100644 --- a/zh_TW/onioncircuits.pot +++ b/zh_TW/onioncircuits.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-04-01 03:20+0000\n" +"POT-Creation-Date: 2016-05-31 14:42+0200\n" +"PO-Revision-Date: 2016-06-05 15:29+0000\n" "Last-Translator: 男孩不壞\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -19,74 +19,68 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../onioncircuits:81 -msgid "" -"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "無法連接至Tor 背景服務程式。洋蔥迴路將嘗試重連..." +msgid "You are not connected to Tor yet..." +msgstr "您尚未連接至Tor..." -#: ../onioncircuits:94 +#: ../onioncircuits:95 msgid "Onion Circuits" msgstr "洋蔥迴圈" -#: ../onioncircuits:95 -msgid "Display Tor circuits and streams" -msgstr "顯示Tor流與迴圈" - -#: ../onioncircuits:107 -msgid "OK" -msgstr "確定" - -#: ../onioncircuits:124 -msgid "Path" -msgstr "路徑" - #: ../onioncircuits:125 +msgid "Circuit" +msgstr "迴圈" + +#: ../onioncircuits:126 msgid "Status" msgstr "狀態" -#: ../onioncircuits:141 -msgid "Click on a path to get details" -msgstr "點擊路徑以取得的細節" +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "按下迴圈以查看Tor中繼節點的細節" -#: ../onioncircuits:215 -msgid "" -"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "失去與Tor 背景服務程式的連結。洋蔥迴圈將試著重連..." - -#: ../onioncircuits:232 -msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "已接上Tor 背景服務程式! 您現在可以使用洋蔥迴圈了。" +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "至Tor的連接已遺失..." -#: ../onioncircuits:314 -msgid "Building..." -msgstr "建立中..." +#: ../onioncircuits:317 +msgid "..." +msgstr "..." -#: ../onioncircuits:339 +#: ../onioncircuits:343 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../onioncircuits:564 +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "地理IP資料庫失效。無法顯示國家資訊。" + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/s" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "未知" + +#: ../onioncircuits:607 msgid "Fingerprint:" msgstr "指紋:" -#: ../onioncircuits:565 +#: ../onioncircuits:608 msgid "Published:" msgstr "發布:" -#: ../onioncircuits:566 +#: ../onioncircuits:609 msgid "IP:" msgstr "IP:" -#: ../onioncircuits:566 -#, c-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../onioncircuits:567 +#: ../onioncircuits:610 msgid "Bandwidth:" msgstr "頻寬：" - -#: ../onioncircuits:567 -#, c-format -msgid "%.2f Mb/s" -msgstr "%.2f Mb/s"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit 50cac758244257fd2baee395d864938f0b2eaa16 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:47:37 2016 +0000 Update translations for tails-onioncircuits --- zh_TW/onioncircuits.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zh_TW/onioncircuits.pot b/zh_TW/onioncircuits.pot index 43c49b9..bfe2db9 100644 --- a/zh_TW/onioncircuits.pot +++ b/zh_TW/onioncircuits.pot @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-01 09:23+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-06-05 15:29+0000\n" +"Last-Translator: 男孩不壞\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "您尚未連接至Tor..." #: ../onioncircuits:95 msgid "Onion Circuits" @@ -28,7 +28,7 @@ msgstr "洋蔥迴圈" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "迴圈" #: ../onioncircuits:126 msgid "Status" @@ -36,15 +36,15 @@ msgstr "狀態" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "按下迴圈以查看Tor中繼節點的細節" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "" +msgstr "至Tor的連接已遺失..." #: ../onioncircuits:317 msgid "..." -msgstr "" +msgstr "..." #: ../onioncircuits:343 #, c-format @@ -53,7 +53,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "" +msgstr "地理IP資料庫失效。無法顯示國家資訊。" #: ../onioncircuits:585 #, c-format @@ -67,7 +67,7 @@ msgstr "%.2f Mb/s" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "" +msgstr "未知" #: ../onioncircuits:607 msgid "Fingerprint:"

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit 9f9e8c6c187af825735f8bb3482643c4dd32a08c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:47:10 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- zh_TW/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zh_TW/finger.dtd b/zh_TW/finger.dtd index 04eda45..34b1097 100644 --- a/zh_TW/finger.dtd +++ b/zh_TW/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "協定"> <!ENTITY finger.verify "驗證"> <!ENTITY finger.remove "移除"> -<!ENTITY finger.intro "管理你所見過的指紋"> \ No newline at end of file +<!ENTITY finger.intro "管理你所見過的指紋"> +<!ENTITY addFingerDialog.title "增加指紋"> +<!ENTITY addFingerDialog.finger "指紋"> +<!ENTITY addFingerDialog.accept "確定"> +<!ENTITY addFingerDialog.cancel "跳過"> +<!ENTITY addFingerDialog.tooltip "若您知道聯繫人OTR密鑰，十六進的40位指紋，請現在輸入。"> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit 0917be6237bc6d26c341bfded9b336977c143442 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:47:05 2016 +0000 Update translations for tor-messenger-fingerdtd --- zh_TW/finger.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/finger.dtd b/zh_TW/finger.dtd index f54a97b..34b1097 100644 --- a/zh_TW/finger.dtd +++ b/zh_TW/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "驗證"> <!ENTITY finger.remove "移除"> <!ENTITY finger.intro "管理你所見過的指紋"> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> -<!ENTITY addFingerDialog.accept "OK"> -<!ENTITY addFingerDialog.cancel "Skip"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.title "增加指紋"> +<!ENTITY addFingerDialog.finger "指紋"> +<!ENTITY addFingerDialog.accept "確定"> +<!ENTITY addFingerDialog.cancel "跳過"> +<!ENTITY addFingerDialog.tooltip "若您知道聯繫人OTR密鑰，十六進的40位指紋，請現在輸入。"> \ No newline at end of file

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit ec9e1d96942d7590b96d640a4e4bdc776f3f307e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:46:31 2016 +0000 Update translations for tails-iuk --- zh_TW.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index d91b623..2fa0bfa 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -7,13 +7,14 @@ # 大圈洋蔥, 2016 # Wen-Gan Li <wgli(a)wgli.net>, 2015 # x4r <xatierlike(a)gmail.com>, 2014 +# 男孩不壞, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-05-26 08:49+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-06-05 15:31+0000\n" +"Last-Translator: 男孩不壞\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -187,7 +188,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "" +msgstr "選擇下載伺服器時發生錯誤" #: ../lib/Tails/IUK/Frontend.pm:608 msgid ""

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit 4d9759739179a6f99877a731f7f3c61924acf1ba Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:46:06 2016 +0000 Update translations for tor-launcher-properties_completed --- zh_TW/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index 9d304be..6d6c006 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -3,6 +3,7 @@ torlauncher.error_title=洋蔥路由啟動工具 +torlauncher.tor_exited_during_startup=Tor在啟動時跳出。這可能由torcc設定檔的錯誤、Tor或其他系統程式的漏洞以及硬體缺陷造成。須先解決潛在的問題並重啟Tor，瀏覽器才能啟動。 torlauncher.tor_exited=洋蔥路由程式意外地中止了。這有可能是洋蔥路由本身的程式錯誤、您系統上的其它程式或是硬體故障。除非您重新啟動洋蔥路由，否則洋蔥路由瀏覽器將無法連接上任何網站。如果此問題持續發生，請發複製並發送您的洋蔥路由歷程紀錄到支援團隊。 torlauncher.tor_exited2=重新啟動洋蔥路由將不會關閉您瀏覽器的分頁。 torlauncher.tor_controlconn_failed=無法連接至洋蔥路由控制連接埠。

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit 8f2ce3f17d848f425cbbcff781ac2692ac116d3e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:46:01 2016 +0000 Update translations for tor-launcher-properties --- zh_TW/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index cabffe4..6d6c006 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=洋蔥路由啟動工具 -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor在啟動時跳出。這可能由torcc設定檔的錯誤、Tor或其他系統程式的漏洞以及硬體缺陷造成。須先解決潛在的問題並重啟Tor，瀏覽器才能啟動。 torlauncher.tor_exited=洋蔥路由程式意外地中止了。這有可能是洋蔥路由本身的程式錯誤、您系統上的其它程式或是硬體故障。除非您重新啟動洋蔥路由，否則洋蔥路由瀏覽器將無法連接上任何網站。如果此問題持續發生，請發複製並發送您的洋蔥路由歷程紀錄到支援團隊。 torlauncher.tor_exited2=重新啟動洋蔥路由將不會關閉您瀏覽器的分頁。 torlauncher.tor_controlconn_failed=無法連接至洋蔥路由控制連接埠。

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit dfe4875f7cda74493a3b03c43e86d55a9f795dc2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:45:55 2016 +0000 Update translations for mat-gui_completed --- zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW.po b/zh_TW.po index 142d5a6..1b960b3 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" +"PO-Revision-Date: 2016-06-05 15:29+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 05 Jun '16

05 Jun '16

commit 87e5ad1f7f59d0d45fd0436fb1757f1509125f0a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 5 15:45:50 2016 +0000 Update translations for mat-gui --- zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW.po b/zh_TW.po index 142d5a6..1b960b3 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" +"PO-Revision-Date: 2016-06-05 15:29+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0