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

[torsocks/pending-changes] Merge branch 'debian-patches' into pending-changes
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 81f50583d07fa3d61cb3c94366ce2b40d6af54e0 Merge: 1ca5216 5c9a88d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jan 26 20:01:49 2013 -0800 Merge branch 'debian-patches' into pending-changes src/torsocks.in | 9 ++++++++- src/usewithtor.in | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[torsocks/pending-changes] Partial fix for "not found in any shared library"
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit e3440cf5368b12cf28d894747e8ae8dd849f9168 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 20:36:14 2012 +0000 Partial fix for "not found in any shared library" Please see the following bug for discussion: http://code.google.com/p/torsocks/issues/detail?id=3 The current partial fix by Anthony Basile: https://bugs.gentoo.org/show_bug.cgi?id=395953#c7 --- src/torsocks.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/torsocks.c b/src/torsocks.c index f559eec..5b1c16a 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -124,9 +124,9 @@ void torsocks_init(void) #define LOAD_ERROR(s,l) { \ const char *error; \ error = dlerror(); \ - show_msg(l, "The symbol %s() was not found in any shared " \ - "library. The error reported was: %s!\n", s, \ - (error)?error:"not found"); \ + if (error) \ + show_msg(l, "The symbol %s() was not found in any shared " \ + "library. The error reported was: %s!\n", s, error); \ dlerror(); \ } pthread_mutex_lock(&torsocks_init_mutex);

1 0

[torsocks/pending-changes] Second fix for the "not found in any shared library" issue.
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit c2c22d0007c340fcb517e6a434ec5bcb4321c3e6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 21:20:07 2012 +0000 Second fix for the "not found in any shared library" issue. This patch is from lunar: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636943#74 http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=74;filename=torsocks-1.2_f… --- src/expansion_table.h | 5 ----- src/torsocks.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/expansion_table.h b/src/expansion_table.h index e981f5d..14fabe1 100644 --- a/src/expansion_table.h +++ b/src/expansion_table.h @@ -76,12 +76,7 @@ /*RES_FUNC (ERR, int, RES_INIT_, res_init, res_init, "res_init") */ RES_FUNC (ERR, int, RES_QUERY_, res_query, res_query, "res_query") RES_FUNC (ERR, int, RES_SEARCH_, res_search, res_search, "res_search") -#if defined(__APPLE__) || defined(__darwin__) RES_FUNC (ERR, int, RES_SEND_, res_send, res_send, "res_send") -#else -/* It is a bit of a mystery why this is required on Linux. See http://code.google.com/p/torsocks/issues/detail?id=3 */ -RES_FUNC (ERR, int, RES_SEND_, res_send, res_send, "__res_send") -#endif RES_FUNC (ERR, int, RES_QUERYDOMAIN_, res_querydomain, res_querydomain, "res_querydomain") DNS_FUNC (ERR, struct hostent *, GETHOSTBYNAME_, gethostbyname, gethostbyname, "gethostbyname") diff --git a/src/torsocks.c b/src/torsocks.c index 5b1c16a..294e6dc 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -150,10 +150,11 @@ void torsocks_init(void) dlerror(); #ifndef USE_OLD_DLSYM #ifdef SUPPORT_RES_API - if ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) + if (((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && + ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) LOAD_ERROR("res_init", MSGERR); #endif - #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) if ((real##n = dlsym(RTLD_NEXT, m)) == NULL) LOAD_ERROR(m, MSG##e); + #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) if (((real##n = dlsym(RTLD_NEXT, m)) == NULL) && ((real##n = dlsym(RTLD_NEXT, "__" m)) == NULL)) LOAD_ERROR(m, MSG##e); #include "expansion_table.h" #undef PATCH_TABLE_EXPANSION #else @@ -856,7 +857,8 @@ int res_init(void) { int rc; - if (!realres_init && ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL)) + if (!realres_init && ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && + ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) LOAD_ERROR("res_init", MSGERR); show_msg(MSGTEST, "Got res_init request\n"); @@ -877,7 +879,8 @@ int EXPAND_GUTS_NAME(res_query)(RES_QUERY_SIGNATURE, int (*original_res_query)(R { int rc; - if (!original_res_query && ((original_res_query = dlsym(RTLD_NEXT, "res_query")) == NULL)) + if (!original_res_query && ((original_res_query = dlsym(RTLD_NEXT, "res_query")) == NULL) && + ((original_res_query = dlsym(RTLD_NEXT, "__res_query")) == NULL)) LOAD_ERROR("res_query", MSGERR); show_msg(MSGTEST, "Got res_query request\n"); @@ -903,7 +906,8 @@ int EXPAND_GUTS_NAME(res_querydomain)(RES_QUERYDOMAIN_SIGNATURE, int (*original_ int rc; if (!original_res_querydomain && - ((original_res_querydomain = dlsym(RTLD_NEXT, "res_querydomain")) == NULL)) + ((original_res_querydomain = dlsym(RTLD_NEXT, "res_querydomain")) == NULL) && + ((original_res_querydomain = dlsym(RTLD_NEXT, "__res_querydomain")) == NULL)) LOAD_ERROR("res_querydoimain", MSGERR); show_msg(MSGDEBUG, "Got res_querydomain request\n"); @@ -929,7 +933,8 @@ int EXPAND_GUTS_NAME(res_search)(RES_SEARCH_SIGNATURE, int (*original_res_search int rc; if (!original_res_search && - ((original_res_search = dlsym(RTLD_NEXT, "res_search")) == NULL)) + ((original_res_search = dlsym(RTLD_NEXT, "res_search")) == NULL) && + ((original_res_search = dlsym(RTLD_NEXT, "__res_search")) == NULL)) LOAD_ERROR("res_search", MSGERR); show_msg(MSGTEST, "Got res_search request\n"); @@ -954,7 +959,8 @@ int EXPAND_GUTS_NAME(res_send)(RES_SEND_SIGNATURE, int (*original_res_send)(RES_ { int rc; - if (!original_res_send && ((original_res_send = dlsym(RTLD_NEXT, "res_send")) == NULL)) + if (!original_res_send && ((original_res_send = dlsym(RTLD_NEXT, "res_send")) == NULL) + && ((original_res_send = dlsym(RTLD_NEXT, "__res_send")) == NULL)) LOAD_ERROR("res_send", MSGERR); show_msg(MSGTEST, "Got res_send request\n");

1 0

[torsocks/pending-changes] Add ChangeLog entry for issue 3
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 655e673ad4fbffb29b83c4e249085353b0e1bfec Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 21:39:19 2012 +0000 Add ChangeLog entry for issue 3 --- ChangeLog | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6f0ae..84a75b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Torsocks 1.3 +2012-xx-xx Unknown + o Issue 3: "... not found in any shared library. ..." + + This issue is extensively covered in the following bug report: + http://code.google.com/p/torsocks/issues/detail?id=3 + + Fixes provided by Lunar and Anthony Basile. + Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0

[torsocks/dlerror] Try both symbol names before showing library error
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 3f575e848eb77860215ba7ff39a6f629acfefc11 Author: Matthew Finkel <matthew.finkel(a)gmail.com> Date: Sat Nov 10 23:24:19 2012 -0500 Try both symbol names before showing library error The correct library we need to find may be the symbol sym or __sym or something else entirely that we can't handle yet. We want to try to find the library using both naming conventions, because they are the most common, before we display a (very repetitive) warning. Adjust macro name, check if dlerror returns null. strdup dlerror after sym not found. Give the macro a more descriptive name and add it to torsocks namespace. Also use a default "Not Found" reason if both dysym and dlerror return null. Factor out common macro --- src/common.h | 28 ++++++++++++++++++++++++++++ src/darwin_warts.c | 16 ++++------------ src/torsocks.c | 51 ++++++++++++++++++--------------------------------- 3 files changed, 50 insertions(+), 45 deletions(-) diff --git a/src/common.h b/src/common.h index 1fc4589..f84a2f7 100644 --- a/src/common.h +++ b/src/common.h @@ -47,6 +47,34 @@ #define PREDICT_UNLIKELY(exp) (exp) #endif +/** Try to find the symbol that is either m or __m. + * If one of them exists, in that order, then save its address in r, + * otherwise we want to print a message at log level l stating that + * we could not find it. + */ +#define torsocks_find_library(m,l,r) \ + do { \ + char * dl_error_msg = ""; \ + char * dl_error_msg2 = ""; \ + dlerror(); \ + if ((r = dlsym(RTLD_NEXT, m)) == NULL) { \ + dl_error_msg = dlerror(); \ + if (dl_error_msg != NULL) { \ + dl_error_msg = strdup(dl_error_msg); \ + } \ + if ((r = dlsym(RTLD_NEXT, "__" m)) == NULL) { \ + dl_error_msg2 = dlerror(); \ + show_msg(l, "WARNING: The symbol %s() was not found in any shared " \ + "library with the reported error: %s!\n" \ + " Also, we failed to find the symbol %s() with the reported error:" \ + " %s\n", m, (dl_error_msg ? dl_error_msg : "Not Found"), \ + "__"m, (dl_error_msg2 ? dl_error_msg2 : "Not Found")); \ + } \ + if (dl_error_msg) \ + free(dl_error_msg); \ + } \ + } while (0) + uint16_t get_uint16(const char *cp) ATTR_PURE ATTR_NONNULL((1)); uint32_t get_uint32(const char *cp) ATTR_PURE ATTR_NONNULL((1)); void set_uint16(char *cp, uint16_t v) ATTR_NONNULL((1)); diff --git a/src/darwin_warts.c b/src/darwin_warts.c index 4cb86f0..65bdd04 100644 --- a/src/darwin_warts.c +++ b/src/darwin_warts.c @@ -32,18 +32,12 @@ #include <stddef.h> #include <stdint.h> +#include <stdlib.h> #include <dlfcn.h> +#include <string.h> +#include <errno.h> #include "common.h" -#define LOAD_ERROR(s,l) { \ - char *error; \ - error = dlerror(); \ - show_msg(l, "The symbol %s() was not found in any shared " \ - "library. The error reported was: %s!\n", s, \ - (error)?error:"not found"); \ - dlerror(); \ - } - #define SELECT_SIGNATURE int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout #define SELECT_ARGNAMES n, readfds, writefds, exceptfds, timeout @@ -56,9 +50,7 @@ int torsocks_select_guts(SELECT_SIGNATURE, int (*original_select)(SELECT_SIGNATU int select(SELECT_SIGNATURE) { if (!realselect) { - dlerror(); - if ((realselect = dlsym(RTLD_NEXT, "select")) == NULL) - LOAD_ERROR("select", MSGERR); + torsocks_find_library("select", MSGERR, realselect); } return torsocks_select_guts(SELECT_ARGNAMES, realselect); } diff --git a/src/torsocks.c b/src/torsocks.c index 294e6dc..09d7bea 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -112,7 +112,6 @@ int res_init(void); #include "expansion_table.h" #undef PATCH_TABLE_EXPANSION - static int get_config(); static int get_environment(); static int deadpool_init(void); @@ -121,14 +120,6 @@ static pthread_mutex_t torsocks_init_mutex = PTHREAD_MUTEX_INITIALIZER; void torsocks_init(void) { -#define LOAD_ERROR(s,l) { \ - const char *error; \ - error = dlerror(); \ - if (error) \ - show_msg(l, "The symbol %s() was not found in any shared " \ - "library. The error reported was: %s!\n", s, error); \ - dlerror(); \ - } pthread_mutex_lock(&torsocks_init_mutex); show_msg(MSGDEBUG, "In torsocks_init \n"); @@ -150,11 +141,9 @@ void torsocks_init(void) dlerror(); #ifndef USE_OLD_DLSYM #ifdef SUPPORT_RES_API - if (((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && - ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) - LOAD_ERROR("res_init", MSGERR); + torsocks_find_library("res_init", MSGERR, realres_init); #endif - #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) if (((real##n = dlsym(RTLD_NEXT, m)) == NULL) && ((real##n = dlsym(RTLD_NEXT, "__" m)) == NULL)) LOAD_ERROR(m, MSG##e); + #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) torsocks_find_library(m, MSG##e, real##n); #include "expansion_table.h" #undef PATCH_TABLE_EXPANSION #else @@ -244,9 +233,7 @@ static int get_config () #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) \ r n(s##SIGNATURE) { \ if (!real##n) { \ - dlerror(); \ - if ((real##n = dlsym(RTLD_NEXT, m)) == NULL) \ - LOAD_ERROR(m, MSG##e); \ + torsocks_find_library(m, MSG##e, real##n);\ } \ return torsocks_##b##_guts(s##ARGNAMES, real##n); \ } @@ -857,9 +844,9 @@ int res_init(void) { int rc; - if (!realres_init && ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && - ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) - LOAD_ERROR("res_init", MSGERR); + if (!realres_init) { + torsocks_find_library("res_init", MSGERR, realres_init); + } show_msg(MSGTEST, "Got res_init request\n"); @@ -879,9 +866,9 @@ int EXPAND_GUTS_NAME(res_query)(RES_QUERY_SIGNATURE, int (*original_res_query)(R { int rc; - if (!original_res_query && ((original_res_query = dlsym(RTLD_NEXT, "res_query")) == NULL) && - ((original_res_query = dlsym(RTLD_NEXT, "__res_query")) == NULL)) - LOAD_ERROR("res_query", MSGERR); + if (!original_res_query) { + torsocks_find_library("res_query", MSGERR, original_res_query); + } show_msg(MSGTEST, "Got res_query request\n"); @@ -905,10 +892,9 @@ int EXPAND_GUTS_NAME(res_querydomain)(RES_QUERYDOMAIN_SIGNATURE, int (*original_ { int rc; - if (!original_res_querydomain && - ((original_res_querydomain = dlsym(RTLD_NEXT, "res_querydomain")) == NULL) && - ((original_res_querydomain = dlsym(RTLD_NEXT, "__res_querydomain")) == NULL)) - LOAD_ERROR("res_querydoimain", MSGERR); + if (!original_res_querydomain) { + torsocks_find_library("res_querydomain", MSGERR, original_res_querydomain); + } show_msg(MSGDEBUG, "Got res_querydomain request\n"); @@ -932,10 +918,9 @@ int EXPAND_GUTS_NAME(res_search)(RES_SEARCH_SIGNATURE, int (*original_res_search { int rc; - if (!original_res_search && - ((original_res_search = dlsym(RTLD_NEXT, "res_search")) == NULL) && - ((original_res_search = dlsym(RTLD_NEXT, "__res_search")) == NULL)) - LOAD_ERROR("res_search", MSGERR); + if (!original_res_search) { + torsocks_find_library("res_search", MSGERR, original_res_search); + } show_msg(MSGTEST, "Got res_search request\n"); @@ -959,9 +944,9 @@ int EXPAND_GUTS_NAME(res_send)(RES_SEND_SIGNATURE, int (*original_res_send)(RES_ { int rc; - if (!original_res_send && ((original_res_send = dlsym(RTLD_NEXT, "res_send")) == NULL) - && ((original_res_send = dlsym(RTLD_NEXT, "__res_send")) == NULL)) - LOAD_ERROR("res_send", MSGERR); + if (!original_res_send) { + torsocks_find_library("res_send", MSGERR, original_res_send); + } show_msg(MSGTEST, "Got res_send request\n");

1 0

[torsocks/dlerror] Add patch from matthew.finkel
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 2e112bfa0452aa410c6a09f10c7b9b3e98498828 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jan 26 19:30:04 2013 -0800 Add patch from matthew.finkel --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84a75b6..6578a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Torsocks 1.3 This issue is extensively covered in the following bug report: http://code.google.com/p/torsocks/issues/detail?id=3 - Fixes provided by Lunar and Anthony Basile. + Fixes provided by Lunar, Anthony Basile and Matthew Finkel Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Jan '13

26 Jan '13

commit 274060ca6d9188c76e15898cabc1ea28ebba21e7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 26 23:45:56 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/ssl-observatory.dtd | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index 9634025..35f1dd3 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -53,7 +53,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"举例而言，当您访问 https://www.something.com，观测站所收到的数字证书会显示某人已经访问过了, 但不会显示是谁访问了该站点，或者谁浏览了哪些特定的页面。移动鼠标至选项以了解更多:"> +"举例而言，当您访问了 https://www.something.com，观测站所收到的数字证书会指出某人访问了 www.something.com，但不会显示是谁访问了该站点，或者谁在那里浏览了哪些页面。移动鼠标至选项上悬停了解更多细节："> <!ENTITY ssl-observatory.prefs.hide "隐藏高级选项"> @@ -64,23 +64,23 @@ Mouseover the options for further details:">--> "我们会尽可能确保资料的匿名性，但这个选项的安全性较低"> <!ENTITY ssl-observatory.prefs.priv_dns -"送出并检查非公开域名系统网域名称的数字证书"> +"提交并检查非公开域名系统(DNS)网域名称的数字证书"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -"除非您勾选该选项，否则观测站将不会记录它透过域名系统无法读取名称之网域的电子凭证。"> +"除非您勾选该选项，否则观测站将不会记录它透过域名系统(DNS)无法读取名称之网域的电子证书。"> <!ENTITY ssl-observatory.prefs.show "显示高级选项"> -<!ENTITY ssl-observatory.prefs.title "您的 SSL 观测站使用偏好"> +<!ENTITY ssl-observatory.prefs.title "SSL 观测站使用偏好"> -<!ENTITY ssl-observatory.prefs.use "是否使用观测站?"> +<!ENTITY ssl-observatory.prefs.use "是否使用观测站？"> <!ENTITY ssl-observatory.warning.title "EFF 的 SSL 观测站所发布的警告"> <!ENTITY ssl-observatory.warning.showcert "显示数字证书链"> -<!ENTITY ssl-observatory.warning.okay "我了解"> -<!ENTITY ssl-observatory.warning.text "EFF 的 SSL 观测站已对该 HTTPS 数字证书发出警告:"> -<!ENTITY ssl-observatory.warning.defense "如果您已登录过该站点，一旦下次您有一个安全的连接可用时，您可能会需要更改您在该站点的密码。"> +<!ENTITY ssl-observatory.warning.okay "我已了解"> +<!ENTITY ssl-observatory.warning.text "EFF 的 SSL 观测站已对该 HTTPS 数字证书发出警告："> +<!ENTITY ssl-observatory.warning.defense "如果您已登录过该站点，一旦下次您有一个安全的连接可用时，建议您更改您在该站点的密码。"> <!ENTITY ssl-observatory.prefs.self_signed -"提交以检查自签名证书"> +"提交并检查自签名证书"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"我们推荐这项;在自签名的嵌入式设备中，加密问题特别常见。"> +"我们推荐这项；在自签名的嵌入式设备中，加密问题尤为常见。">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Jan '13

26 Jan '13

commit 29ed7ea4a4a4a2b57b95eaad7b073780c7bdb21a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 26 23:45:51 2013 +0000 Update translations for https_everywhere --- zh-CN/ssl-observatory.dtd | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index 9634025..35f1dd3 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -53,7 +53,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"举例而言，当您访问 https://www.something.com，观测站所收到的数字证书会显示某人已经访问过了, 但不会显示是谁访问了该站点，或者谁浏览了哪些特定的页面。移动鼠标至选项以了解更多:"> +"举例而言，当您访问了 https://www.something.com，观测站所收到的数字证书会指出某人访问了 www.something.com，但不会显示是谁访问了该站点，或者谁在那里浏览了哪些页面。移动鼠标至选项上悬停了解更多细节："> <!ENTITY ssl-observatory.prefs.hide "隐藏高级选项"> @@ -64,23 +64,23 @@ Mouseover the options for further details:">--> "我们会尽可能确保资料的匿名性，但这个选项的安全性较低"> <!ENTITY ssl-observatory.prefs.priv_dns -"送出并检查非公开域名系统网域名称的数字证书"> +"提交并检查非公开域名系统(DNS)网域名称的数字证书"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -"除非您勾选该选项，否则观测站将不会记录它透过域名系统无法读取名称之网域的电子凭证。"> +"除非您勾选该选项，否则观测站将不会记录它透过域名系统(DNS)无法读取名称之网域的电子证书。"> <!ENTITY ssl-observatory.prefs.show "显示高级选项"> -<!ENTITY ssl-observatory.prefs.title "您的 SSL 观测站使用偏好"> +<!ENTITY ssl-observatory.prefs.title "SSL 观测站使用偏好"> -<!ENTITY ssl-observatory.prefs.use "是否使用观测站?"> +<!ENTITY ssl-observatory.prefs.use "是否使用观测站？"> <!ENTITY ssl-observatory.warning.title "EFF 的 SSL 观测站所发布的警告"> <!ENTITY ssl-observatory.warning.showcert "显示数字证书链"> -<!ENTITY ssl-observatory.warning.okay "我了解"> -<!ENTITY ssl-observatory.warning.text "EFF 的 SSL 观测站已对该 HTTPS 数字证书发出警告:"> -<!ENTITY ssl-observatory.warning.defense "如果您已登录过该站点，一旦下次您有一个安全的连接可用时，您可能会需要更改您在该站点的密码。"> +<!ENTITY ssl-observatory.warning.okay "我已了解"> +<!ENTITY ssl-observatory.warning.text "EFF 的 SSL 观测站已对该 HTTPS 数字证书发出警告："> +<!ENTITY ssl-observatory.warning.defense "如果您已登录过该站点，一旦下次您有一个安全的连接可用时，建议您更改您在该站点的密码。"> <!ENTITY ssl-observatory.prefs.self_signed -"提交以检查自签名证书"> +"提交并检查自签名证书"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"我们推荐这项;在自签名的嵌入式设备中，加密问题特别常见。"> +"我们推荐这项；在自签名的嵌入式设备中，加密问题尤为常见。">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Jan '13

26 Jan '13

commit f0d2339f5b93b470264b8dfb3e50f764a9f4aa44 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 26 23:15:56 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 10 +++++----- zh-CN/https-everywhere.properties | 4 ++-- zh-CN/ssl-observatory.dtd | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index cb46d72..4a0239e 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -1,6 +1,6 @@ <!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.ext_description "加密您的互联网浏览！自动使用 HTTPS 连接访问站点以增强安全性。"> <!ENTITY https-everywhere.about.version "版本"> <!ENTITY https-everywhere.about.created_by "作者"> <!ENTITY https-everywhere.about.librarians "规则管理员"> @@ -10,7 +10,7 @@ <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.donate_eff "捐助电子前线基金会(EFF)"> -<!ENTITY https-everywhere.menu.about "有关 HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "关于 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL 观测站 Observatory 使用偏好"> <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> @@ -24,11 +24,11 @@ <!ENTITY https-everywhere.prefs.notes "附注"> <!ENTITY https-everywhere.prefs.list_caption "应该启用哪些 HTTPS 重定向规则？"> <!ENTITY https-everywhere.prefs.enabled "已开启"> -<!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则(以增加对其他网站的支持）"> +<!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "点击这里"> -<!ENTITY https-everywhere.prefs.toggle "选项"> +<!ENTITY https-everywhere.prefs.toggle "切换"> <!ENTITY https-everywhere.prefs.reset_default "重设为默认"> -<!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的原始代码"> +<!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> <!ENTITY https-everywhere.source.downloading "下载中"> <!ENTITY https-everywhere.source.filename "文件名"> diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 571987b..4bec606 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = 开启 HTTPS Everywhere https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere https-everywhere.menu.enableDisable = 启动/禁用规则 -https-everywhere.menu.noRules = (此页面没有定义规则) -https-everywhere.menu.unknownRules = (此页面规则未知) +https-everywhere.menu.noRules = （对此页面没有规则） +https-everywhere.menu.unknownRules = （对此页面的规则未知） diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index d72f2b1..9634025 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -18,33 +18,33 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"除非您所使用的是一个侵入性非常高的公司网络，一般情况下开启这个功能是安全的:"> +"除非您所使用的是一个侵入性非常高的公司网络，一般情况下开启这个功能是安全的："> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"除非您使用的公司网络中包含私密的内网服务器域名，一般情况下开启这个功能是安全的:"> +"除非您使用包含私密的内网服务器域名的公司网络，一般情况下开启这个功能是安全的："> <!ENTITY ssl-observatory.prefs.alt_roots "提交并检查由非标准根 CA 所签名的证书"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"除非您使用的是一个侵入性高的公司网络，或是通过一个本地 TLS 代理服务器和私有根证书管理中心来监测您的浏览行为的卡巴斯基反病毒软件，一般情况下开启这项功能是安全的（且有好处的）。如果在这样的网络上开启这项功能，由于其所产生的独特数字证书，这个选项可能会公开透过这种代理服务器 (proxy) 访问的 https// 网域名称，因此我们通常情况下关闭该功能。"> +"除非您使用的是一个侵入性高的公司网络，或是通过本地 TLS 代理服务器和私有根证书认证方来监测您的浏览行为的卡巴斯基反病毒软件，一般情况下开启此选项是安全的且有好处的。如果在这样的网络上开启这项功能，由于其所产生的唯一数字证书，这个选项可能会公开透过这种代理服务器 (proxy) 访问的 https:// 网域名称，因此我们默认情况下关闭该功能。"> <!ENTITY ssl-observatory.prefs.anonymous "通过 Tor 网络进行数字证书的检查，以保护匿名性"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"通过 Tor 网络进行数字证书的检查，以保护匿名性 (需要有 Torbutton)"> +"通过 Tor 网络进行数字证书的检查，以保护匿名性（需要有 Tor）"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"启用该选项需要已经安装 Tor 和 Torbutton"> +"此选项需要已经安装并运行 Tor"> <!ENTITY ssl-observatory.prefs.asn -"当您看到新的数字证书，请告诉观测站您当前使用的互联网服务提供商(ISP)是哪个"> +"当您看到一个新的数字证书，告知观测站您当前使用的互联网服务提供商(ISP)"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"这个动作会抓取你的网络的自动系统号码("Autonomous System number")，并将之送出。这将有助于我们找到对于 HTTPS 发动攻击的源头，并判断我们是否在伊朗或叙利亚等攻击容易发生的地方的网路已经观测过相同或类似的攻击。"> +"这将会抓取您网络的自治系统号码("Autonomous System number")并发送。这将有助于我们找出对 HTTPS 发动攻击的源头，并判断我们是否如在伊朗或叙利亚等容易发生攻击的地方的网路已经观测过相同或类似的攻击。"> <!ENTITY ssl-observatory.prefs.done "完成"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能： (1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人( 'man in the middle') 式的攻击并提高网络的安全性并且 (2) 让我们针对不安全的连接以及对您的浏览器进行的攻击向你发出警告。"> +"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能： (1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人式的攻击并改善网络的安全性并且 (2) 让我们针对不安全的连接以及对您的浏览器进行的攻击向您发出警告。"> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Jan '13

26 Jan '13

commit 2bc149ee15a1239bf50edbe37af481bf39604e1d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 26 23:15:51 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 10 +++++----- zh-CN/https-everywhere.properties | 4 ++-- zh-CN/ssl-observatory.dtd | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index cb46d72..4a0239e 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -1,6 +1,6 @@ <!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.ext_description "加密您的互联网浏览！自动使用 HTTPS 连接访问站点以增强安全性。"> <!ENTITY https-everywhere.about.version "版本"> <!ENTITY https-everywhere.about.created_by "作者"> <!ENTITY https-everywhere.about.librarians "规则管理员"> @@ -10,7 +10,7 @@ <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.donate_eff "捐助电子前线基金会(EFF)"> -<!ENTITY https-everywhere.menu.about "有关 HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "关于 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL 观测站 Observatory 使用偏好"> <!ENTITY https-everywhere.menu.globalEnable "启用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> @@ -24,11 +24,11 @@ <!ENTITY https-everywhere.prefs.notes "附注"> <!ENTITY https-everywhere.prefs.list_caption "应该启用哪些 HTTPS 重定向规则？"> <!ENTITY https-everywhere.prefs.enabled "已开启"> -<!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则(以增加对其他网站的支持）"> +<!ENTITY https-everywhere.prefs.ruleset_howto "您可以学习如何编写您自己的规则（以增加对其他网站的支持）"> <!ENTITY https-everywhere.prefs.here_link "点击这里"> -<!ENTITY https-everywhere.prefs.toggle "选项"> +<!ENTITY https-everywhere.prefs.toggle "切换"> <!ENTITY https-everywhere.prefs.reset_default "重设为默认"> -<!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的原始代码"> +<!ENTITY https-everywhere.prefs.view_xml_source "查看 XML 格式的源代码"> <!ENTITY https-everywhere.source.downloading "下载中"> <!ENTITY https-everywhere.source.filename "文件名"> diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 571987b..4bec606 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = 开启 HTTPS Everywhere https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere https-everywhere.menu.enableDisable = 启动/禁用规则 -https-everywhere.menu.noRules = (此页面没有定义规则) -https-everywhere.menu.unknownRules = (此页面规则未知) +https-everywhere.menu.noRules = （对此页面没有规则） +https-everywhere.menu.unknownRules = （对此页面的规则未知） diff --git a/zh-CN/ssl-observatory.dtd b/zh-CN/ssl-observatory.dtd index d72f2b1..9634025 100644 --- a/zh-CN/ssl-observatory.dtd +++ b/zh-CN/ssl-observatory.dtd @@ -18,33 +18,33 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"除非您所使用的是一个侵入性非常高的公司网络，一般情况下开启这个功能是安全的:"> +"除非您所使用的是一个侵入性非常高的公司网络，一般情况下开启这个功能是安全的："> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"除非您使用的公司网络中包含私密的内网服务器域名，一般情况下开启这个功能是安全的:"> +"除非您使用包含私密的内网服务器域名的公司网络，一般情况下开启这个功能是安全的："> <!ENTITY ssl-observatory.prefs.alt_roots "提交并检查由非标准根 CA 所签名的证书"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"除非您使用的是一个侵入性高的公司网络，或是通过一个本地 TLS 代理服务器和私有根证书管理中心来监测您的浏览行为的卡巴斯基反病毒软件，一般情况下开启这项功能是安全的（且有好处的）。如果在这样的网络上开启这项功能，由于其所产生的独特数字证书，这个选项可能会公开透过这种代理服务器 (proxy) 访问的 https// 网域名称，因此我们通常情况下关闭该功能。"> +"除非您使用的是一个侵入性高的公司网络，或是通过本地 TLS 代理服务器和私有根证书认证方来监测您的浏览行为的卡巴斯基反病毒软件，一般情况下开启此选项是安全的且有好处的。如果在这样的网络上开启这项功能，由于其所产生的唯一数字证书，这个选项可能会公开透过这种代理服务器 (proxy) 访问的 https:// 网域名称，因此我们默认情况下关闭该功能。"> <!ENTITY ssl-observatory.prefs.anonymous "通过 Tor 网络进行数字证书的检查，以保护匿名性"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"通过 Tor 网络进行数字证书的检查，以保护匿名性 (需要有 Torbutton)"> +"通过 Tor 网络进行数字证书的检查，以保护匿名性（需要有 Tor）"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"启用该选项需要已经安装 Tor 和 Torbutton"> +"此选项需要已经安装并运行 Tor"> <!ENTITY ssl-observatory.prefs.asn -"当您看到新的数字证书，请告诉观测站您当前使用的互联网服务提供商(ISP)是哪个"> +"当您看到一个新的数字证书，告知观测站您当前使用的互联网服务提供商(ISP)"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"这个动作会抓取你的网络的自动系统号码("Autonomous System number")，并将之送出。这将有助于我们找到对于 HTTPS 发动攻击的源头，并判断我们是否在伊朗或叙利亚等攻击容易发生的地方的网路已经观测过相同或类似的攻击。"> +"这将会抓取您网络的自治系统号码("Autonomous System number")并发送。这将有助于我们找出对 HTTPS 发动攻击的源头，并判断我们是否如在伊朗或叙利亚等容易发生攻击的地方的网路已经观测过相同或类似的攻击。"> <!ENTITY ssl-observatory.prefs.done "完成"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能： (1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人( 'man in the middle') 式的攻击并提高网络的安全性并且 (2) 让我们针对不安全的连接以及对您的浏览器进行的攻击向你发出警告。"> +"HTTPS Everywhere 可以使用 EFF 的 SSL 观测站。这有两个功能： (1) 将 HTTPS 数字证书寄送到观测站，以协助我们侦测中间人式的攻击并改善网络的安全性并且 (2) 让我们针对不安全的连接以及对您的浏览器进行的攻击向您发出警告。"> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0