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

[tor-launcher/master] Add bridge relay help button to network settings dialog.
by brade＠torproject.org 18 Apr '13

18 Apr '13

commit 56a7e93004b1eaaeec3d66ca1f41bf623af3802c Author: Kathy Brade <brade(a)torproject.org> Date: Thu Apr 18 16:41:52 2013 -0400 Add bridge relay help button to network settings dialog. --- src/chrome/content/.network-settings.js.swp | Bin 0 -> 32768 bytes src/chrome/content/network-settings.js | 91 ++++++++++++++++++++------- src/chrome/content/network-settings.xul | 27 ++++++--- src/chrome/locale/en/network-settings.dtd | 5 ++ src/chrome/locale/en/torlauncher.properties | 1 + src/chrome/skin/network-settings.css | 14 ++++ 6 files changed, 106 insertions(+), 32 deletions(-) diff --git a/src/chrome/content/.network-settings.js.swp b/src/chrome/content/.network-settings.js.swp new file mode 100644 index 0000000..ce49066 Binary files /dev/null and b/src/chrome/content/.network-settings.js.swp differ diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 97e26d6..f8dd976 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -46,6 +46,8 @@ var gTorProcessService = null; var gObsService = null; var gIsInitialBootstrap = false; var gIsBootstrapComplete = false; +var gRestoreAfterHelpPanelID = null; +var gRestoreAfterCancelBtnLabel = null; function initDialog() @@ -85,14 +87,14 @@ function initDialog() if (TorLauncherUtil.shouldStartAndOwnTor && !gTorProcessService.TorIsProcessReady) { - showOrHideSettings(false, true); // Show "Waiting for tor to start" + showPanel("startingTor"); gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); } else { - showOrHideSettings(true, false); + showPanel("settings"); readTorSettings(); } @@ -109,11 +111,11 @@ var gObserver = { if (kTorProcessReadyTopic == aTopic) { - showOrHideSettings(true, false); + showPanel("settings"); readTorSettings(); } else if (kTorProcessDidNotStartTopic == aTopic) - showOrHideSettings(false, false); + showPanel("errorPanel"); else close(); } @@ -137,7 +139,7 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showOrHideSettings(false, false); + showPanel("errorPanel"); setTimeout(function() { @@ -153,42 +155,45 @@ function readTorSettings() } -function showOrHideSettings(aShow, aIsStartingTor) +function showPanel(aPanelID) { - showOrHideElem("settings", aShow); - showOrHideElem("startingTor", !aShow && aIsStartingTor); + var deckElem = document.getElementById("deck"); + if (deckElem) + deckElem.selectedPanel = document.getElementById(aPanelID); - var okBtn = document.documentElement.getButton("accept"); - if (okBtn) - { - if (aShow) - { - okBtn.removeAttribute("hidden"); - okBtn.focus(); - } - else - okBtn.setAttribute("hidden", true); - } + showOrHideButton("accept", (aPanelID == "settings"), true); + showOrHideButton("extra1", (aPanelID != "bridgeHelp"), false); } -function showOrHideElem(aID, aShow) +function showOrHideButton(aID, aShow, aFocus) { if (!aID) return; - var e = document.getElementById(aID); - if (e) + var btn = document.documentElement.getButton(aID); + if (btn) { if (aShow) - e.removeAttribute("hidden"); + { + btn.removeAttribute("hidden"); + if (aFocus) + btn.focus() + } else - e.setAttribute("hidden", true); + btn.setAttribute("hidden", true); } } + function onCancel() { + if (gRestoreAfterHelpPanelID) // Is help open? + { + closeHelp(); + return false; + } + if (gIsInitialBootstrap) try { var obsSvc = Cc["@mozilla.org/observer-service;1"] @@ -208,6 +213,44 @@ function onCopyLog() } +function onOpenHelp() +{ + if (gRestoreAfterHelpPanelID) // Already open? + return; + + var deckElem = document.getElementById("deck"); + if (!deckElem) + return; + + gRestoreAfterHelpPanelID = deckElem.selectedPanel.id; + var cancelBtn = document.documentElement.getButton("cancel"); + if (cancelBtn) + { + gRestoreAfterCancelBtnLabel = cancelBtn.label; + cancelBtn.label = TorLauncherUtil.getLocalizedString("done"); + } + else + gRestoreAfterCancelBtnLabel = null; + + showPanel("bridgeHelp"); +} + + +function closeHelp() +{ + if (!gRestoreAfterHelpPanelID) // Already closed? + return; + + var cancelBtn = document.documentElement.getButton("cancel"); + if (cancelBtn && gRestoreAfterCancelBtnLabel) + cancelBtn.label = gRestoreAfterCancelBtnLabel; + gRestoreAfterCancelBtnLabel = null; + + showPanel(gRestoreAfterHelpPanelID); + gRestoreAfterHelpPanelID = null; +} + + // Returns true if successful. function initProxySettings() { diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 6e6c882..ddd2b86 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -16,19 +16,20 @@ title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttons="accept,cancel,extra1" + buttons="accept,cancel,extra1,help" buttonlabelextra1="&torsettings.copyLog;" ondialogaccept="return applySettings();" ondialogcancel="return onCancel();" ondialogextra1="onCopyLog();" + ondialoghelp="onOpenHelp();" onload="initDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> - <stack> + <deck id="deck"> <vbox id="settings"> - <vbox flex="1"> + <vbox> <hbox id="tbb-header"> <vbox> <spacer flex="1" /> @@ -95,7 +96,7 @@ </groupbox> </vbox> - <vbox flex="1"> + <vbox> <checkbox id="useFirewallPorts" groupboxID="firewallSpecificSettings" label="&torsettings.firewall.checkbox;" oncommand="toggleElemUI(this)"/> @@ -108,14 +109,17 @@ </groupbox> </vbox> - <vbox flex="1"> + <vbox> <checkbox id="useBridges" groupboxID="bridgeSpecificSettings" label="&torsettings.useBridges.checkbox;" oncommand="toggleElemUI(this);" /> <groupbox id="bridgeSpecificSettings"> <hbox> <vbox flex="1"> - <label value="&torsettings.useBridges.label;" control="bridgeList"/> + <hbox align="center"> + <button dlgtype="help"/> + <label value="&torsettings.useBridges.label;" control="bridgeList"/> + </hbox> <textbox id="bridgeList" multiline="true" rows="4" /> </vbox> <!-- @@ -132,7 +136,7 @@ </groupbox> </vbox> </vbox> - <vbox id="startingTor" flex="1"> + <vbox id="startingTor"> <spring flex="1" /> <hbox> <spring flex="1" /> @@ -141,6 +145,13 @@ </hbox> <spring flex="1" /> </vbox> - </stack> + <vbox id="bridgeHelp"> + <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> + <description>&torsettings.bridgeHelp1;</description> + <description>&torsettings.bridgeHelp2;</description> + <description>&torsettings.bridgeHelp3;</description> + </vbox> + <vbox id="errorPanel"/> + </deck> <spring /> </dialog> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 3382b17..99ea45c 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -21,3 +21,8 @@ <!ENTITY torsettings.useBridges.checkbox "My ISP blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays in the form address:port."> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "Bridge relays (or 'bridges' for short) are Tor relays that aren't listed in the main directory. Since there is no complete public list of them, even if your ISP is filtering connections to all the known Tor relays they probably won't be able to block all the bridges."> +<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> + +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message. However, so we can make it harder for an attacker to learn lots of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0453faa..362f122 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -25,3 +25,4 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.connect=Connect torlauncher.quit=Quit torlauncher.quit_win=Exit +torlauncher.done=Done diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index e165bca..32cdd07 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -41,3 +41,17 @@ dialog.initialBootstrap #tbb-header { font-size: 120%; font-weight: bold; } + +#bridgeHelp { + margin: 30px; +} + +#bridgeHelp label { + font-size: 120%; + font-weight: bold; + margin: 0px 0px 20px 0px; +} + +#bridgeHelp description { + margin-bottom: 15px; +}

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 926843715ddbabbe17dbc127f9f9ad18d733763a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 18:45:10 2013 +0000 Update translations for gettor_completed --- ar/gettor.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 19b6703..b9bae52 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-17 16:44+0000\n" +"PO-Revision-Date: 2013-04-18 18:23+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "مرحبا، هذا برنامج \"GetTor\"." +msgstr "مرحبا، هذا رد آلي من برنامج \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." @@ -62,7 +62,7 @@ msgstr "(نعتذر إذا لم تطلب هذا البريد. حيث ان مزو msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" -msgstr "اذا كانت لديك آي أسئلة، يمكنك مراسله فريق الدعم الفني على:\n\nhelp@rt.torproject.org" +msgstr "اذا كانت لديك آي أسئلة، يمكنك مراسله فريق الدعم الفني على:\nhelp-ar@rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -92,7 +92,7 @@ msgstr "الرجاء الرد على هذا البريد، وأخبرني باس msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "الحصول على نسخ مترجمة من تور\n==================" +msgstr "للحصول على نسخ مترجمة من تور\n==================" #: lib/gettor/i18n.py:67 msgid "" @@ -100,7 +100,7 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "للحصول على نسخة من تور مترجمة للغتك، قم بإضافة\nرمز اللغة التي تريد في العنوان الذي ستقوم بإرسال البريد له:\n\ngettor+fa@torproject.org" +msgstr "للحصول على نسخة من تور مترجمة للغتك، قم بإضافة\nرمز اللغة التي تريد في العنوان الذي ستقوم بإرسال البريد له:\n\ngettor+ar@torproject.org" #: lib/gettor/i18n.py:72 msgid "" @@ -376,7 +376,7 @@ msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." -msgstr "macos-ppc:\nهذه النسخة ( \"حزمة ڤيداليا\") لأجهزة الماك ذو معالجات باور بي سي القديمة. سوف يتم وقف العمل بها قريباً" +msgstr "macos-ppc:\nهذه النسخة ( \"حزمة ڤيداليا\") لأجهزة الماك ذو معالجات باور بي سي القديمة. سوف يتم وقف العمل بها قريباً." #: lib/gettor/i18n.py:235 msgid "" @@ -511,4 +511,4 @@ msgid "" " https://www.oignon.net/dist/torbrowser/\n" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" -msgstr "عفواً، و لكن الرزمة التي طلبتها (%s) آكبر من الحجم المسموح به من مزود البريد لديك. \n\nحاول استخدم مزود بريد يسمح بإضافات أكبر حجماً بالبريد، أو جرب هذه الروابط البديلة للتحميل:\n\n https://www.oignon.net/dist/torbrowser/\n https://tor.beme-it.de/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "عفواً، و لكن الرزمة التي طلبتها (%s) آكبر من الحجم المسموح به من مزود البريد لديك. \n\nحاول استخدم مزود بريد يسمح بإضافات أكبر حجماً بالبريد، أو جرب هذه الروابط البديلة للتحميل:\n\n https://www.oignon.net/dist/torbrowser/\n https://tor.myrl.net/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit a9e223c61e1d07e1acc60190816a988fc0f31503 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 18:45:06 2013 +0000 Update translations for gettor --- ar/gettor.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 19b6703..b9bae52 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-17 16:44+0000\n" +"PO-Revision-Date: 2013-04-18 18:23+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "مرحبا، هذا برنامج \"GetTor\"." +msgstr "مرحبا، هذا رد آلي من برنامج \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." @@ -62,7 +62,7 @@ msgstr "(نعتذر إذا لم تطلب هذا البريد. حيث ان مزو msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" -msgstr "اذا كانت لديك آي أسئلة، يمكنك مراسله فريق الدعم الفني على:\n\nhelp@rt.torproject.org" +msgstr "اذا كانت لديك آي أسئلة، يمكنك مراسله فريق الدعم الفني على:\nhelp-ar@rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -92,7 +92,7 @@ msgstr "الرجاء الرد على هذا البريد، وأخبرني باس msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "الحصول على نسخ مترجمة من تور\n==================" +msgstr "للحصول على نسخ مترجمة من تور\n==================" #: lib/gettor/i18n.py:67 msgid "" @@ -100,7 +100,7 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "للحصول على نسخة من تور مترجمة للغتك، قم بإضافة\nرمز اللغة التي تريد في العنوان الذي ستقوم بإرسال البريد له:\n\ngettor+fa@torproject.org" +msgstr "للحصول على نسخة من تور مترجمة للغتك، قم بإضافة\nرمز اللغة التي تريد في العنوان الذي ستقوم بإرسال البريد له:\n\ngettor+ar@torproject.org" #: lib/gettor/i18n.py:72 msgid "" @@ -376,7 +376,7 @@ msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." -msgstr "macos-ppc:\nهذه النسخة ( \"حزمة ڤيداليا\") لأجهزة الماك ذو معالجات باور بي سي القديمة. سوف يتم وقف العمل بها قريباً" +msgstr "macos-ppc:\nهذه النسخة ( \"حزمة ڤيداليا\") لأجهزة الماك ذو معالجات باور بي سي القديمة. سوف يتم وقف العمل بها قريباً." #: lib/gettor/i18n.py:235 msgid "" @@ -511,4 +511,4 @@ msgid "" " https://www.oignon.net/dist/torbrowser/\n" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" -msgstr "عفواً، و لكن الرزمة التي طلبتها (%s) آكبر من الحجم المسموح به من مزود البريد لديك. \n\nحاول استخدم مزود بريد يسمح بإضافات أكبر حجماً بالبريد، أو جرب هذه الروابط البديلة للتحميل:\n\n https://www.oignon.net/dist/torbrowser/\n https://tor.beme-it.de/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "عفواً، و لكن الرزمة التي طلبتها (%s) آكبر من الحجم المسموح به من مزود البريد لديك. \n\nحاول استخدم مزود بريد يسمح بإضافات أكبر حجماً بالبريد، أو جرب هذه الروابط البديلة للتحميل:\n\n https://www.oignon.net/dist/torbrowser/\n https://tor.myrl.net/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 77c3d7308b92ac55d8284b5e8e278247efac127e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 17:46:22 2013 +0000 Update translations for torbirdy_completed --- nl/torbirdy.dtd | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index 0c6a5a9..7662764 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -16,6 +16,8 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Proxy configuratie"> <!ENTITY torbirdy.prefs.privacy.label "Privacy configuratie"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail instellingen"> +<!ENTITY torbirdy.prefs.security.label "Beveiligingsinstellingen"> <!ENTITY torbirdy.prefs.recommended.text "Aanbevolen configuratie voor TorBirdy (Tor) gebruiken"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Kies een anonimiseringsdienst"> @@ -41,9 +43,13 @@ <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "Schakel Thunderbird's automatische e-mail configuratie-wizard in [standaard: uitgeschakeld]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.renegotiation.label "sta connecties met servers die SSL/TLS met "safe renegotiation" toe [default: do not allow]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kies een account: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Bruikbaare hoofdserver(s)."> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Gebruik Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label "Gebruik JonDo (Premium)">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit f735fafff967ea17702cf1cd742d9d9a26916278 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 17:46:19 2013 +0000 Update translations for torbirdy --- nl/torbirdy.dtd | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd index 95011e5..7662764 100644 --- a/nl/torbirdy.dtd +++ b/nl/torbirdy.dtd @@ -16,8 +16,8 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Proxy configuratie"> <!ENTITY torbirdy.prefs.privacy.label "Privacy configuratie"> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail instellingen"> +<!ENTITY torbirdy.prefs.security.label "Beveiligingsinstellingen"> <!ENTITY torbirdy.prefs.recommended.text "Aanbevolen configuratie voor TorBirdy (Tor) gebruiken"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Kies een anonimiseringsdienst"> @@ -43,13 +43,13 @@ <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "Schakel Thunderbird's automatische e-mail configuratie-wizard in [standaard: uitgeschakeld]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.renegotiation.label ""> -<!ENTITY torbirdy.prefs.renegotiation.key ""> +<!ENTITY torbirdy.prefs.renegotiation.label "sta connecties met servers die SSL/TLS met "safe renegotiation" toe [default: do not allow]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kies een account: "> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> -<!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Bruikbaare hoofdserver(s)."> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Gebruik Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label "Gebruik JonDo (Premium)">

1 0

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

18 Apr '13

commit 5fa59b373f09bee5ca07cdb6b5c15e469a2cfaac Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 17:46:09 2013 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.properties | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/nl/https-everywhere.properties b/nl/https-everywhere.properties index 7f46828..0bff33a 100644 --- a/nl/https-everywhere.properties +++ b/nl/https-everywhere.properties @@ -3,3 +3,4 @@ https-everywhere.menu.globalDisable = HTTPS Everywhere uitschakelen https-everywhere.menu.enableDisable = Regels in-/uitschakelen https-everywhere.menu.noRules = (Geen regels voor deze pagina) https-everywhere.menu.unknownRules = (Regels voor deze pagina zijn onbekend) +https-everywhere.toolbar.hint = HTTPS Everywhere is nu geactiveerd. Je kan dit aanpassen door op een site-by-site basis te clicken op het icoon naast de adres bar.

1 0

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

18 Apr '13

commit 81402c335d464ede3a3cb5ba3b16b86529678e43 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 17:46:03 2013 +0000 Update translations for https_everywhere --- nl/https-everywhere.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nl/https-everywhere.properties b/nl/https-everywhere.properties index 359cfaa..0bff33a 100644 --- a/nl/https-everywhere.properties +++ b/nl/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = HTTPS Everywhere uitschakelen https-everywhere.menu.enableDisable = Regels in-/uitschakelen https-everywhere.menu.noRules = (Geen regels voor deze pagina) https-everywhere.menu.unknownRules = (Regels voor deze pagina zijn onbekend) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.toolbar.hint = HTTPS Everywhere is nu geactiveerd. Je kan dit aanpassen door op een site-by-site basis te clicken op het icoon naast de adres bar.

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit 1112d8021e5e36f5749fb5d6f56a65d382d25d16 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 17:45:56 2013 +0000 Update translations for whisperback_completed --- nl/nl.po | 184 +++++++++++++++++++++++--------------------------------------- 1 files changed, 69 insertions(+), 115 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index d88f1f2..96cbcff 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <ayurveda63(a)gmail.com>, 2012. -# Shondoit Walker <shondoit+transifex(a)gmail.com>, 2012. -# <therbom(a)gmail.com>, 2012. -# <unknown365(a)hotmail.com>, 2012. +# JerBen <ayurveda63(a)gmail.com>, 2012 +# Shondoit Walker <shondoit(a)gmail.com>, 2012 +# Marco Brohet <therbom(a)gmail.com>, 2012 +# caesarjulius <darthim(a)hotmail.com>, 2013 +# unknown365 <unknown365(a)hotmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-09-25 23:18+0000\n" -"Last-Translator: unknown365 <unknown365(a)hotmail.com>\n" +"POT-Creation-Date: 2013-03-26 15:50+0100\n" +"PO-Revision-Date: 2013-04-18 17:28+0000\n" +"Last-Translator: caesarjulius <darthim(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,85 +37,47 @@ msgstr "Ongeldige contact OpenPGP sleutel: %s" msgid "Invalid contact OpenPGP public key block" msgstr "Ongeldige contact OpenPGP publieke sleutelblok" -#: ../whisperBack/encryption.py:126 -msgid "No keys found." -msgstr "Geen sleutels gevonden." - #: ../whisperBack/exceptions.py:41 #, python-format msgid "" -"The variable %s was not found in any of the configuation " -"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "De variabele %s was niet gevonden in enig configuratie bestand. /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" - -#: ../whisperBack/gui.py:114 -msgid "Name of the affected software" -msgstr "Naam van betreffende software" - -#: ../whisperBack/gui.py:115 -msgid "Exact steps to reproduce the problem" -msgstr "Exacte stappen om het probleem te reproduceren" - -#: ../whisperBack/gui.py:116 -msgid "Actual result / the problem" -msgstr "Daadwerkelijke resultaat / het probleem" - -#: ../whisperBack/gui.py:117 -msgid "Desired result" -msgstr "Gewenste resultaat" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "De %s variabel is niet gevonden in de configuratie bestanden etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -#: ../whisperBack/gui.py:155 +#: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." msgstr "Kan geen geldige configuratie inladen." -#: ../whisperBack/gui.py:177 -#, python-format -msgid "" -"<h1>Help us fix your bug!</h1>\n" -"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" -"<p><strong>Do not include more personal information than\n" -"needed!</strong></p>\n" -"<h2>About giving us an email address</h2>\n" -"<p>If you don't mind disclosing some bits of your identity\n" -"to Tails developers, you can provide an email address to\n" -"let us ask more details about the bug. Additionally entering\n" -"a public PGP key enables us to encrypt such future\n" -"communication.</p>\n" -"<p>Anyone who can see this reply will probably infer you are\n" -"a Tails user. Time to wonder how much you trust your\n" -"Internet and mailbox providers?</p>\n" -msgstr "<h1>Help ons jouw bugs te fixen!</h1>\n<p>Lees <a href=\"%s\">onze handleiding voor het melden van fouten</a>.</p>\n<p><strong>Voeg niet meer persoonlijke informatie toe dan nodig!</strong></p>\n<h2>Over het opgeven van een e-mailadres</h2>\n<p>Als je het niet erg vindt om iets een beetje van je identiteit af te staan, dan kun je een e-mailadres opgeven zodat wij meer details over de fout kunnen vragen. Bovendien, door het toevoegen van een publieke PGP sleutel stel je ons in staat om zulke toekomstige communicatie te versleutelen.</p>\n<p>Iedereen die ons antwoordbericht kan zien zal waarschijnlijk kunnen afleiden dat je een Tails gebruiker bent. Tijd om je af te vragen hoeveel je je Internet- en mailprovider vertrouwd?</p>\n" - -#: ../whisperBack/gui.py:229 +#: ../whisperBack/gui.py:217 msgid "Sending mail..." msgstr "Bezig met mail versturen..." -#: ../whisperBack/gui.py:230 +#: ../whisperBack/gui.py:218 msgid "Sending mail" msgstr "Bezig met mail versturen" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:232 +#: ../whisperBack/gui.py:220 msgid "This could take a while..." msgstr "Dit kan enige tijd duren..." -#: ../whisperBack/gui.py:246 +#: ../whisperBack/gui.py:234 msgid "The contact email adress doesn't seem valid." msgstr "Het contact e-mailadres lijkt niet geldig." -#: ../whisperBack/gui.py:263 +#: ../whisperBack/gui.py:251 msgid "Unable to send the mail: SMTP error." msgstr "Kan mail niet versturen: SMTP fout." -#: ../whisperBack/gui.py:265 +#: ../whisperBack/gui.py:253 msgid "Unable to connect to the server." msgstr "Kan niet verbinden met de server." -#: ../whisperBack/gui.py:267 +#: ../whisperBack/gui.py:255 msgid "Unable to create or to send the mail." msgstr "Kan mail niet aanmaken of versturen." -#: ../whisperBack/gui.py:270 +#: ../whisperBack/gui.py:258 msgid "" "\n" "\n" @@ -123,25 +86,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nDe foutrapportage kon niet worden verstuurd, waarschijnlijk door netwerkproblemen. Probeer opnieuw verbinding te maken met het netwerk en probeer het opnieuw.\n\nAls dit niet werkt wordt je aangeboden om de foutrapportage op te slaan." -#: ../whisperBack/gui.py:283 +#: ../whisperBack/gui.py:271 msgid "Your message has been sent." msgstr "Je bericht is verstuurd." -#: ../whisperBack/gui.py:289 -msgid "Unable to find encryption key." -msgstr "Kan encryptiesleutel niet vinden." - -#: ../whisperBack/gui.py:293 +#: ../whisperBack/gui.py:278 msgid "An error occured during encryption." msgstr "Er is een fout opgetreden tijdens het versleutelen" -#: ../whisperBack/gui.py:313 +#: ../whisperBack/gui.py:298 #, python-format msgid "Unable to save %s." msgstr "Kan %s niet opslaan." #. XXX: fix string -#: ../whisperBack/gui.py:337 +#: ../whisperBack/gui.py:322 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -151,70 +110,39 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "De foutrapportage kon niet worden verstuurd, waarschijnlijk door netwerkproblemen.\n\nAls een tijdelijke oplossing kun je de foutrapportage opslaan op een USB-drive en het proberen te versturen naar ons op %s via jouw e-mailaccount op een ander systeem. Let wel op dat je foutrapportage niet anoniem zal zijn wanneer je dit doet, tenzij je zelf verdere stappen onderneemt (bijv. gebruik maken van Tor een een wegwerp-e-mailaccount.)\n\nWil je de foutrapportage opslaan als een bestand?" -#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "Stuur feedback in een versleutelde mail." -#: ../whisperBack/gui.py:405 +#: ../whisperBack/gui.py:390 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "Copyright © 2009-2012 Tails-ontwikkelaars (tails(a)boum.org)" -#: ../whisperBack/gui.py:406 +#: ../whisperBack/gui.py:391 msgid "Tails developers <tails(a)boum.org>" msgstr "Tails ontwikkelaars <tails(a)boum.org>" -#: ../whisperBack/gui.py:407 +#: ../whisperBack/gui.py:392 msgid "translator-credits" msgstr "vertaler credits" -#: ../whisperBack/gui.py:434 -msgid "This doesn's seem to be a valid URL or OpenPGP key." +#: ../whisperBack/gui.py:419 +msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "Dit lijkt geen geldige URL of OpenPGP sleutel te zijn." #: ../data/whisperback.ui.h:1 -msgid "" -"Add a PGP key if you want us to encrypt messages when we respond to you." -msgstr "Voeg een PGP sleutel toe als je wilt dat wij onze berichten versleutelen wanneer we jou een antwoord sturen." - -#: ../data/whisperback.ui.h:2 -msgid "Bug description" -msgstr "Foutomschrijving" - -#: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" msgstr "Copyright © 2009-2012 tails(a)boum.org" -#: ../data/whisperback.ui.h:4 -msgid "Help" -msgstr "Help" - -#: ../data/whisperback.ui.h:5 -msgid "" -"If you want us to encrypt messages when we respond to you, add your key ID, " -"a link to your key, or the key as a public key block:" -msgstr "Als je wilt dat wij onze berichten versleutelen wanneer we jou antwoorden, voeg je sleutel ID, een link naar je sleutel of de sleutel als een publieke sleutelblok" - -#: ../data/whisperback.ui.h:6 -msgid "Optional email address to contact you" -msgstr "Optioneel e-mailadres om met jou contact op te nemen" - -#: ../data/whisperback.ui.h:7 -msgid "Send" -msgstr "Verstuur" - -#: ../data/whisperback.ui.h:9 -msgid "Summary" -msgstr "Samenvatting" - -#: ../data/whisperback.ui.h:10 -msgid "Technical details to include" -msgstr "Technische details om bij te voegen" +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" -#: ../data/whisperback.ui.h:12 +#: ../data/whisperback.ui.h:4 msgid "" "WhisperBack - Send feedback in an encrypted mail\n" "Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" @@ -233,18 +161,44 @@ msgid "" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" msgstr "WhisperBack - Stuur terugkoppeling in een versleutelde email.\nCopyright (C) 2009-2012 Tails ontwikkelaars <tail(a)boum.org>\n\nDit programma is vrije programmatuur; u kan het verspreiden en/of aanpassen\nonder de voorwaarden van de GNU General Public License zoals gepubliceerd door\nThe Free Software Foundation; ofwel versie 3 van de Licentie, of (naar\nuw keuze) elke latere versie.\n\nDit programma wordt gedistribueerd in de hoop dat het nuttig zal zijn, maar\nZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van\nVERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU\nGeneral Public License voor meer details.\n\nU heeft een kopie moeten ontvangen van de GNU General Public License samen met dit programma. Zo niet, zie <http://www.gnu.org/licenses/>.\n" +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "Als je wilt dat wij onze berichten versleutelen wanneer we jou antwoorden, voeg je sleutel ID, een link naar je sleutel of de sleutel als een publieke sleutelblok" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "Samenvatting" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "Foutomschrijving" + +#: ../data/whisperback.ui.h:24 +msgid "Optional email address to contact you" +msgstr "Optioneel e-mailadres om met jou contact op te nemen" + +#: ../data/whisperback.ui.h:25 +msgid "optional PGP key" +msgstr "optionele PGP sleutel" + +#: ../data/whisperback.ui.h:26 +msgid "Technical details to include" +msgstr "Technische details om bij te voegen" + +#: ../data/whisperback.ui.h:27 +msgid "headers" +msgstr "headers" + #: ../data/whisperback.ui.h:28 msgid "debugging info" msgstr "debug info" #: ../data/whisperback.ui.h:29 -msgid "headers" -msgstr "headers" +msgid "Help" +msgstr "Help" #: ../data/whisperback.ui.h:30 -msgid "https://tails.boum.org/" -msgstr "https://tails.boum.org/" - -#: ../data/whisperback.ui.h:31 -msgid "optional PGP key" -msgstr "optionele PGP sleutel" +msgid "Send" +msgstr "Verstuur"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 18 Apr '13

18 Apr '13

commit a5332294519ca3730db9630ee870633b88c3a146 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 17:45:54 2013 +0000 Update translations for whisperback --- nl/nl.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 2ccfe79..96cbcff 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <ayurveda63(a)gmail.com>, 2012. -# Shondoit Walker <shondoit+transifex(a)gmail.com>, 2012. -# <therbom(a)gmail.com>, 2012. -# <unknown365(a)hotmail.com>, 2012. +# JerBen <ayurveda63(a)gmail.com>, 2012 +# Shondoit Walker <shondoit(a)gmail.com>, 2012 +# Marco Brohet <therbom(a)gmail.com>, 2012 +# caesarjulius <darthim(a)hotmail.com>, 2013 +# unknown365 <unknown365(a)hotmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-03-27 08:21+0000\n" -"Last-Translator: unknown365 <unknown365(a)hotmail.com>\n" +"PO-Revision-Date: 2013-04-18 17:28+0000\n" +"Last-Translator: caesarjulius <darthim(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ msgstr "Ongeldige contact OpenPGP publieke sleutelblok" msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "" +msgstr "De %s variabel is niet gevonden in de configuratie bestanden etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." @@ -131,7 +132,7 @@ msgstr "vertaler credits" #: ../whisperBack/gui.py:419 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "" +msgstr "Dit lijkt geen geldige URL of OpenPGP sleutel te zijn." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org"

1 0

[tor-launcher/master] Add "Open Settings" button to the progress dialog.
by brade＠torproject.org 18 Apr '13

18 Apr '13

commit 47f3c488ed92c76994ae11c09fb6c4f9baebf9fa Author: Kathy Brade <brade(a)torproject.org> Date: Thu Apr 18 13:28:13 2013 -0400 Add "Open Settings" button to the progress dialog. --- src/chrome/content/progress.js | 19 +++++++++++++++++-- src/chrome/content/progress.xul | 4 +++- src/chrome/locale/en/progress.dtd | 1 + src/components/tl-process.js | 7 +++++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 3be7aac..803399f 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -38,9 +38,15 @@ function initDialog() gOpenerCallbackFunc = window.arguments[1]; } - // If this dialog was not opened from network settings, change Cancel to Quit. - if (!gOpenerCallbackFunc) + if (gOpenerCallbackFunc) + { + // Dialog was opened from network settings: hide Open Settings button. + var extraBtn = document.documentElement.getButton("extra1"); + extraBtn.setAttribute("hidden", true); + } + else { + // Dialog was not opened from network settings: change Cancel to Quit. var cancelBtn = document.documentElement.getButton("cancel"); var quitKey = (TorLauncherUtil.isWindows) ? "quit_win" : "quit"; cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey); @@ -97,12 +103,21 @@ function onCancel() } +function onOpenSettings() +{ + cleanup(); + window.close(); +} + + var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) { if (kTorProcessExitedTopic == aTopic) { + // TODO: provide a way to access tor log e.g., leave this dialog open + // and display the open settings button. onCancel(); window.close(); } diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index 2e59ebb..198f20f 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -16,8 +16,10 @@ title="&torprogress.dialog.title;" windowtype="TorLauncher:Progress" persist="screenX screenY" - buttons="cancel" + buttons="cancel,extra1" + buttonlabelextra1="&torprogress.openSettings;" ondialogcancel="return onCancel();" + ondialogextra1="onOpenSettings();" onload="initDialog();"> <script type="application/x-javascript" diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index ce247a4..f390a2b 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,3 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> <!ENTITY torprogress.pleaseWait "Your browser will open after you are connected."> diff --git a/src/components/tl-process.js b/src/components/tl-process.js index fcfbf89..4eec340 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -318,8 +318,15 @@ TorProcessService.prototype = this._openNetworkSettings(true); // Blocks until dialog is closed. } else + { this._openProgressDialog(); + // Assume that the "Open Settings" button was pressed if Quit was + // not pressed and bootstrapping did not finish. + if (!this.mQuitSoon && !this.TorIsBootstrapDone) + this._openNetworkSettings(true); + } + // If the user pressed "Quit" within settings/progress, exit. if (this.mQuitSoon) try {

1 0