November 2019 - tor-commits - lists.torproject.org

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit d7980dcfd1e7bda47de664e3523e6f65dd09ed4c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 12:16:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+pt_BR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po index 799323fdb..682c50c21 100644 --- a/code_of_conduct+pt_BR.po +++ b/code_of_conduct+pt_BR.po @@ -8,8 +8,8 @@ # Hildeberto Abreu Magalhães <hildeberto(a)gmail.com>, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Irio Musskopf, 2019 -# Communia <ameaneantie(a)riseup.net>, 2019 # Cy Belle <cyb3ll3(a)protonmail.com>, 2019 +# Communia <ameaneantie(a)riseup.net>, 2019 # #, fuzzy msgid "" @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: Cy Belle <cyb3ll3(a)protonmail.com>, 2019\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,10 +71,10 @@ msgid "" "Those people should feel free to contact HR with questions or concerns." msgstr "" "Este código de conduta se aplica ao Projeto Tor como um todo. Destina-se a " -"fornecer orientações para os contribuidores. Os funcionários e contratados " -"do The Tor Project, Inc. (TPI) também estão sujeitos às políticas e " -"procedimentos da casa. Essas pessoas devem se sentir livres para entrar em " -"contato com o RH com perguntas ou preocupações." +"fornecer orientações aos contribuidores. Os funcionários e outras pessoas " +"sob contrato com The Tor Project, Inc. (TPI) também estão sujeitos às " +"políticas e procedimentos da casa. Todas essas pessoas devem se sentir " +"livres para entrar em contato com o RH com perguntas ou preocupações." #. type: Plain text #: ../code_of_conduct.txt:23

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit c8e0b8c496083597c68454ab811c3ff1a9dbca20 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 11:46:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ar/messages.json | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/ar/messages.json b/ar/messages.json new file mode 100644 index 000000000..2288362cc --- /dev/null +++ b/ar/messages.json @@ -0,0 +1,80 @@ +{ + "appDesc": { + "message": "Snowflake عبارة عن ناقل موصول من نوع WebRTC خاص بتور." + }, + "popupEnabled": { + "message": "‮مُفعّل" + }, + "popupLearnMore": { + "message": "تعرف على المزيد" + }, + "popupStatusOff": { + "message": "Snowflake لا يعمل" + }, + "popupStatusOn": { + "message": "عدد المستخدمين المتصلين حاليا: $1" + }, + "popupStatusReady": { + "message": "Snowflake الخاص بك جاهز لمساعدة المستخدمين على تخّطى الرقابة." + }, + "popupWebRTCOff": { + "message": "لم يتم العثور على خاصية WebRTC." + }, + "popupBridgeUnreachable": { + "message": "تعذّر الاتصال بالجسر." + }, + "popupDescOn": { + "message": "عدد المستخدمين فى آخر 24 ساعة الذين ساعدهم Snowflake الخاص بك على تخطى الرقابة: $1" + }, + "badgeCookiesOff": { + "message": "Cookies are not enabled." + }, + "websiteIntro": { + "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>." + }, + "docWiki": { + "message": "documentation wiki" + }, + "browser": { + "message": "المتصفح" + }, + "censoredUsers": { + "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." + }, + "extension": { + "message": "Extension" + }, + "installExtension": { + "message": "If your internet access is not censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours." + }, + "installFirefox": { + "message": "Install in Firefox" + }, + "installChrome": { + "message": "Install in Chrome" + }, + "reportingBugs": { + "message": "Reporting Bugs" + }, + "fileBug": { + "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to," + }, + "sharedAccount": { + "message": "Either <a href=\"https://trac.torproject.org/projects/tor/register\">create an account</a> or <a href=\"https://trac.torproject.org/projects/tor/login\">log in</a> using the shared cypherpunks account with password writecode." + }, + "bugTracker": { + "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> using our bug tracker." + }, + "descriptive": { + "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords snowflake-webextension or snowflake-client to let us know how which part of the Snowflake system is experiencing problems." + }, + "embed": { + "message": "Embed" + }, + "possible": { + "message": "It is now possible to embed the Snowflake badge on any website:" + }, + "looksLike": { + "message": "Which looks like this:" + } +}

1 0

[collector/master] Remove String[][] as configuration value type.
by karsten＠torproject.org 21 Nov '19

21 Nov '19

commit edf505ae06479b86a87e81ea0a2266a1cad2f7fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 21 09:49:49 2019 +0100 Remove String[][] as configuration value type. --- .../metrics/collector/conf/Configuration.java | 24 ---------------------- .../metrics/collector/conf/ConfigurationTest.java | 7 ------- 2 files changed, 31 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java index afda281..4bb581b 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -36,7 +36,6 @@ public class Configuration extends Observable implements Cloneable { Executors.newScheduledThreadPool(1); public static final String FIELDSEP = ","; - public static final String ARRAYSEP = ";"; private final Properties props = new Properties(); private Path configurationFile; @@ -143,29 +142,6 @@ public class Configuration extends Observable implements Cloneable { } /** - * Returns {@code String[][]} from a property. Commas seperate array elements - * and semicolons separate arrays, e.g., - * {@code propertyname = a1, a2, a3; b1, b2, b3} - */ - public String[][] getStringArrayArray(Key key) throws ConfigurationException { - try { - checkClass(key, String[][].class); - String[] interim = props.getProperty(key.name()).split(ARRAYSEP); - String[][] res = new String[interim.length][]; - for (int i = 0; i < interim.length; i++) { - res[i] = interim[i].trim().split(FIELDSEP); - for (int j = 0; j < res[i].length; j++) { - res[i][j] = res[i][j].trim(); - } - } - return res; - } catch (RuntimeException re) { - throw new ConfigurationException("Corrupt property: " + key - + " reason: " + re.getMessage(), re); - } - } - - /** * Returns {@code String[]} from a property. Commas seperate array elements, * e.g., * {@code propertyname = a1, a2, a3} diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index 887f3ae..e01aba2 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -148,13 +148,6 @@ public class ConfigurationTest { } @Test(expected = ConfigurationException.class) - public void testArrayArrayValueException() throws Exception { - Configuration conf = new Configuration(); - conf.setProperty(Key.RelayCacheOrigins.name(), ""); - conf.getStringArrayArray(Key.OutputPath); - } - - @Test(expected = ConfigurationException.class) public void testPathValueException() throws Exception { Configuration conf = new Configuration(); conf.setProperty(Key.RelayLocalOrigins.name(), "\\\u0000:");

1 0

[metrics-lib/master] Remove unused methods.
by karsten＠torproject.org 21 Nov '19

21 Nov '19

commit 067add639b8cd260b1530a50c81e0e1d0a63e9b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 21 09:55:12 2019 +0100 Remove unused methods. --- .../torproject/descriptor/impl/ParseHelper.java | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 53f011c..cd73278 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -223,26 +223,6 @@ public class ParseHelper { ZoneOffset.UTC); } - protected static long parseDateAtIndex(String line, String[] parts, - int dateIndex) throws DescriptorParseException { - if (dateIndex >= parts.length) { - throw new DescriptorParseException("Line '" + line + "' does not " - + "contain a date at the expected position."); - } - long result = -1L; - try { - DateFormat dateFormat = getDateFormat("yyyy-MM-dd"); - result = dateFormat.parse(parts[dateIndex]).getTime(); - } catch (ParseException e) { - /* Leave result at -1L. */ - } - if (result < 0L || result / 1000L > (long) Integer.MAX_VALUE) { - throw new DescriptorParseException("Illegal date format in line '" - + line + "'."); - } - return result; - } - protected static String parseTwentyByteHexString(String line, String hexString) throws DescriptorParseException { return parseHexString(line, hexString, 40); @@ -330,18 +310,11 @@ public class ParseHelper { protected static void verifyThirtyTwoByteBase64String(String line, String base64String) throws DescriptorParseException { - convertThirtyTwoByteBase64StringToHex(line, base64String); - } - - private static String convertThirtyTwoByteBase64StringToHex(String line, - String base64String) throws DescriptorParseException { if (!thirtyTwoByteBase64Pattern.matcher(base64String).matches()) { throw new DescriptorParseException("'" + base64String + "' in line '" + line + "' is not a valid base64-encoded " + "32-byte value."); } - return Hex.encodeHexString(Base64.decodeBase64(base64String + "=")) - .toUpperCase(); } protected static String parseCommaSeparatedKeyIntegerValueList(

1 0

[tor/master] Merge branch 'tor-github/pr/1555'
by asn＠torproject.org 21 Nov '19

21 Nov '19

commit f23d4df091a3b4c3933d041481316f624cdb98d1 Merge: fe68d83b2 cb1127606 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Nov 21 13:03:44 2019 +0200 Merge branch 'tor-github/pr/1555' changes/ticket30382 | 5 +++++ doc/tor.1.txt | 18 ++++++++++++------ src/core/or/connection_edge.c | 2 +- src/lib/net/socks5_status.h | 1 + 4 files changed, 19 insertions(+), 7 deletions(-)

1 0

[tor/master] hs-v3: Add changes file for ticket #30382
by asn＠torproject.org 21 Nov '19

21 Nov '19

commit cb11276068fc06090e6b5a27c3dd17676dab4aac Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 20 09:24:38 2019 -0500 hs-v3: Add changes file for ticket #30382 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket30382 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket30382 b/changes/ticket30382 new file mode 100644 index 000000000..bb8308a9f --- /dev/null +++ b/changes/ticket30382 @@ -0,0 +1,5 @@ + o Major feature (onion service, SOCKS5): + - Introduce a new SocksPort flag named: ExtendedErrors. Detailed in + proposal 304, a number of onion service error codes are now sent back, + if this flag is set, with the SOCKS5 protocol using new custom error + values. Closes ticket 30382;

1 0

[tor/master] hs-v3: Return bad address SOCKS5 extended error
by asn＠torproject.org 21 Nov '19

21 Nov '19

commit 709d7fba11482a7dae23aaecf8a5ec2bd78e47fb Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 19 11:10:13 2019 -0500 hs-v3: Return bad address SOCKS5 extended error If ExtendedErrors is set for the SocksPort, an invalid .onion address now returns the 0xF6 error code per prop304. Closes #30022 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/tor.1.txt | 18 ++++++++++++------ src/core/or/connection_edge.c | 2 +- src/lib/net/socks5_status.h | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ed9efb6fc..7b4db386e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1418,37 +1418,43 @@ The following options are useful only for clients (that is, if X'F0' Onion Service Descriptor Can Not be Found The requested onion service descriptor can't be found on the - hashring and thus not reachable by the client. + hashring and thus not reachable by the client. (v3 only) X'F1' Onion Service Descriptor Is Invalid The requested onion service descriptor can't be parsed or - signature validation failed. + signature validation failed. (v3 only) X'F2' Onion Service Introduction Failed Client failed to introduce to the service meaning the descriptor was found but the service is not connected anymore to the introduction point. The service has likely changed its descriptor - or is not running. + or is not running. (v3 only) X'F3' Onion Service Rendezvous Failed Client failed to rendezvous with the service which means that the - client is unable to finalize the connection. + client is unable to finalize the connection. (v3 only) X'F4' Onion Service Missing Client Authorization Client was able to download the requested onion service descriptor but is unable to decrypt its content because it is missing client - authorization information. + authorization information. (v3 only) X'F5' Onion Service Wrong Client Authorization Client was able to download the requested onion service descriptor but is unable to decrypt its content using the client authorization information it has. This means the client access - were revoked. + were revoked. (v3 only) + + X'F6' Onion Service Invalid Address + + The given .onion address is invalid. In one of these cases this + error is returned: address checksum doesn't match, ed25519 public + key is invalid or the encoding is invalid. (v3 only) // Anchor only for formatting, not visible in the man page. [[SocksPortFlagsMisc]]:: diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 4b4bcff2f..8ab9d7d26 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2123,7 +2123,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); if (addresstype == ONION_V3_HOSTNAME) { - conn->socks_request->socks_extended_error_code = SOCKS5_HS_IS_INVALID; + conn->socks_request->socks_extended_error_code = SOCKS5_HS_BAD_ADDRESS; } connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); return -1; diff --git a/src/lib/net/socks5_status.h b/src/lib/net/socks5_status.h index 47d9533d5..a2a479dd5 100644 --- a/src/lib/net/socks5_status.h +++ b/src/lib/net/socks5_status.h @@ -36,6 +36,7 @@ typedef enum { SOCKS5_HS_REND_FAILED = 0xF3, SOCKS5_HS_MISSING_CLIENT_AUTH = 0xF4, SOCKS5_HS_BAD_CLIENT_AUTH = 0xF5, + SOCKS5_HS_BAD_ADDRESS = 0xF6, } socks5_reply_status_t; #endif /* !defined(TOR_SOCKS5_STATUS_H) */

1 0

[training/master] Add tor network pdf format
by gus＠torproject.org 21 Nov '19

21 Nov '19

commit 1ef76178739b0206b309cc90703aeef2418a12e5 Author: gus <gus(a)torproject.org> Date: Thu Nov 21 05:54:19 2019 -0500 Add tor network pdf format --- 2019/tor-network/tor-network.pdf | Bin 0 -> 710932 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/2019/tor-network/tor-network.pdf b/2019/tor-network/tor-network.pdf new file mode 100644 index 0000000..16ec7b1 Binary files /dev/null and b/2019/tor-network/tor-network.pdf differ

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit ec33f9b5d22ffba2a75e87203afd3f73c2a08d77 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 10:46:14 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- zh_TW/https-everywhere.dtd | 126 ++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index f92192d60..e8814a8c5 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -1,68 +1,68 @@ -<!ENTITY https-everywhere.about.title "關於 HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "加密整個網路！自動在網站上使用 HTTPS 安全連線。"> -<!ENTITY https-everywhere.about.version "版本"> -<!ENTITY https-everywhere.about.rulesets_version "規則集版本"> -<!ENTITY https-everywhere.about.add_new_rule "增加新規則"> +<!ENTITY https-everywhere.about.title ""> +<!ENTITY https-everywhere.about.ext_name ""> +<!ENTITY https-everywhere.about.ext_description ""> +<!ENTITY https-everywhere.about.version ""> +<!ENTITY https-everywhere.about.rulesets_version ""> +<!ENTITY https-everywhere.about.add_new_rule ""> -<!ENTITY https-everywhere.menu.donate_eff_imperative "贊助電子前哨基金會(EFF)"> -<!ENTITY https-everywhere.menu.observatory "SSL 觀測站偏好設定"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere 已關閉"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere 已啟用"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "加密所有合格的網站已開啟"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "加密所有合格的網站已關閉"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "目前已阻擋未加密的請求"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "目前允許未加密的請求"> -<!ENTITY https-everywhere.menu.seeMore "檢視更多"> -<!ENTITY https-everywhere.menu.seeLess "檢視更少"> -<!ENTITY https-everywhere.menu.httpNoWhereMore "這個模式阻擋未加密的內容和請求"> -<!ENTITY https-everywhere.menu.showCounter "顯示計數器"> -<!ENTITY https-everywhere.menu.viewAllRules "檢視所有規則"> +<!ENTITY https-everywhere.menu.donate_eff_imperative ""> +<!ENTITY https-everywhere.menu.observatory ""> +<!ENTITY https-everywhere.menu.globalDisable ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn ""> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff ""> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked ""> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed ""> +<!ENTITY https-everywhere.menu.seeMore ""> +<!ENTITY https-everywhere.menu.seeLess ""> +<!ENTITY https-everywhere.menu.httpNoWhereMore ""> +<!ENTITY https-everywhere.menu.showCounter ""> +<!ENTITY https-everywhere.menu.viewAllRules ""> -<!ENTITY https-everywhere.options.settings "設定"> -<!ENTITY https-everywhere.options.generalSettings "一般設定"> -<!ENTITY https-everywhere.options.advancedSettings "進階設定"> -<!ENTITY https-everywhere.options.updateChannels "更新頻道"> -<!ENTITY https-everywhere.options.enableMixedRulesets "開啟多重條件"> -<!ENTITY https-everywhere.options.showDevtoolsTab "顯示開發者工具頁面"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "自動更新所有條件"> -<!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere 使用者規則"> -<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere 停用的網站"> -<!ENTITY https-everywhere.options.updateChannelsWarning "警告：加入更新頻道可能會導致攻擊者劫持您的瀏覽器。只有當您知道自己在做什麼時，才編輯此部分！"> -<!ENTITY https-everywhere.options.addUpdateChannel "加入更新頻道"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "輸入更新頻道名稱"> -<!ENTITY https-everywhere.options.delete "刪除"> -<!ENTITY https-everywhere.options.update "更新"> -<!ENTITY https-everywhere.options.storedRulesetsVersion "儲存的規則集版本："> -<!ENTITY https-everywhere.options.updatesLastChecked "最後檢查更新："> -<!ENTITY https-everywhere.options.updatesLastCheckedNever "從未"> -<!ENTITY https-everywhere.options.debuggingRulesets "除錯規則集（進階）"> +<!ENTITY https-everywhere.options.settings ""> +<!ENTITY https-everywhere.options.generalSettings ""> +<!ENTITY https-everywhere.options.advancedSettings ""> +<!ENTITY https-everywhere.options.updateChannels ""> +<!ENTITY https-everywhere.options.enableMixedRulesets ""> +<!ENTITY https-everywhere.options.showDevtoolsTab ""> +<!ENTITY https-everywhere.options.autoUpdateRulesets ""> +<!ENTITY https-everywhere.options.userRulesListed ""> +<!ENTITY https-everywhere.options.disabledUrlsListed ""> +<!ENTITY https-everywhere.options.updateChannelsWarning ""> +<!ENTITY https-everywhere.options.addUpdateChannel ""> +<!ENTITY https-everywhere.options.enterUpdateChannelName ""> +<!ENTITY https-everywhere.options.delete ""> +<!ENTITY https-everywhere.options.update ""> +<!ENTITY https-everywhere.options.storedRulesetsVersion ""> +<!ENTITY https-everywhere.options.updatesLastChecked ""> +<!ENTITY https-everywhere.options.updatesLastCheckedNever ""> +<!ENTITY https-everywhere.options.debuggingRulesets ""> -<!ENTITY https-everywhere.prefs.export_settings "匯出設定值"> -<!ENTITY https-everywhere.prefs.reset_defaults "重設成預設值"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "將會重設每個條件至預設值。 -要繼續嗎?"> +<!ENTITY https-everywhere.prefs.export_settings ""> +<!ENTITY https-everywhere.prefs.reset_defaults ""> +<!ENTITY https-everywhere.prefs.reset_defaults_message ""> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere 注意到您在瀏覧非 HTTPS 加密網頁，所以試著幫您切換到加密網頁。HTTPS 版本不可用。最有可能的情況是此網站不支援 HTTPS，但也可能表示有駭客阻擋 HTTPS。如果您希望瀏覧非加密網頁，您可以在 HTTPS Everywhere 擴充套件停用「加密所有合格的網站 (EASE)」選項。但請注意，停用此選項表示當您瀏覧網站時，容易被降版攻擊。"> -<!ENTITY https-everywhere.cancel.he_blocking_network "基於網路的降級攻擊"> -<!ENTITY https-everywhere.cancel.open_page "開啟不安全的頁面"> +<!ENTITY https-everywhere.cancel.he_blocking_explainer ""> +<!ENTITY https-everywhere.cancel.he_blocking_network ""> +<!ENTITY https-everywhere.cancel.open_page ""> +<!ENTITY https-everywhere.cancel.http_once ""> -<!ENTITY https-everywhere.chrome.settings_for_this_site_header "這個網站的設定"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "變更加密連線的偏好設定"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "當您瀏覽不同網站時，您可以變更各個網站的偏好設定"> -<!ENTITY https-everywhere.chrome.stable_rules "穩定版規則"> -<!ENTITY https-everywhere.chrome.stable_rules_description "與下列網站建立強制加密的連線："> -<!ENTITY https-everywhere.chrome.experimental_rules "試驗版規則"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "可能會產生警告訊息或程式錯誤，預設值是關閉狀態。"> -<!ENTITY https-everywhere.chrome.disable_on_this_site "在這個網站停用 HTTPS Everywhere"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "在這個網站啟用 HTTPS Everywhere"> -<!ENTITY https-everywhere.chrome.add_rule "為該網站新增規則"> -<!ENTITY https-everywhere.chrome.add_new_rule "為該網站增添新規則"> -<!ENTITY https-everywhere.chrome.always_https_for_host "該主機皆使用https加密網址"> -<!ENTITY https-everywhere.chrome.host "主機:"> -<!ENTITY https-everywhere.chrome.show_advanced "顯示進階選項"> -<!ENTITY https-everywhere.chrome.hide_advanced "隱藏進階選項"> -<!ENTITY https-everywhere.chrome.rule_name "規則名稱"> -<!ENTITY https-everywhere.chrome.regex "比對正規表達方式"> -<!ENTITY https-everywhere.chrome.redirect_to "重新導向"> -<!ENTITY https-everywhere.chrome.status_cancel_button "取消"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_header ""> +<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader ""> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained ""> +<!ENTITY https-everywhere.chrome.stable_rules ""> +<!ENTITY https-everywhere.chrome.stable_rules_description ""> +<!ENTITY https-everywhere.chrome.experimental_rules ""> +<!ENTITY https-everywhere.chrome.experimental_rules_description ""> +<!ENTITY https-everywhere.chrome.disable_on_this_site ""> +<!ENTITY https-everywhere.chrome.enable_on_this_site ""> +<!ENTITY https-everywhere.chrome.add_rule ""> +<!ENTITY https-everywhere.chrome.add_new_rule ""> +<!ENTITY https-everywhere.chrome.always_https_for_host ""> +<!ENTITY https-everywhere.chrome.host ""> +<!ENTITY https-everywhere.chrome.show_advanced ""> +<!ENTITY https-everywhere.chrome.hide_advanced ""> +<!ENTITY https-everywhere.chrome.rule_name ""> +<!ENTITY https-everywhere.chrome.regex ""> +<!ENTITY https-everywhere.chrome.redirect_to ""> +<!ENTITY https-everywhere.chrome.status_cancel_button "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit 5a8bc270d0aecc6d552e0d39cbd70863481db6b8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 10:46:07 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- zh_TW/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index 50e002b62..e99aef9fe 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -46,7 +46,7 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere 注意到您在瀏覧非 HTTPS 加密網頁，所以試著幫您切換到加密網頁。HTTPS 版本不可用。最有可能的情況是此網站不支援 HTTPS，但也可能表示有駭客阻擋 HTTPS。如果您希望瀏覧非加密網頁，您可以在 HTTPS Everywhere 擴充套件停用「加密所有合格的網站 (EASE)」選項。但請注意，停用此選項表示當您瀏覧網站時，容易被降版攻擊。"> <!ENTITY https-everywhere.cancel.he_blocking_network "基於網路的降級攻擊"> <!ENTITY https-everywhere.cancel.open_page "開啟不安全的頁面"> -<!ENTITY https-everywhere.cancel.http_once "Open insecure page for this session only"> +<!ENTITY https-everywhere.cancel.http_once "開啟不安全的頁面(僅用於此階段作業)"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "這個網站的設定"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "變更加密連線的偏好設定">

1 0