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

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 7056f3cd803ed5fc63b8a350c944bda4e898e9b6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 21:46:09 2013 +0000 Update translations for https_everywhere_completed --- ar/ssl-observatory.dtd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index 4ddff77..816fde5 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -20,16 +20,16 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"إذا كنت تستخدم الإنترنت ضمن شبكة شركة ذات إعدادات خاصة:"> +"استخدام تلك الخاصية آمن إلا إذا كنت تستخدم الإنترنت ضمن شبكة شركة ذات إعدادات رقابية:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"آمنة إذا إذا كنت تستخدم شبكة شركة تستخدم أسماء سرية لمخدمات الإنترانت:"> +"آمن، إلا إذا كنت تستخدم شبكة شركة داخلية تستخدم أسماء سرية لخوادمها:"> <!ENTITY ssl-observatory.prefs.alt_roots -"أرسل وتحقق من الشهادات الموقعة بواسطة non-standard root CAs"> +"أرسل وتحقق من الشهادات الموقعة بواسطة سلطة غير معتمدة."> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"من الآمن (والمستحسن) تفعيل هذا الخيار، إلا إذا كنت تستخدم شبكة شركة تطفلية أو برنامج Kaspersky antivirus الذي يراقب تصفحك مع بروكسيات TLS و private root Certificate Authority. إن تم التفعيل على شبكة مماثلة، قد ينشر هذا الخيار أدلة على أي نطاقات +"من الآمن (والمستحسن) تفعيل هذا الخيار، إلا إذا كنت تستخدم شبكة شركة تطفلية أو برنامج كاسبرسكي المضاد للڤيروسات الذي يراقب تصفحك عن طريق TLS بروكسي و private root Certificate Authority. إن تم التفعيل على شبكة مماثلة، قد ينشر هذا الخيار أدلة على أي نطاقات https:// domains تمت زيارتها عبر ذاك البروكسي، وذلك بسبب الشهادات الفريدة التي يمكن أن ينتجها. ولذلك نحن نتركه غير مفعل في الإعدادات الافتراضية."> <!ENTITY ssl-observatory.prefs.anonymous "تحقق من الشهادات باستخدام تور لإخفاء الهوية">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit ead27c154f9c2c919a6fe0ef4d0ed84f1b19882a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 21:46:02 2013 +0000 Update translations for https_everywhere --- ar/ssl-observatory.dtd | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index 4ddff77..cf4216c 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -20,13 +20,13 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"إذا كنت تستخدم الإنترنت ضمن شبكة شركة ذات إعدادات خاصة:"> +"استخدام تلك الخاصية آمن إلا إذا كنت تستخدم الإنترنت ضمن شبكة شركة ذات إعدادات رقابية:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"آمنة إذا إذا كنت تستخدم شبكة شركة تستخدم أسماء سرية لمخدمات الإنترانت:"> +"آمن، إلا إذا كنت تستخدم شبكة شركة داخلية تستخدم أسماء سرية لخوادمها:"> <!ENTITY ssl-observatory.prefs.alt_roots -"أرسل وتحقق من الشهادات الموقعة بواسطة non-standard root CAs"> +"أرسل وتحقق من الشهادات الموقعة بواسطة سلطة غير معتمدة."> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "من الآمن (والمستحسن) تفعيل هذا الخيار، إلا إذا كنت تستخدم شبكة شركة تطفلية أو برنامج Kaspersky antivirus الذي يراقب تصفحك مع بروكسيات TLS و private root Certificate Authority. إن تم التفعيل على شبكة مماثلة، قد ينشر هذا الخيار أدلة على أي نطاقات

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit eb3dcbb7cabfda49eb1a7c3bb1fc4975cf60ec07 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 21:16:12 2013 +0000 Update translations for https_everywhere_completed --- ar/ssl-observatory.dtd | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index a0c383e..4ddff77 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -3,7 +3,9 @@ <!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 Observatory?"> +"هل تريد أن يستخدم HTTPS Everywhere خاصية SSL Observatory?"> <!ENTITY ssl-observatory.popup.yes "نعم">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit ae7e34418c4da24ebe509e004ee8068a110c1c76 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 21:16:06 2013 +0000 Update translations for https_everywhere --- ar/ssl-observatory.dtd | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index a0c383e..4ddff77 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -3,7 +3,9 @@ <!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 Observatory?"> +"هل تريد أن يستخدم HTTPS Everywhere خاصية SSL Observatory?"> <!ENTITY ssl-observatory.popup.yes "نعم">

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 2cc706977353ab547b8cf0cee820c93a7e988311 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 21:15:46 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/running.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index bc0466a..f0f9358 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 18:57+0000\n" +"PO-Revision-Date: 2013-04-29 20:47+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -105,7 +105,7 @@ msgstr "<a name=\"monitoring\"/>" #. type: Content of: <html><body><h3> #: en/running.html:58 msgid "Monitoring Tor's Status" -msgstr "监控Tor的状态" +msgstr "监控 Tor 的状态" #. type: Content of: <html><body> #: en/running.html:60

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 326f553e35950518713b5ddc3a7bbd69d8cee1e6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 21:15:34 2013 +0000 Update translations for vidalia_help --- zh_CN/running.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index bc0466a..f0f9358 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 18:57+0000\n" +"PO-Revision-Date: 2013-04-29 20:47+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -105,7 +105,7 @@ msgstr "<a name=\"monitoring\"/>" #. type: Content of: <html><body><h3> #: en/running.html:58 msgid "Monitoring Tor's Status" -msgstr "监控Tor的状态" +msgstr "监控 Tor 的状态" #. type: Content of: <html><body> #: en/running.html:60

1 0

[tor-launcher/master] Display help@rt.torproject.org in Network Settings.
by brade＠torproject.org 29 Apr '13

29 Apr '13

commit 748564586b231b43b98e06d86192d1ad33b7fb92 Author: Kathy Brade <brade(a)torproject.org> Date: Mon Apr 29 16:42:20 2013 -0400 Display help(a)rt.torproject.org in Network Settings. --- src/chrome/content/network-settings-wizard.xul | 4 +++- src/chrome/content/network-settings.js | 10 ++++++++++ src/chrome/content/network-settings.xul | 3 ++- src/chrome/locale/en/torlauncher.properties | 2 ++ src/chrome/skin/network-settings.css | 10 +++++++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 249c9ce..2316db6 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -35,7 +35,6 @@ <separator orient="vertical" /> <groupbox flex="1"> <description>&torsettings.prompt;</description> - <separator orient="horizontal" class="thin" /> </groupbox> </hbox> <separator /> @@ -127,4 +126,7 @@ <description>&torsettings.bridgeHelp3;</description> </wizardpage> + <hbox pack="start"> + <label id="forAssistance" /> + </hbox> </wizard> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 904e5f8..0af6d90 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -15,6 +15,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); + +const kSupportAddr = "help(a)rt.torproject.org"; + const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; @@ -55,6 +58,13 @@ var gRestoreAfterHelpPanelID = null; function initDialog() { + var forAssistance = document.getElementById("forAssistance"); + if (forAssistance) + { + forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( + "forAssistance", [kSupportAddr], 1); + } + var cancelBtn = document.documentElement.getButton("cancel"); gIsInitialBootstrap = window.arguments[0]; if (gIsInitialBootstrap) diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 7de2f60..f88b178 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -70,5 +70,6 @@ <description>&torsettings.bridgeHelp3;</description> </vbox> </deck> - <spring /> + <spring flex="1" /> + <label id="forAssistance" /> </dialog> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 362f122..5ed593a 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -26,3 +26,5 @@ torlauncher.connect=Connect torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done + +torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9970585..c826358 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -7,16 +7,24 @@ dialog { width: 520px; - height: 440px; + height: 464px; font: -moz-dialog; } wizard { width: 540px; + height: 410px; font: -moz-dialog; padding-top: 0px; } +#forAssistance { + margin-bottom: 6px; + -moz-user-select: text; + -moz-user-focus: normal; + cursor: text; +} + wizard label { margin: 0px; }

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 009e4feb16484836107e5512fff1897f09eec233 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 19:15:46 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/running.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index 0ffd3f9..bc0466a 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 15:12+0000\n" +"PO-Revision-Date: 2013-04-29 18:57+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "。" msgid "" "Vidalia's tray icon will change from an onion with a red X to a green onion " "when Tor has started." -msgstr "当Tor开启时，Vidalia在系统托盘上的图标会从有X的红色洋葱变成绿色洋葱。" +msgstr "当 Tor 开启时，系统托盘上的 Vidalia 图标将从带有 X 号的红色洋葱变成绿色洋葱。" #. type: Content of: <html><body> #: en/running.html:36 @@ -69,12 +69,12 @@ msgid "" "telling you what went wrong. You can also look at your <a " "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." -msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来查看 Tor 是否提供了更多有关何处出错的信息。" +msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可通过<a href=\"log.html\">消息日志</a>查看 Tor 是否提供了更多有关错误的信息。" #. type: Content of: <html><body> #: en/running.html:43 msgid "To stop Tor," -msgstr "停止 Tor," +msgstr "如需停止 Tor，" #. type: Content of: <html><body><ol><li> #: en/running.html:45

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit ffe5387adad0d6325bf73d316b43755c1fd58272 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 19:15:34 2013 +0000 Update translations for vidalia_help --- zh_CN/running.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index 0ffd3f9..bc0466a 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-29 15:12+0000\n" +"PO-Revision-Date: 2013-04-29 18:57+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "。" msgid "" "Vidalia's tray icon will change from an onion with a red X to a green onion " "when Tor has started." -msgstr "当Tor开启时，Vidalia在系统托盘上的图标会从有X的红色洋葱变成绿色洋葱。" +msgstr "当 Tor 开启时，系统托盘上的 Vidalia 图标将从带有 X 号的红色洋葱变成绿色洋葱。" #. type: Content of: <html><body> #: en/running.html:36 @@ -69,12 +69,12 @@ msgid "" "telling you what went wrong. You can also look at your <a " "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." -msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来查看 Tor 是否提供了更多有关何处出错的信息。" +msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可通过<a href=\"log.html\">消息日志</a>查看 Tor 是否提供了更多有关错误的信息。" #. type: Content of: <html><body> #: en/running.html:43 msgid "To stop Tor," -msgstr "停止 Tor," +msgstr "如需停止 Tor，" #. type: Content of: <html><body><ol><li> #: en/running.html:45

1 0

[tor-launcher/master] Ensure that control connection I/O is unbuffered (see bug 8642).
by brade＠torproject.org 29 Apr '13

29 Apr '13

commit bded277453e87892eca5a2834ecce079accf88a9 Author: Kathy Brade <brade(a)torproject.org> Date: Mon Apr 29 14:42:48 2013 -0400 Ensure that control connection I/O is unbuffered (see bug 8642). Also added a 15 second socket read/write timeout and fixed a problem where the main control port connection was closed by mistake after an authentication error occurred on the event monitor connection. --- src/components/tl-protocol.js | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d1a8f84..2ff5ab7 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -392,6 +392,13 @@ TorProtocolService.prototype = return; var conn = this._openAuthenticatedConnection(true); + if (!conn) + { + TorLauncherLogger.log(4, + "TorStartEventMonitor failed to create control port connection"); + return; + } + // TODO: optionally monitor INFO and DEBUG log messages. var events = "STATUS_CLIENT NOTICE WARN ERR"; var reply = this._sendCommand(conn, "SETEVENTS", events); @@ -506,10 +513,21 @@ TorProtocolService.prototype = this.mControlHost + ":" + this.mControlPort); var socket = sts.createTransport(null, 0, this.mControlHost, this.mControlPort, null); + + // Our event monitor connection is non-blocking and unbuffered (an + // asyncWait() call is used so we only read data when we know that + // some is available). + // Our main control connection is blocking and unbuffered (using + // buffering may prevent data from being sent before we enter a + // blocking readBytes() call. var flags = (aIsEventConnection) ? 0 : socket.OPEN_BLOCKING | socket.OPEN_UNBUFFERED; - var inStream = socket.openInputStream(flags, 0, 0); - var outStream = socket.openOutputStream(flags, 0, 0); + // If using a blocking socket, we set segment size and count to 1 to + // avoid buffering inside the Mozilla code. See Tor ticket # 8642. + var segSize = (aIsEventConnection) ? 0 : 1; + var segCount = (aIsEventConnection) ? 0 : 1; + var inStream = socket.openInputStream(flags, segSize, segCount); + var outStream = socket.openOutputStream(flags, segSize, segCount); var binInStream = Cc["@mozilla.org/binaryinputstream;1"] .createInstance(Ci.nsIBinaryInputStream); @@ -574,6 +592,21 @@ TorProtocolService.prototype = this.mControlConnection = null; }, + _setSocketTimeout: function(aConn) + { + if (aConn && aConn.socket) + aConn.socket.setTimeout(Ci.nsISocketTransport.TIMEOUT_READ_WRITE, 15); + }, + + _clearSocketTimeout: function(aConn) + { + if (aConn && aConn.socket) + { + var secs = Math.pow(2,32) - 1; // UINT32_MAX + aConn.socket.setTimeout(Ci.nsISocketTransport.TIMEOUT_READ_WRITE, secs); + } + }, + _sendCommand: function(aConn, aCmd, aArgs) { var reply; @@ -586,8 +619,11 @@ TorProtocolService.prototype = cmd += "\r\n"; ++aConn.useCount; + this._setSocketTimeout(aConn); + // TODO: should handle NS_BASE_STREAM_WOULD_BLOCK here. aConn.binOutStream.writeBytes(cmd, cmd.length); reply = this._torReadReply(aConn.binInStream); + this._clearSocketTimeout(aConn); } return reply;

1 0