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

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

30 Apr '13

commit 4784fb0e97030ae40e9cc56a7461811ddede1073 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 18:16:01 2013 +0000 Update translations for https_everywhere --- ar/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ssl-observatory.dtd b/ar/ssl-observatory.dtd index 94e4e34..d54c7c1 100644 --- a/ar/ssl-observatory.dtd +++ b/ar/ssl-observatory.dtd @@ -38,10 +38,10 @@ to turn it on?">--> "يتطلب هذا الخيار تنصيب كل من تور وإضافة Torbutton على المتصفح"> <!ENTITY ssl-observatory.prefs.asn -"عندما ترى شهادة جديدة، أخبر المرصد عن هوية مقدم خدمة الإنترنت الذي تتصل عبره."> +"عندما ترى شهادة جديدة، أخبر المرصد عن هوية مزود خدمة الإنترنت الخاص بك."> <!ENTITY ssl-observatory.prefs.asn_tooltip -"هذا سيرسل "رقم نظام الحكم الذاتي" الخاص بشبكتك. هذا سيساعدنا على تحديد موقع الهجمات على HTTPS، وتحديد ما إذا كان لدينا ملاحظات من شبكات في أماكن مثل سوريا وإيران حيث هذه الهجمات شائعة نسبياً."> +"هذا سيجلب و يرسل "رقم النظام المستقل" الخاص بشبكتك. هذا سيساعدنا على تحديد موقع الهجمات على HTTPS، وتحديد ما إذا كان لدينا ملاحظات من شبكات في أماكن مثل سوريا وإيران حيث هذه الهجمات شائعة نسبياً."> <!ENTITY ssl-observatory.prefs.done "انتهى">

1 0

[tor-launcher/master] Improve Windows and Linux look and feel.
by brade＠torproject.org 30 Apr '13

30 Apr '13

commit 270bb21f252f144780eb8304bee944c7a3ae5b1c Author: Kathleen Brade <brade(a)pearlcrescent.com> Date: Tue Apr 30 14:11:24 2013 -0400 Improve Windows and Linux look and feel. --- src/chrome/content/network-settings-overlay.xul | 1 + src/chrome/content/network-settings-wizard.xul | 16 +++++++----- src/chrome/content/network-settings.js | 29 ++++++++++++++++------ src/chrome/content/network-settings.xul | 6 ++-- src/chrome/content/progress.js | 2 +- src/chrome/content/progress.xul | 6 ++-- src/chrome/skin/network-settings.css | 8 ++++++ 7 files changed, 46 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 64dc366..05479d0 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -49,6 +49,7 @@ <hbox align="center"> <menulist id="proxyType" oncommand="onProxyTypeChange()"> <menupopup id="proxyType_menuPopup"> + <menuitem label="-" value="" selected="true" /> <menuitem label="&torsettings.useProxy.type.socks4;" value="SOCKS4"/> <menuitem label="&torsettings.useProxy.type.socks5;" diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 2316db6..1b163f3 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -18,7 +18,7 @@ title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttonlabelextra1="&torsettings.copyLog;" + buttonlabelextra2="&torsettings.copyLog;" onwizardfinish="return applySettings();" onwizardcancel="return onCancel();" onload="initDialog();"> @@ -26,7 +26,8 @@ <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> - <wizardpage label=" " pageid="proxy" next="firewall" onextra1="onCopyLog();" + <wizardpage label=" " pageid="proxy" next="firewall" onextra2="onCopyLog();" + onpageshow="showOrHideButton('next', true, true)" onpageadvanced="return onWizardProxyNext(this);"> <hbox class="tbb-header"> <vbox class="tbb-logo-box" align="start"> @@ -51,7 +52,7 @@ </hbox> </wizardpage> - <wizardpage pageid="proxyYES" next="firewall" onextra1="onCopyLog();" + <wizardpage pageid="proxyYES" next="firewall" onextra2="onCopyLog();" onpageadvanced="return (getAndValidateProxySettings() != null)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -61,7 +62,8 @@ <groupbox id="proxySpecificSettings" /> </wizardpage> - <wizardpage pageid="firewall" next="bridges" onextra1="onCopyLog();" + <wizardpage pageid="firewall" next="bridges" onextra2="onCopyLog();" + onpageshow="showOrHideButton('next', true, true)" onpageadvanced="return onWizardFirewallNext(this);"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -80,7 +82,7 @@ </hbox> </wizardpage> - <wizardpage pageid="firewallYES" next="bridges" onextra1="onCopyLog();" + <wizardpage pageid="firewallYES" next="bridges" onextra2="onCopyLog();" onpageadvanced="return (getAndValidateFirewallSettings() != null)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -92,7 +94,7 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="bridges" onextra1="onCopyLog();" + <wizardpage label=" " pageid="bridges" onextra2="onCopyLog();" onpageshow="showOrHideButton('finish', true, true)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -115,7 +117,7 @@ </wizardpage> <wizardpage label=" " pageid="errorPanel" next="notUsed" - onextra1="onCopyLog();"> + onextra2="onCopyLog();"> </wizardpage> <wizardpage class="help" label=" " pageid="bridgeHelp" next="notUsed" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 6123b15..b2c94a4 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -104,11 +104,11 @@ function initDialog() if (haveWizard) { // Set "Copy Tor Log" label and move it after the Quit (cancel) button. - var copyLogBtn = document.documentElement.getButton("extra1"); + var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { - copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra1"); - if (cancelBtn && !TorLauncherUtil.isWindows) + copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra2"); + if (cancelBtn && TorLauncherUtil.isMac) cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); } @@ -119,6 +119,19 @@ function initDialog() var finishBtn = document.documentElement.getButton("finish"); if (finishBtn) finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); + + // Add label and access key to Help button. + var helpBtn = document.documentElement.getButton("help"); + if (helpBtn) + { + var strBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService) + .createBundle("chrome://global/locale/dialog.properties"); + helpBtn.setAttribute("label", strBundle.GetStringFromName("button-help")); + var accessKey = strBundle.GetStringFromName("accesskey-help"); + if (accessKey) + helpBtn.setAttribute("accesskey", accessKey); + } } gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); @@ -250,7 +263,7 @@ function showPanel(aPanelID) if (deckElem) { deckElem.selectedPanel = document.getElementById(aPanelID); - showOrHideButton("extra1", (aPanelID != "bridgeHelp"), false); + showOrHideButton("extra2", (aPanelID != "bridgeHelp"), false); } else getWizard().goTo(aPanelID); @@ -270,7 +283,7 @@ function wizardShowCopyLogButton() { if (getWizard()) { - var copyLogBtn = document.documentElement.getButton("extra1"); + var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { copyLogBtn.setAttribute("wizardCanCopyLog", true); @@ -423,7 +436,7 @@ function onOpenHelp() { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); - showOrHideButton("extra1", false, false); + showOrHideButton("extra2", false, false); overrideButtonLabel("next", "done"); } else @@ -442,7 +455,7 @@ function closeHelp() { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - var copyLogBtn = document.documentElement.getButton("extra1"); + var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog")) copyLogBtn.removeAttribute("hidden"); restoreButtonLabel("next"); @@ -876,7 +889,7 @@ function showSaveSettingsAlert(aDetails) "failed_to_save_settings", [aDetails], 1); TorLauncherUtil.showAlert(window, s); - showOrHideButton("extra1", true, false); + showOrHideButton("extra2", true, false); gWizIsCopyLogBtnShowing = true; } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index f88b178..d05f4e8 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -18,11 +18,11 @@ title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttons="accept,cancel,extra1,help" - buttonlabelextra1="&torsettings.copyLog;" + buttons="accept,cancel,extra2,help" + buttonlabelextra2="&torsettings.copyLog;" ondialogaccept="return applySettings();" ondialogcancel="return onCancel();" - ondialogextra1="onCopyLog();" + ondialogextra2="onCopyLog();" ondialoghelp="onOpenHelp();" onload="initDialog();"> diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 803399f..3a40dbf 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -41,7 +41,7 @@ function initDialog() if (gOpenerCallbackFunc) { // Dialog was opened from network settings: hide Open Settings button. - var extraBtn = document.documentElement.getButton("extra1"); + var extraBtn = document.documentElement.getButton("extra2"); extraBtn.setAttribute("hidden", true); } else diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index 198f20f..d322c1d 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -16,10 +16,10 @@ title="&torprogress.dialog.title;" windowtype="TorLauncher:Progress" persist="screenX screenY" - buttons="cancel,extra1" - buttonlabelextra1="&torprogress.openSettings;" + buttons="cancel,extra2" + buttonlabelextra2="&torprogress.openSettings;" ondialogcancel="return onCancel();" - ondialogextra1="onOpenSettings();" + ondialogextra2="onOpenSettings();" onload="initDialog();"> <script type="application/x-javascript" diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c826358..a7064eb 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -18,7 +18,15 @@ wizard { padding-top: 0px; } +.wizard-page-box { + padding: 0px; + margin: 20px; +} + +wizard .wizard-header { display: none; } + #forAssistance { + margin-left: 12px; margin-bottom: 6px; -moz-user-select: text; -moz-user-focus: normal;

1 0

r26178: {website} update mirror table. (website/trunk/include)
by Andrew Lewman 30 Apr '13

30 Apr '13

Author: phobos Date: 2013-04-30 16:34:55 +0000 (Tue, 30 Apr 2013) New Revision: 26178 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-04-30 14:52:11 UTC (rev 26177) +++ website/trunk/include/mirrors-table.wmi 2013-04-30 16:34:55 UTC (rev 26178) @@ -37,23 +37,6 @@ <td>NL</td> - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - <td>CCC</td> <td>Up to date</td> @@ -69,23 +52,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>EE</td> <td>CyberSIDE</td> @@ -256,36 +222,53 @@ <tr> - <td>CH</td> + <td>DE</td> - <td></td> + <td>crazyhaze.de</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> - <td><a href="http://torproject.pillo-srv.ch/">http</a></td> - <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> - <td><a href="https://torproject.pillo-srv.ch/">https</a></td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>LT</td> + <td>MX</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>CH</td> + + <td></td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> + <td><a href="http://torproject.pillo-srv.ch/">http</a></td> + <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> + <td><a href="https://torproject.pillo-srv.ch/">https</a></td> <td> - </td> + <td> - </td> </tr> <tr> @@ -715,49 +698,66 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td></td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>LT</td> - <td>[[:bbs:]]</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>NL</td> - <td>CoralCDN</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -766,15 +766,15 @@ <tr> - <td>US</td> + <td>SE</td> - <td></td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -783,34 +783,34 @@ <tr> - <td>EE</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.li/dist/">http</a></td> - <td><a href="http://tor.li/">http</a></td> - <td><a href="https://tor.li/dist/">https</a></td> - <td><a href="https://tor.li/">https</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>EE</td> - <td>crazyhaze.de</td> + <td></td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td><a href="http://tor.li/dist/">http</a></td> + <td><a href="http://tor.li/">http</a></td> + <td><a href="https://tor.li/dist/">https</a></td> + <td><a href="https://tor.li/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -1021,6 +1021,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td></td>

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 30 Apr '13

30 Apr '13

commit 32b411289723f53a69e120ec30fafb711ac2495a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:15:08 2013 +0000 Update translations for bridgedb_completed --- fr/bridgedb.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/bridgedb.po b/fr/bridgedb.po index d3b90a8..211d3de 100644 --- a/fr/bridgedb.po +++ b/fr/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-30 15:07+0000\n" +"Last-Translator: lunar <lunar(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "Que sont les passerelles ?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Les passerelles relais %s sont des relais Tor vous aidant à contourner la censure." +msgstr "%s Les passerelles %s sont des relais Tor qui vous aident à contourner la censure." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Apr '13

30 Apr '13

commit 2ce23fd374bc3577acd56dc9f3f7b178c1a729dd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:15:03 2013 +0000 Update translations for bridgedb --- fr/bridgedb.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/bridgedb.po b/fr/bridgedb.po index d3b90a8..211d3de 100644 --- a/fr/bridgedb.po +++ b/fr/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-30 15:07+0000\n" +"Last-Translator: lunar <lunar(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "Que sont les passerelles ?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Les passerelles relais %s sont des relais Tor vous aidant à contourner la censure." +msgstr "%s Les passerelles %s sont des relais Tor qui vous aident à contourner la censure." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!"

1 0

r26177: {website} Mention the obfsproxy git repo in the setup instructions. (website/trunk/projects/en)
by George Kadianakis 30 Apr '13

30 Apr '13

Author: asn Date: 2013-04-30 14:52:11 +0000 (Tue, 30 Apr 2013) New Revision: 26177 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: Mention the obfsproxy git repo in the setup instructions. Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2013-04-30 03:22:25 UTC (rev 26176) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2013-04-30 14:52:11 UTC (rev 26177) @@ -65,6 +65,11 @@ You will probably want to run the <em>pip install</em> command as root so that obfsproxy gets installed to /usr/local/bin. </p> + <p> + (Instead of using pip, you could also use <a + href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git">the + git repository</a> of obfsproxy if you feel more adventurous) + </p> <h3>Step 3: Setup tor</h3> <br>

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 30 Apr '13

30 Apr '13

commit 53e3a6218638f96b31eb92ec78964d2918f30f0b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:15:05 2013 +0000 Update translations for bridgedb_completed --- pl/bridgedb.po | 134 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 81 insertions(+), 53 deletions(-) diff --git a/pl/bridgedb.po b/pl/bridgedb.po index f0d1ed2..d58c32f 100644 --- a/pl/bridgedb.po +++ b/pl/bridgedb.po @@ -1,73 +1,101 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. # # Translators: -# <ayurveda63(a)gmail.com>, 2012. +# JerBen <ayurveda63(a)gmail.com>, 2012 +# bogdrozd <bog.d(a)gazeta.pl>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-08-23 09:17+0000\n" -"Last-Translator: JerBen <ayurveda63(a)gmail.com>\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2013-04-30 13:53+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "To są twoje przekaźniki mostowe." +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Czym są mostki?" -#: lib/bridgedb/I18n.py:23 +#: lib/bridgedb/templates/base.html:34 +#, python-format msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Przekaźniki mostowe \"Tor bridges\" (lub \"mosty\" w skrócie) są przekaźnikami Tora, które NIE SĄ wyszczególnione w katalogu głównym. Z racji, iż nie ma pełnej, publicznej listy mostów, nawet jeżeli twój dostawca usług internetowych ISP filtruję połączenia z częścią widocznych mostów Tora, najprawdopodobniej nie będzie on w stanie wyszukać i zablokować wszystkich." +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Przekaźniki mostkowe %s są przekaźnikami Tora, które pozwalają obchodzić cenzurę." -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "By użyć powyższych mostów, wejdź do zakładki Ustawienia sieciowe w Vidalii, naciśnij opcję \"mój dostawca usług internetowych ISP blokuje połączenia z siecią Tor\". Następnie dodaj każdy adres mostu pojedynczo. " +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Potrzebują alternatywnego sposobu na pozyskanie mostków!" -#: lib/bridgedb/I18n.py:32 +#: lib/bridgedb/templates/base.html:40 +#, python-format msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Skonfigurowanie więcej niż jednego adresu mostu, sprawi iż połączenie z siecią Tor będzie stabilniejsze w wypadku gdy jeden z mostów stanie się niedostępny." +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Innym sposobem na znalezienie publicznych adresów mostków jest wysłanie e-maila (z adresu %s lub %s) na %s z samą linią 'get bridges' w ciele wiadomości" -#: lib/bridgedb/I18n.py:35 +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Moje mostki nie działają! Potrzebuję pomocy!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Kolejnym sposobem na znalezienie publicznych adresów mostów jest wysłanie maila na bridges(a)torproject.org z samym dopiskiem \"get bridges\" w treści maila. By utrudnić atakującym dostęp do dużej ilości adresów mostów musisz wysłać prośbę z adresów emailowych z jednej z następujących domen:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[To jest wiadomość generowana automatycznie; prosimy na nią nie odpisywać.]" - -#: lib/bridgedb/I18n.py:43 +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Jeśli Tor nie działa, powinno się wysłać e-mail do %s. Spróbuj podać tak dużo informacji, jak tylko możesz, łącznie z listą mostków, nazwą/wersją instalatora, komunikaty wyświetlane przez Tora itd." + +#: lib/bridgedb/templates/bridges.html:10 msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Innym sposobem na odnalezienie adresów mostów jest odwiedzenie https://bridges.torproject.org/. Informacje na tej stronie zmieniają się co kilka dni, tak więc odwiedzaj ją co jakiś czas jeżeli potrzebujesz listę nowych adresów mostów." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(obecnie brak dostępnych adresów mostów)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(prośba e-mail obecnie nieobsługiwana)" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "Aby użyć powyższych linii, wejdź na stronę Ustawień Sieciowych Vidalii i kliknij \"Mój dostawca blokuje połączenia do sieci Tora\" (\"My ISP blocks connections to the Tor network\"). Potem dodaj każdy adres mostka po jednym na raz." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "W tej chwili nie ma dostępnych mostków" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Zaktualizuj swoją przeglądarkę na Firefoksa." + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Wpisz dwa słowa" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Krok 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Pobierz %s Paczkę Tora z Przeglądarką %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Krok 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Pobierz %s mostki %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Krok 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Teraz %s dodaj mostki do Tora %s"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Apr '13

30 Apr '13

commit cc24e159a8b54a4edf9c9c0cf5cc417f751c70c3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:15:03 2013 +0000 Update translations for bridgedb --- pl/bridgedb.po | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pl/bridgedb.po b/pl/bridgedb.po index 583a9b8..d58c32f 100644 --- a/pl/bridgedb.po +++ b/pl/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-30 13:45+0000\n" +"PO-Revision-Date: 2013-04-30 13:53+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,11 +28,11 @@ msgstr "Czym są mostki?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Przekaźniki mostkowe %s są przekaźnikami Tora, które pozwalają obchodzić cenzurę." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Potrzebują alternatywnego sposobu na pozyskanie mostków!" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -40,11 +40,11 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "" +msgstr "Innym sposobem na znalezienie publicznych adresów mostków jest wysłanie e-maila (z adresu %s lub %s) na %s z samą linią 'get bridges' w ciele wiadomości" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Moje mostki nie działają! Potrzebuję pomocy!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -52,50 +52,50 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" +msgstr "Jeśli Tor nie działa, powinno się wysłać e-mail do %s. Spróbuj podać tak dużo informacji, jak tylko możesz, łącznie z listą mostków, nazwą/wersją instalatora, komunikaty wyświetlane przez Tora itd." #: lib/bridgedb/templates/bridges.html:10 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "" +msgstr "Aby użyć powyższych linii, wejdź na stronę Ustawień Sieciowych Vidalii i kliknij \"Mój dostawca blokuje połączenia do sieci Tora\" (\"My ISP blocks connections to the Tor network\"). Potem dodaj każdy adres mostka po jednym na raz." #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "" +msgstr "W tej chwili nie ma dostępnych mostków" #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" -msgstr "" +msgstr "Zaktualizuj swoją przeglądarkę na Firefoksa." #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "" +msgstr "Wpisz dwa słowa" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "" +msgstr "Krok 1" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "" +msgstr "Pobierz %s Paczkę Tora z Przeglądarką %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "" +msgstr "Krok 2" #: lib/bridgedb/templates/index.html:15 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Pobierz %s mostki %s" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "" +msgstr "Krok 3" #: lib/bridgedb/templates/index.html:21 #, python-format msgid "Now %s add the bridges to Tor %s" -msgstr "" +msgstr "Teraz %s dodaj mostki do Tora %s"

1 0

[tor-launcher/master] Use TBB page as the Tor Launcher add-on's home page.
by brade＠torproject.org 30 Apr '13

30 Apr '13

commit 1d4770aceceeaa73aa70a87a9712110257d16944 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 30 10:10:49 2013 -0400 Use TBB page as the Tor Launcher add-on's home page. --- src/install.rdf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index b933f86..0109243 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -8,7 +8,7 @@ <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>torlauncher(a)torproject.org</em:id> <em:version>0.1.1pre-alpha</em:version> - <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en?TODO</em:homepageURL> + <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>

1 0

[tor-launcher/master] Display "Copy Tor Log" button in wizard after bootstrap error.
by brade＠torproject.org 30 Apr '13

30 Apr '13

commit f3382b7fe609b1e10993eb626b00ad792dfc087d Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 30 10:04:14 2013 -0400 Display "Copy Tor Log" button in wizard after bootstrap error. --- src/chrome/content/network-settings.js | 3 +++ src/components/tl-process.js | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index ce35a12..6123b15 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -112,6 +112,9 @@ function initDialog() cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); } + if (gTorProcessService.TorBootstrapErrorOccurred) + wizardShowCopyLogButton(); + // Use "Connect" as the finish button label (on the last wizard page).. var finishBtn = document.documentElement.getButton("finish"); if (finishBtn) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3c6ed23..1ef4d8a 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -210,6 +210,12 @@ TorProcessService.prototype = return this.mIsBootstrapDone; }, + get TorBootstrapErrorOccurred() + { + return this.mBootstrapErrorOccurred; + }, + + TorClearBootstrapError: function() { this.mLastTorWarningPhase = null; @@ -220,6 +226,7 @@ TorProcessService.prototype = // Private Member Variables //////////////////////////////////////////////// mIsTorProcessReady: false, mIsBootstrapDone: false, + mBootstrapErrorOccurred: false, mIsQuitting: false, mObsSvc: null, mProtocolSvc: null, @@ -359,6 +366,7 @@ TorProcessService.prototype = if (100 == aStatusObj.PROGRESS) { this.mIsBootstrapDone = true; + this.mBootstrapErrorOccurred = false; TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, false); } else @@ -367,6 +375,7 @@ TorProcessService.prototype = if (aStatusObj._errorOccurred) { + this.mBootstrapErrorOccurred = true; TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true); TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.WARNING);

1 0