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

[metrics-web/master] Option to plot sum of all non-<OR> transports
by karsten＠torproject.org 26 Jun '14

26 Jun '14

commit 0ea16444cfefa9ca5f0a0ad032494d1c4aaae545 Author: Joe Landers <joe(a)joelanders.net> Date: Thu Jun 26 20:25:35 2014 +0200 Option to plot sum of all non-<OR> transports Finishes #11799 --- website/rserve/graphs.R | 17 ++++++++++++----- .../metrics/web/graphs/GraphParameterChecker.java | 2 +- website/web/WEB-INF/users.jsp | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index 5a130ee..b1adc85 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -796,9 +796,15 @@ plot_userstats <- function(start, end, node, variable, value, events, title <- "Directly connecting users\n" } } else if (variable == 'transport') { - u <- u[u$transport == value & u$node == 'bridge', ] - title <- paste("Bridge users using transport ", value, "\n", - sep = "") + if (value != '!<*>') { + u <- u[u$transport == value & u$node == 'bridge', ] + title <- paste("Bridge users using transport ", value, "\n", + sep = "") + } else { + u <- u[u$transport != '' & u$transport != '<OR>' & + u$node == 'bridge', ] + title <- paste("Bridge users using any pluggable transport") + } } else if (variable == 'version') { u <- u[u$version== value & u$node == 'bridge', ] title <- paste("Bridge users using IP", value, "\n", sep = "") @@ -813,8 +819,9 @@ plot_userstats <- function(start, end, node, variable, value, events, title <- "Bridge users\n" } } - u <- data.frame(date = as.Date(u$date, "%Y-%m-%d"), users = u$clients, - lower = u$lower, upper = u$upper) + u <- aggregate(list(lower = u$lower, upper = u$upper, + users = u$clients), + by = list(date = as.Date(u$date, "%Y-%m-%d")), FUN = sum) dates <- seq(from = as.Date(start, "%Y-%m-%d"), to = as.Date(end, "%Y-%m-%d"), by="1 day") missing <- setdiff(dates, u$date) diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java index 7b0ea9e..ab77943 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java @@ -59,7 +59,7 @@ public class GraphParameterChecker { this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); this.knownParameterValues.put("transport", - "obfs2,obfs3,websocket,fte,meek,scramblesuit,<OR>,<??>"); + "obfs2,obfs3,websocket,fte,meek,scramblesuit,<OR>,<??>,!<*>"); this.knownParameterValues.put("version", "v4,v6"); this.knownParameterValues.put("p", "100,99,98,97,95,91,90,80,75,70," + "60,50,40,30,25,20,10,9,5,3,2,1,0"); diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 0a31569..00e3730 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -221,6 +221,7 @@ Bridge users by transport: <option value="meek"<c:if test="${userstats_bridge_transport_transport[0] eq 'meek'}"> selected</c:if>>meek</option> <option value="scramblesuit"<c:if test="${userstats_bridge_transport_transport[0] eq 'scramblesuit'}"> selected</c:if>>scramblesuit</option> <option value="<??>"<c:if test="${userstats_bridge_transport_transport[0] eq '<??>'}"> selected</c:if>>Unknown transport</option> + <option value="!<*>"<c:if test="${userstats_bridge_transport_transport[0] eq '!<*>'}"> selected</c:if>>Any non-<OR> transport</option> </select> </p><p> <input class="submit" type="submit" value="Update graph">

1 0

[metrics-web/master] Tweak last commit that implements #11799.
by karsten＠torproject.org 26 Jun '14

26 Jun '14

commit a0dfa55a14b696afed1c555ca879e15d8de961ff Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 26 22:28:43 2014 +0200 Tweak last commit that implements #11799. --- website/rserve/graphs.R | 2 +- website/web/WEB-INF/users.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index b1adc85..68a8b7d 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -803,7 +803,7 @@ plot_userstats <- function(start, end, node, variable, value, events, } else { u <- u[u$transport != '' & u$transport != '<OR>' & u$node == 'bridge', ] - title <- paste("Bridge users using any pluggable transport") + title <- paste("Bridge users using any pluggable transport\n") } } else if (variable == 'version') { u <- u[u$version== value & u$node == 'bridge', ] diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 00e3730..ae402ba 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -221,7 +221,7 @@ Bridge users by transport: <option value="meek"<c:if test="${userstats_bridge_transport_transport[0] eq 'meek'}"> selected</c:if>>meek</option> <option value="scramblesuit"<c:if test="${userstats_bridge_transport_transport[0] eq 'scramblesuit'}"> selected</c:if>>scramblesuit</option> <option value="<??>"<c:if test="${userstats_bridge_transport_transport[0] eq '<??>'}"> selected</c:if>>Unknown transport</option> - <option value="!<*>"<c:if test="${userstats_bridge_transport_transport[0] eq '!<*>'}"> selected</c:if>>Any non-<OR> transport</option> + <option value="!<*>"<c:if test="${userstats_bridge_transport_transport[0] eq '!<*>'}"> selected</c:if>>Any non-OR transport</option> </select> </p><p> <input class="submit" type="submit" value="Update graph">

1 0

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

26 Jun '14

commit f4418bcc75fa6a1bcae1e484d44893e5fed8fc3f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 18:45:21 2014 +0000 Update translations for tails-greeter --- pt/pt.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 4f6143a..c92bbf5 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -5,13 +5,14 @@ # Translators: # André Monteiro <andre.monteir(a)gmail.com>, 2014 # sierleunam <cfb53275(a)opayq.com>, 2014 +# Manuela Silva <manuela.silva(a)sky.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-11 16:20+0200\n" +"PO-Revision-Date: 2014-06-26 18:41+0000\n" +"Last-Translator: Manuela Silva <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "Avançar" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" -msgstr "Autenticação" +msgstr "Iniciar Sessão" #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" @@ -61,11 +62,11 @@ msgstr "<i>Palavra-chave errada. Por favor tente novamente.</i>" #: ../glade/persistencewindow.glade.h:11 msgid "More options?" -msgstr "Mais Opções?" +msgstr "Mais opções?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "Palavra-passe de administração" +msgstr "Senha de Administração" #: ../glade/optionswindow.glade.h:4 msgid "" @@ -77,7 +78,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Introduza uma palavra-passe de administração em caso de necessidade de efetuar tarefas administrativas.\nCaso contrário será desativado para maior segurança." +msgstr "Insira a sua senha de administração para o caso de precisar de realizar tarefas administrativas.\nCaso contrário, esta será desativada para uma melhor segurança." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -85,15 +86,15 @@ msgstr "Senha:" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" -msgstr "Verificar Senha:" +msgstr "Contrassenha:" #: ../glade/optionswindow.glade.h:9 msgid "<i>Passwords do not match</i>" -msgstr "<i>Senhas não coincidem</i>" +msgstr "<i>As senhas não coincidem</i>" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "Camuflagem Windows" +msgstr "Camuflagem do Windows" #: ../glade/optionswindow.glade.h:11 msgid "" @@ -113,7 +114,7 @@ msgstr "" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" -msgstr "Roubo de identidade MAC" +msgstr "Engano do endereço MAC" #: ../glade/optionswindow.glade.h:15 msgid "" @@ -131,7 +132,7 @@ msgstr "O roubo de identidade MAC esconde o número de série das placas de rede msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "É geralmente seguro personificar endereços MAC, mas pode também levantar suspeitas ou causar problemas de rede." +msgstr "É geralmente seguro enganar os endereços MAC, mas este também pode levantar suspeitas ou causar problemas na rede." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" @@ -169,7 +170,7 @@ msgstr "Idioma" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "Localização" +msgstr "Local" #: ../glade/langpanel.glade.h:4 msgid "Layout" @@ -198,7 +199,7 @@ msgid "" "%(stderr)s" msgstr "O live-persist falhou com o código de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." -msgstr "Outro..." +msgstr "Outro ..."

1 0

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

26 Jun '14

commit 6efe0c5478c7052422240b2d9532c0f88ebd35ee Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:45:31 2014 +0000 Update translations for tails-greeter_completed --- zh_TW/zh_TW.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 992a2e7..3700bbc 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -5,15 +5,15 @@ # Translators: # chinrur <chinrur(a)gmail.com>, 2013 # wongyinho981 <wongyinho981(a)gmail.com>, 2013 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-31 16:21+0000\n" -"Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-11 16:20+0200\n" +"PO-Revision-Date: 2014-06-26 16:41+0000\n" +"Last-Translator: x4r <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" @@ -200,7 +200,7 @@ msgid "" "%(stderr)s" msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "其他..."

1 0

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

26 Jun '14

commit fc388dea8f49c19da1e8b9d8943622609645541e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:45:28 2014 +0000 Update translations for tails-greeter --- zh_TW/zh_TW.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 992a2e7..3700bbc 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -5,15 +5,15 @@ # Translators: # chinrur <chinrur(a)gmail.com>, 2013 # wongyinho981 <wongyinho981(a)gmail.com>, 2013 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-31 16:21+0000\n" -"Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-11 16:20+0200\n" +"PO-Revision-Date: 2014-06-26 16:41+0000\n" +"Last-Translator: x4r <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" @@ -200,7 +200,7 @@ msgid "" "%(stderr)s" msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "其他..."

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Jun '14

26 Jun '14

commit 41656ebe21b0a1619f8264b24183abb0375348f7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:45:21 2014 +0000 Update translations for https_everywhere_completed --- zh_TW/https-everywhere.properties | 2 +- zh_TW/ssl-observatory.dtd | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index 9e950ea..dddfef8 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = 啟用 / 停用規則 https-everywhere.menu.noRules = (沒有規則適用於此網頁) https-everywhere.menu.unknownRules = (適用此網頁的規則不明) https-everywhere.toolbar.hint = HTTPS Everywhere 目前使用中。您可以根據站台對站台基礎上透過按下網址列中的圖示來作切換。 -https-everywhere.migration.notification0 = 為了徹底落實關鍵修正，更新重置您的HTTPS Everywhere 規則設定至它們的預設值。 +https-everywhere.migration.notification0 = 為了實現關鍵性的修正，此更新將您的 HTTPS Everywhere 規則偏好設定重設成其預設值。 https-everywhere.menu.ruleset-tests = 執行 HTTPS Everywhere 規則集測試 diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index e016ca9..89817e0 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -1,9 +1,9 @@  -<!ENTITY ssl-observatory.popup.details "詳細資料與隱私訊息"> -<!ENTITY ssl-observatory.popup.later "稍後再詢問"> -<!ENTITY ssl-observatory.popup.no "取消"> +<!ENTITY ssl-observatory.popup.details "詳細資料和隱私權資訊"> +<!ENTITY ssl-observatory.popup.later "稍後詢問我"> +<!ENTITY ssl-observatory.popup.no "否"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能將您收到的憑證送到觀測站，以偵測出對您瀏覽器的攻擊。要啟用本功能嗎？"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 將您收到的憑證發送到觀測站，以偵測出對您瀏覽器的攻擊。要開啟此功能嗎?">  <!ENTITY ssl-observatory.popup.title -"要讓 HTTPS Everywhere 使用 SSL 觀測站嗎？"> +"要讓 HTTPS Everywhere 使用 SSL 觀測站嗎?"> -<!ENTITY ssl-observatory.popup.yes "確定"> +<!ENTITY ssl-observatory.popup.yes "是">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Jun '14

26 Jun '14

commit 55e367773cc88ae1c95a6a0e9f44e210f54086c3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:45:17 2014 +0000 Update translations for https_everywhere --- zh_TW/https-everywhere.properties | 2 +- zh_TW/ssl-observatory.dtd | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index 9e950ea..dddfef8 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = 啟用 / 停用規則 https-everywhere.menu.noRules = (沒有規則適用於此網頁) https-everywhere.menu.unknownRules = (適用此網頁的規則不明) https-everywhere.toolbar.hint = HTTPS Everywhere 目前使用中。您可以根據站台對站台基礎上透過按下網址列中的圖示來作切換。 -https-everywhere.migration.notification0 = 為了徹底落實關鍵修正，更新重置您的HTTPS Everywhere 規則設定至它們的預設值。 +https-everywhere.migration.notification0 = 為了實現關鍵性的修正，此更新將您的 HTTPS Everywhere 規則偏好設定重設成其預設值。 https-everywhere.menu.ruleset-tests = 執行 HTTPS Everywhere 規則集測試 diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index e016ca9..89817e0 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -1,9 +1,9 @@  -<!ENTITY ssl-observatory.popup.details "詳細資料與隱私訊息"> -<!ENTITY ssl-observatory.popup.later "稍後再詢問"> -<!ENTITY ssl-observatory.popup.no "取消"> +<!ENTITY ssl-observatory.popup.details "詳細資料和隱私權資訊"> +<!ENTITY ssl-observatory.popup.later "稍後詢問我"> +<!ENTITY ssl-observatory.popup.no "否"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能將您收到的憑證送到觀測站，以偵測出對您瀏覽器的攻擊。要啟用本功能嗎？"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 將您收到的憑證發送到觀測站，以偵測出對您瀏覽器的攻擊。要開啟此功能嗎?">  <!ENTITY ssl-observatory.popup.title -"要讓 HTTPS Everywhere 使用 SSL 觀測站嗎？"> +"要讓 HTTPS Everywhere 使用 SSL 觀測站嗎?"> -<!ENTITY ssl-observatory.popup.yes "確定"> +<!ENTITY ssl-observatory.popup.yes "是">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jun '14

26 Jun '14

commit 8a5d1d7a67c2bfb9ae2906123b92f4dbbea1491a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:45:02 2014 +0000 Update translations for bridgedb --- zh_TW/LC_MESSAGES/bridgedb.po | 124 ++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 50 deletions(-) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po index ac2f1a9..2fab634 100644 --- a/zh_TW/LC_MESSAGES/bridgedb.po +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-26 16:41+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -20,19 +20,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -56,39 +53,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -98,14 +100,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -114,20 +122,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "什麼是網橋？" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "我需要使用其他方式獲取網橋！" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -135,75 +143,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "網橋無法正常運行，我需要幫助！" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -211,24 +227,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -248,15 +269,19 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -297,28 +322,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "取消" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -326,7 +350,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Jun '14

26 Jun '14

commit 5635803a49b84bbb4ae08f5cabc81afa36c978e2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:15:19 2014 +0000 Update translations for https_everywhere_completed --- zh_TW/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index 39108e5..9e950ea 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -3,6 +3,6 @@ https-everywhere.menu.globalDisable = 停用 HTTPS Everywhere https-everywhere.menu.enableDisable = 啟用 / 停用規則 https-everywhere.menu.noRules = (沒有規則適用於此網頁) https-everywhere.menu.unknownRules = (適用此網頁的規則不明) -https-everywhere.toolbar.hint = HTTPS Everywhere 已啟用。您可以根據網站站點基礎上透過切換網址列圖示以啟用。 +https-everywhere.toolbar.hint = HTTPS Everywhere 目前使用中。您可以根據站台對站台基礎上透過按下網址列中的圖示來作切換。 https-everywhere.migration.notification0 = 為了徹底落實關鍵修正，更新重置您的HTTPS Everywhere 規則設定至它們的預設值。 -https-everywhere.menu.ruleset-tests = 執行HTTPS Everywhere 規則設定測試 +https-everywhere.menu.ruleset-tests = 執行 HTTPS Everywhere 規則集測試

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Jun '14

26 Jun '14

commit 4b5078a150d5d76970f20f9beefceec9142e132d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 26 16:15:15 2014 +0000 Update translations for https_everywhere --- zh_TW/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/https-everywhere.properties b/zh_TW/https-everywhere.properties index 39108e5..9e950ea 100644 --- a/zh_TW/https-everywhere.properties +++ b/zh_TW/https-everywhere.properties @@ -3,6 +3,6 @@ https-everywhere.menu.globalDisable = 停用 HTTPS Everywhere https-everywhere.menu.enableDisable = 啟用 / 停用規則 https-everywhere.menu.noRules = (沒有規則適用於此網頁) https-everywhere.menu.unknownRules = (適用此網頁的規則不明) -https-everywhere.toolbar.hint = HTTPS Everywhere 已啟用。您可以根據網站站點基礎上透過切換網址列圖示以啟用。 +https-everywhere.toolbar.hint = HTTPS Everywhere 目前使用中。您可以根據站台對站台基礎上透過按下網址列中的圖示來作切換。 https-everywhere.migration.notification0 = 為了徹底落實關鍵修正，更新重置您的HTTPS Everywhere 規則設定至它們的預設值。 -https-everywhere.menu.ruleset-tests = 執行HTTPS Everywhere 規則設定測試 +https-everywhere.menu.ruleset-tests = 執行 HTTPS Everywhere 規則集測試

1 0