February 2015 - tor-commits - lists.torproject.org

[bridgedb/develop] Merge branch 'fix/11345-qrcodes_r2' into develop
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit 177edfd8a0a232796973b20d7c3222ba66478309 Merge: a973271 129dc99 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 06:04:02 2015 +0000 Merge branch 'fix/11345-qrcodes_r2' into develop lib/bridgedb/qrcodes.py | 8 ++-- lib/bridgedb/test/test_qrcodes.py | 73 +++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-)

1 0

[bridgedb/develop] Add more logging to add() in bridgedb.proxy.ProxySet.
by isis＠torproject.org 11 Feb '15

11 Feb '15

commit eb529724bc1e664675fe386ebbe3e1666b721558 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 07:53:38 2015 +0000 Add more logging to add() in bridgedb.proxy.ProxySet. --- lib/bridgedb/proxy.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index d954213..6b6f6ac 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -164,6 +164,7 @@ class ProxySet(MutableSet): ip = isIPAddress(ip) if ip: if self._proxies.isdisjoint(set(ip)): + logging.debug("Adding %s to proxy list %r..." % (ip, self)) self._proxies.add(ip) self._proxydict[ip] = tag if tag else time.time() return True

1 0

[tor-browser-bundle/maint-4.0] Bug 14849: Remove new NoScript option to make permissions permanent
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit b7c8d8fe373e015d9d2a646f61d368756bc68d53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:55:57 2015 -0800 Bug 14849: Remove new NoScript option to make permissions permanent --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 02cee1b..f5a3f3c 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false);

1 0

[tor-browser-bundle/master] Bug 14849: Remove new NoScript option to make permissions permanent
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit c5e6ba341a3cda60cad0fb905213423ad6279b40 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:55:57 2015 -0800 Bug 14849: Remove new NoScript option to make permissions permanent --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 02cee1b..f5a3f3c 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false);

1 0

[torbutton/master] Bug 9387: Be smarter when leaving custom mode
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit a717611c4d067d77f561781f37d4d90196262f5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 16:55:55 2015 +0000 Bug 9387: Be smarter when leaving custom mode We are leaving custom mode now if the user manages it to undo all security slider related preference changes manually. If, on the other hand, the user changes a relevant preference while being in one of the four regular slider modes we don't bother checking all preferences and switch to the custom mode immediately. --- src/chrome/content/torbutton.js | 183 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9cdb792..99b3e50 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -243,17 +243,29 @@ var torbutton_unique_pref_observer = case "media.opus.enabled": case "media.wave.enabled": case "media.apple.mp3.enabled": - // XXX: This logic is bad.. Instead, we need a check here - // that only sets custom if the prefs differ from the current - // security slider level (and also can set it back if they are the same). + // |m_tb_slider_update| is only set if the user updated a + // preference under control of the security slider via the + // slider on the Torbutton dialog. This in turn means we can + // skip the code dealing with setting/unsetting the custom mode + // in this case. if (!m_tb_sliderUpdate) { - // Do we already have custom settings? - let customSlider = m_tb_prefs. - getBoolPref("extensions.torbutton.security_custom"); - if (!customSlider) { - m_tb_prefs. - setBoolPref("extensions.torbutton.security_custom", true); - } + // Do we already have custom settings? + let customSlider = m_tb_prefs. + getBoolPref("extensions.torbutton.security_custom"); + // A preference governed by the security slider got changed + // but we are not in custom mode yet. Change that. + if (!customSlider) { + m_tb_prefs. + setBoolPref("extensions.torbutton.security_custom", + true); + } else { + // We are in custom mode. Check whether all prefs are + // reset and reset the mode if so. Otherwise we remain + // in custom mode. + torbutton_log(4, "custom mode and we got: " + data); + torbutton_security_slider_custom_check(m_tb_prefs. + getIntPref("extensions.torbutton.security_slider")); + } } break; } @@ -2272,7 +2284,7 @@ function torbutton_update_security_slider() { m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) // noscript.globalHttpsWhitelist is special: We don't want it in this // mode. - if (p == "noscript.globalHttpsWhitelist") { + if (p === "noscript.globalHttpsWhitelist") { m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) } } @@ -2293,6 +2305,155 @@ function torbutton_update_security_slider() { m_tb_sliderUpdate = false; } +// The user (re)set a pref which is relevant to the security slider while she +// was in custom mode. Check whether the preference values fit to the mode which +// is still on the slider. Iff so, we are leaving the custom mode. +function torbutton_security_slider_custom_check(mode) { + let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); + switch (mode) { + case 1: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { + + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } else { + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 2: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { + + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } else { + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 3: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + // We have the whitelist and JavaScript is disabled in medium-high + // mode as well. + if (p === "noscript.global") { + continue; + } + return; + } + } + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 4: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + // We don't want to have the whitelist in high mode. JavaScript is + // disabled globally. + if (p === "noscript.globalHttpsWhitelist") { + continue; + } + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + } +} + // Bug 1506 P0: This code is a toggle-relic. // // It basically just enforces the three Torbutton prefs

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13406-01'
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 0ac77f28bed415b27942d5264b0e5037fb57c2a1 Merge: a717611 2ccb9cb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 14:51:05 2015 -0800 Merge remote-tracking branch 'brade/bug13406-01' src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-)

1 0

[torbutton/master] Use unicode elipsis in new menus.
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit a99ed677a29482999e99dd08e3e9208d91fd0f6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 14:02:22 2015 -0800 Use unicode elipsis in new menus. Might as well standardize on this, rather than going back and forth. --- src/chrome/locale/en/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 9709670..7a4284f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[torbutton/master] Bug 13406: Stop directing users to download-easy.html.en
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 2ccb9cb66415e4f5de5fc4b496272921cac6614f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 9 11:19:33 2015 -0500 Bug 13406: Stop directing users to download-easy.html.en Always display a "Check for Tor Browser Update..." menu item (to avoid localization issues, the menu item label entity was not renamed). When the menu item is chosen, open the Update Service prompt window to perform the update check. --- src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 5f12f2b..e61dcfe 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -37,13 +37,12 @@ label="&torbutton.context_menu.networksettings;" accesskey="&torbutton.context_menu.networksettings.key;" oncommand="torbutton_open_network_settings()"/> - <menuseparator hidden="true"/> - <menuitem id="torbutton-downloadUpdate" + <menuseparator/> + <menuitem id="torbutton-checkForUpdate" label="&torbutton.context_menu.downloadUpdate;" accesskey="&torbutton.context_menu.downloadUpdate.key;" insertafter="context-stop" - oncommand="torbutton_download_update()" - hidden="true"/> + oncommand="torbutton_check_for_update()"/> </vbox> <vbox>  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 72c7d41..9709670 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index f368c9c..2c6bbfb 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -101,7 +101,7 @@ statusbarpanel#plugins-status[status="0"] { list-style-image: url("chrome://torbutton/skin/poff.png"); } -#torbutton-downloadUpdate { +#torbutton-checkForUpdate[tbUpdateNeeded] { font-weight: bold; } @@ -118,4 +118,4 @@ svg#tor-circuit circle.node-circle { stroke: #195021; stroke-width: 2px; fill: white; -} \ No newline at end of file +}

1 0

[torbutton/master] Bug 9387: Unlock the slider if "custom" is set
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit dd28b7b49cfc775afcc0adf9b922193acded9a7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 13:08:12 2015 +0000 Bug 9387: Unlock the slider if "custom" is set If the custom mode is checked allow disabling it on the preference dialog directly by clicking on the description or dragging the thumb. --- src/chrome/content/preferences.js | 29 +++++++++++++---------------- src/chrome/content/preferences.xul | 1 - 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index f67906c..1151176 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -189,12 +189,15 @@ function torbutton_prefs_init(doc) { let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); sec_slider.value = o_torprefs.getIntPref('security_slider'); - sec_slider.disabled = custom_values; - // Setting |disabled| to |false| is not enough to have the element - // non-responding. We need to handle |movetoclick| as well. - sec_slider.setAttribute("movetoclick", !custom_values); sec_custom.checked = custom_values; sec_custom.disabled = !custom_values; + // If the custom checkbox is checked and the user is done with dragging + // uncheck the checkbox to allow setting the (newly) chosen security level. + sec_slider.dragStateChanged = function(isDragging) { + if (!isDragging && sec_custom.checked) { + sec_custom.checked = false; + } + } torbutton_prefs_set_field_attributes(doc); } @@ -462,17 +465,11 @@ function torbutton_prefs_reset_defaults() { } function torbutton_toggle_slider(doc, pos) { - let slider = doc.getElementById("torbutton_sec_slider"); - // onclick is active even if the element it belongs to is disabled. - if (pos && !slider.disabled) { - slider.value = pos; - } else { - if (doc.getElementById("torbutton_sec_custom").checked) { - slider.disabled = true; - slider.setAttribute("movetoclick", false); - } else { - slider.disabled = false; - slider.setAttribute("movetoclick", true); - } + doc.getElementById("torbutton_sec_slider").value = pos; + // Make sure the custom checkbox is unchecked as the user seems to want one + // of the defined security levels. + let sec_custom = doc.getElementById("torbutton_sec_custom"); + if (sec_custom.checked) { + sec_custom.checked = false; } } diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index cb5f1ab..57b013a 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -188,7 +188,6 @@ </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_toggle_slider(document, 0);" label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox>

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 10 Feb '15

10 Feb '15

commit 3ca6c0d865ed85322f40ad6f34f975b69dbf48c7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 10 17:45:39 2015 +0000 Update translations for tails-misc_completed --- pl.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pl.po b/pl.po index ad776f0..8047254 100644 --- a/pl.po +++ b/pl.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-14 16:01+0100\n" -"PO-Revision-Date: 2015-02-10 17:15+0000\n" +"PO-Revision-Date: 2015-02-10 17:41+0000\n" "Last-Translator: oirpos <kuba2707(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -355,7 +355,7 @@ msgstr "Tor nie jest gotowy" #: config/chroot_local-includes/usr/local/bin/tor-browser:19 msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "Tor nie jest gotowy. Uruchomić Tor Browser?" +msgstr "Tor nie jest gotowy. Uruchomić Tor Browser mimo tego?" #: config/chroot_local-includes/usr/local/bin/tor-browser:20 msgid "Start Tor Browser" @@ -367,14 +367,14 @@ msgstr "Anuluj" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "Czy naprawde chcesz uruchomić Niebezpieczną Przeglądarkę?" +msgstr "Czy jesteś pewien, że chcesz uruchomić Niebezpieczną Przeglądarkę?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 msgid "" "Network activity within the Unsafe Browser is not anonymous. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "Aktywność w sieci w Niebezpiecznej Przeglądarce nie jest anonimowe. Należy używać Niebezpiecznej Przeglądarki tylko w razie potrzeby, na przykład, jeśli musisz się zalogować lub zarejestrować, aby uaktywnić połączenie z Internetem." +msgstr "Aktywność w sieci w Niebezpiecznej Przeglądarce nie jest anonimowa. Należy używać Niebezpiecznej Przeglądarki tylko jeśli jest to konieczne, na przykład, jeśli musisz zalogować się lub zarejestrować, aby uaktywnić połączenie z Internetem." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "_Launch" @@ -390,11 +390,11 @@ msgstr "Uruchamianie Niebezpiecznej Przeglądarki..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "This may take a while, so please be patient." -msgstr "To może potrwać chwilę, prosimy o cierpliwość." +msgstr "To może chwilę potrwać, prosimy o cierpliwość." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121 msgid "Failed to setup chroot." -msgstr "Nie udało się ustawić chroot." +msgstr "Nie udało się skonfigurować chroot." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:195 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 @@ -409,41 +409,41 @@ msgstr "Wyłączanie Niebezpiecznej Przeglądarki..." msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." -msgstr "To może potrwać chwilę i tym samym możesz nie zrestartować Niebezpiecznej Przeglądarki dopóki nie zostanie ona poprawnie wyłączona." +msgstr "To może chwilę potrwać. Nie restartuj Niebezpiecznej Przeglądarki dopóki nie zostanie ona poprawnie wyłączona." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:264 msgid "Failed to restart Tor." -msgstr "Nie udało zrestartować się Tor'a." +msgstr "Nie udało się zrestartować Tor'a." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:272 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "Już jedna Niebezpieczna Przeglądarka jest uruchomiona, lub jest obenie czyszczona. Proszę spróbuj ponownie za chwilę." +msgstr "Niebezpieczna Przeglądarka jest już uruchomiona albo aktualnie czyszczona. Proszę spróbuj ponownie za chwilę." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:285 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." -msgstr "Nie otrzymano żadnego serwera DNS używając DHCP lub ręcznej konfiguracji w NetworkManager." +msgstr "Nie otrzymano żadnego serwera DNS poprzez DHCP ani z ręcznej konfiguracji w NetworkManager." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 msgid "I2P failed to start" -msgstr "Nie udało uruchomić się IP2" +msgstr "Nie udało się uruchomić I2P" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "Coś poszło nie tak kiedy próbowano uruchomić I2P. Po więcej informacji sprawdź logi w /var/log/i2p." +msgstr "Coś poszło nie tak kiedy próbowano uruchomić I2P. Aby dowiedzieć się więcej sprawdź /var/log/i2p." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 msgid "I2P's router console is ready" -msgstr "Konsola Routera I2P jest gotowa." +msgstr "Konsola Routera I2P jest gotowa" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Możesz teraz używać konsolę routera I2P na http://127.0.0.1:7657." +msgstr "Możesz teraz używać konsolę routera I2P pod adresem http://127.0.0.1:7657." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 msgid "I2P is not ready" @@ -454,7 +454,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console at " "http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." " Reconnect to the network to try again." -msgstr "Tunel Eepsite nie został zbudowany w ciągu sześciu minut. Sprawdź konsolę routera na http://127.0.0.1:7657/logs lub logi w /var/log/i2p dla więcej informacji. Połącz się ponownie z siecią, aby spróbować jeszcze raz." +msgstr "Tunel Eepsite nie został skompilowany w ciągu ostatnich sześciu minut. Sprawdź konsolę routera na http://127.0.0.1:7657/logs lub logi w /var/log/i2p dla więcej informacji. Połącz się ponownie z siecią aby spróbować jeszcze raz." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is ready" @@ -462,7 +462,7 @@ msgstr "I2P jest gotowe" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "You can now access services on I2P." -msgstr "Teraz możesz używać serwisów on I2P." +msgstr "Teraz możesz używać serwisów w I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -475,11 +475,11 @@ msgstr "Dokumentacja Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "Naucz się jak używać Tails" +msgstr "Dowiedz się jak używać Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "Anonimowa nakładowa sieć przeglądarki" +msgstr "Przeglądarka anonimowej sieci" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" @@ -491,11 +491,11 @@ msgstr "Dowiedz się więcej o Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" -msgstr "Reset" +msgstr "Zrestartuj" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 msgid "Immediately reboot computer" -msgstr "Natychmiastowo zrestartuj computer" +msgstr "Natychmiast zrestartuj komputer" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" @@ -503,7 +503,7 @@ msgstr "Wyłącz" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" -msgstr "Natychmiastowo wyłącz komputer" +msgstr "Natychmiast wyłącz komputer" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser"

1 0