June 2014 - tor-commits - lists.torproject.org

[orbot/master] ensure status is not set to CONNECTING incorrectly
by n8fr8＠torproject.org 27 Jun '14

27 Jun '14

commit 10ceafad3b32965509fc87b805f6c2246a241a2c Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 27 13:02:55 2014 -0400 ensure status is not set to CONNECTING incorrectly --- src/org/torproject/android/service/TorService.java | 131 +++----------------- 1 file changed, 20 insertions(+), 111 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 35fbbc5..3ddc112 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -52,6 +52,7 @@ import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.AsyncTask; +import android.os.Environment; import android.os.Handler; import android.os.IBinder; import android.os.RemoteCallbackList; @@ -614,6 +615,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void initTor () throws Exception { + currentStatus = STATUS_CONNECTING; + try { initBinaries(); @@ -631,8 +634,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst enableBinExec(fileXtables); updateSettings (); - - currentStatus = STATUS_CONNECTING; logNotice(getString(R.string.status_starting_up)); sendCallbackStatusMessage(getString(R.string.status_starting_up)); @@ -902,11 +903,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = TorControlConnection.getConnection(torConnSocket); - if (ENABLE_DEBUG_LOG) - { - conn.setDebugging(System.out); - - } logNotice( "SUCCESS connected to Tor control port"); @@ -928,6 +924,17 @@ public class TorService extends Service implements TorServiceConstants, TorConst String torProcId = conn.getInfo("process/pid"); + if (ENABLE_DEBUG_LOG) + { + File fileLog = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"orbot-control-log.txt"); + PrintWriter pr = new PrintWriter(new FileWriter(fileLog,true)); + conn.setDebugging(pr); + + File fileLog2 = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"orbot-tor-log.txt"); + conn.setConf("Log", "info file " + fileLog2.getCanonicalPath()); + + } + return Integer.parseInt(torProcId); } @@ -1128,8 +1135,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { initTor(); - currentStatus = STATUS_CONNECTING; - } catch (Exception e) { @@ -1166,48 +1171,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - - - private Handler mHandlerStatusChecker = null; - - private void enableStatusChecker () - { - - if (mHandlerStatusChecker != null) - mHandlerStatusChecker = new Handler(); - - mHandlerStatusChecker.postDelayed(new Runnable () - { - public void run () - { - if (conn != null) - { - try - { - String state = conn.getInfo("dormant"); - if (state != null && Integer.parseInt(state) == 0) - { - currentStatus = STATUS_ON; - - } - else - { - currentStatus = STATUS_CONNECTING; - showToolbarNotification(getString(R.string.no_internet_connection_tor),NOTIFY_ID,R.drawable.ic_stat_tor_off,prefPersistNotifications); - - } - } - catch (Exception e){} - - mHandlerStatusChecker.postDelayed(this,1000); - } - - - } - },1000); - } public void newDescriptors(List<String> orList) { @@ -1255,19 +1219,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst } public void bandwidthUsed(long read, long written) { - + if (read != lastRead || written != lastWritten) { - StringBuilder sb = new StringBuilder(); - sb.append(getString(R.string.bandwidth_)); - sb.append(" "); + StringBuilder sb = new StringBuilder(); sb.append(formatCount(read)); - sb.append(" "); - sb.append(getString(R.string.down)); + sb.append(" \u2193"); sb.append(" / "); sb.append(formatCount(written)); - sb.append(" "); - sb.append(getString(R.string.up)); + sb.append(" \u2191"); int iconId = R.drawable.ic_stat_tor; @@ -1294,8 +1254,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst // Under 2Mb, returns "xxx.xKb" // Over 2Mb, returns "xxx.xxMb" if (count < 1e6) - return ((float)((int)(count*10/1024))/10 + "kbps"); - return ((float)((int)(count*100/1024/1024))/100 + "mbps"); + return ((float)((int)(count*10/1024))/10 + "Kbps"); + return ((float)((int)(count*100/1024/1024))/100 + "Mbps"); //return count+" kB"; } @@ -2216,56 +2176,5 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - /** - private Timer mTorMinder; - - private void startTorMinder () - { - mTorMinder = new Timer(true); - mTorMinder.scheduleAtFixedRate( - new TimerTask() { - public void run() { - - if (currentStatus == STATUS_OFF) - { - mTorMinder.cancel(); - } - else - { - - try { - int foundPrcId = TorServiceUtils.findProcessId(fileTor.getCanonicalPath()); - - if (foundPrcId != -1) - { - mLastProcessId = foundPrcId; - - logNotice("Refreshed Tor process id: " + mLastProcessId); - - } - else - { - logNotice("restarting Tor after it has been killed"); - killTorProcess(); - initTor(); - } - - } catch (Exception e1) { - logException("Error in Tor heartbeat checker",e1); - - } - } - - - } - }, 0, 30 * 1000); //every 30 seconds - } - - private void stopTorMinder () - { - if (mTorMinder != null) - mTorMinder.cancel(); - } - **/ }

1 0

[orbot/master] remove diag/test menu
by n8fr8＠torproject.org 27 Jun '14

27 Jun '14

commit bfa1d562088bff5dc87589a411fce3e48ba983fe Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 27 13:03:06 2014 -0400 remove diag/test menu --- res/menu/main.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/menu/main.xml b/res/menu/main.xml index df929ab..a42eb1f 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -73,13 +73,14 @@ /> - +  </menu> <!--

1 0

[orbot/master] update to 14.0.5-alpha
by n8fr8＠torproject.org 27 Jun '14

27 Jun '14

commit fbc1a87c28a1563553d953089d77763fdb44b008 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 27 13:03:21 2014 -0400 update to 14.0.5-alpha --- AndroidManifest.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 615a270..43bfd20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.4.2" - android:versionCode="107" + android:versionName="14.0.5-alpha" + android:versionCode="108" android:installLocation="auto" > @@ -13,6 +13,7 @@ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" @@ -55,7 +56,7 @@ <action android:name="org.torproject.android.START_TOR" /> </intent-filter> - +  </activity> +  <activity android:name=".wizard.LotsaText" android:exported="false"/> <activity android:name=".wizard.Permissions" android:exported="false"/>

1 0

[tor-browser-bundle/master] Update Torbutton to 1.6.11.0. Downgrade meek to 0.8.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 4ecc40a4a45508b513321767f77b9e6e67f01c15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:47:58 2014 -0700 Update Torbutton to 1.6.11.0. Downgrade meek to 0.8. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions.alpha | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f3ea6ce..1e2aecd 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,8 +5,10 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 4 2014 * Update NoScript to 2.6.8.30rc4 * Update HTTPS Everywhere to 3.5.3 * Script permissions now apply based on URL bar - * Update Torbutton to 1.6.10.1 + * Update Torbutton to 1.6.11.0 * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. * Update Tor Launcher to 0.2.6.0 * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 479b6df..a724e48 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.6.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.10.1 +TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.8 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[torbutton/master] Write changelog and bump version for 1.6.11.0.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 2a8e082315364149fd64129bc56e6f861132a5d4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:45:38 2014 -0700 Write changelog and bump version for 1.6.11.0. --- src/CHANGELOG | 7 ++++++- src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9d4336b..a1c1428 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,5 +1,10 @@ +1.6.11.0 + 27 Jun 2014 + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + 1.6.10.1 - 5 Jun 2014 + 26 Jun 2014 * Bug #12221: Remove obsolete Javascript components from the toggle era 1.6.10.0 diff --git a/src/install.rdf b/src/install.rdf index 9da99e3..5eb071a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.10.1</em:version> + <em:version>1.6.11.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_9268_final_stopgap_rebased'
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 8e38c9f33fbfcccfd9b4071360a976b67c340cee Merge: 7d3a231 32003e1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:34:08 2014 -0700 Merge remote-tracking branch 'gk/bug_9268_final_stopgap_rebased' src/chrome/content/torbutton.js | 91 ++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 20 deletions(-)

1 0

[torbutton/master] Bug 9268: Fix some resizing corner cases.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit 32003e19d4a0f41d5c9bdc12fa6db6e6e3836e9a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 26 15:10:48 2014 +0000 Bug 9268: Fix some resizing corner cases. We now take the DPI value into account when calculating the width and height of the browser window. Furthermore, using GetAvailRect() helps to take care of taskbars that could influence the available height. At least two corner-corner cases remain: 1) On some Linux machines the height of the titlebar is not included in outerHeight(). Thus, we guess with a pretty safe margin. 2) On some systems retrieving the available height is giving the screen height back which could lead to problems if taskbars are available. Fixing those two problems (and presumably others yet to be reported) is out of the scope for this patch. However, in order to give the user the option to overwrite the miscalculation two preferences extensions.torbutton.window.innerWidth extensions.torbutton.window.innerHeigth are consulted. If they are set their values are used when resizing the inner window. --- src/chrome/content/torbutton.js | 91 ++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 589e7c5..b149a30 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -44,6 +44,9 @@ var m_tb_control_pass = null; var m_tb_orig_BrowserOnAboutPageLoad = null; +var m_tb_domWindowUtils = window.QueryInterface(Ci.nsIInterfaceRequestor). + getInterface(Ci.nsIDOMWindowUtils); + // Bug 1506 P1: This object is only for updating the UI for toggling and style var torbutton_window_pref_observer = { @@ -2896,10 +2899,6 @@ var torbutton_resizelistener = progress.removeProgressListener(this); return; } - var screenMan = Components.classes["@mozilla.org/gfx/screenmanager;1"]. - getService(Components.interfaces.nsIScreenManager); - var junk = {}, availWidth = {}, availHeight = {}; - screenMan.primaryScreen.GetRect(junk, junk, availWidth, availHeight); // We need to set the inner width to an initial value because it has none // at this point... Choosing "300" as this works even on Windows @@ -2907,26 +2906,78 @@ var torbutton_resizelistener = win.innerWidth = 300; win.innerHeight = 300; - torbutton_log(3, "About to resize new window: " + window.outerWidth + - "x" + window.outerHeight + " inner: " + win.innerWidth + "x" + win. - innerHeight + " in state " + window.windowState + " Have " + - availWidth.value + "x" + availHeight.value); + var screenMan = Components.classes["@mozilla.org/gfx/screenmanager;1"]. + getService(Components.interfaces.nsIScreenManager); + var junk = {}, availWidth = {}, availHeight = {}; + screenMan.primaryScreen.GetAvailRect(junk, junk, availWidth, availHeight); + + torbutton_log(3, "About to resize window: " + + window.outerWidth + "x" + window.outerHeight + + " inner: " + win.innerWidth + "x" + win.innerHeight + + " in state " + window.windowState + + " Available: " + availWidth.value + "x" + + availHeight.value); + + var diff_height = window.outerHeight - win.innerHeight; + var diff_width = window.outerWidth - win.innerWidth; + var delta_fix = 0; + + // The following block tries to cope with funny corner cases where the + // title bar is not included in window.outerHeight. What could happen in + // this case? Well, assume the difference between window.outerHeight and + // win.innerHeight is 39. And lets further assume the available height is + // 725x539. If we resize the window in this case we get 600x500 for the + // inner window. And the outer window has a height of 539 *plus* the + // height of the titlebar (as it occupies some screen space at least + // after resizing) which probably leads to parts of the browser being not + // visible. + if (window.outerHeight == window.innerHeight) { + // XXX: Let's assume a reasonable safety margin. + // |delta_fix = Math.floor(window.mozInnerScreenY) - window.screenY;| + // is not working at this stage of the browser start-up. Although it + // would give us slightly better values. But calling it later makes + // the resizing visible even on fast computers which is bad for UX. + delta_fix = Math.floor(diff_height / 2); + } - var maxHeight = availHeight.value - - (window.outerHeight - win.innerHeight) - 51; - var maxWidth = availWidth.value - (window.outerWidth - win.innerWidth); - torbutton_log(3, "Got max dimensions: " + maxWidth + "x" + maxHeight); + // Check the DPI value and take it into acctount later when calculating + // the max* values. + var dpi = m_tb_domWindowUtils.screenPixelsPerCSSPixel; + + // We can't use screen resolution here as it does not account for e.g. + // taskbars. We can't use window.screen.avail* either as it does not + // report correct values on some platforms when used at this stage in the + // startup process. Therefore, we resort to nsIScreenManager. + // XXX: Note though, there are probably still some OS/window manager + // configurations where this approach is not working. E.g. on a Debian + // with XFCE the available height is the same as the screen height. + // This is said to happen as well on Windows with Aero: + // https://stackoverflow.com/questions/3044230/ + // difference-between-screen-availheight-and-window-height + var maxHeight = Math.floor(availHeight.value / dpi) - + (diff_height + delta_fix); + var maxWidth = Math.floor(availWidth.value / dpi) - diff_width ; var width; var height; - if (maxWidth > 1000) { - width = 1000; - } else { - width = Math.floor(maxWidth/200.0)*200; + // Allow the user to overwrite the Torbutton logic in case it is still + // wrong when resizing the window. + try { + width = m_tb_prefs.getIntPref("extensions.torbutton.window.innerWidth"); + } catch(e) { + if (maxWidth > 1000) { + width = 1000; + } else { + width = Math.floor(maxWidth/200.0)*200; + } } - height = Math.floor(maxHeight/100.0)*100; + try { + height = m_tb_prefs.getIntPref("extensions.torbutton.window.innerHeight"); + } catch(e) { + height = Math.floor(maxHeight/100.0)*100; + } var handler = function() { if (window.windowState === 1) { @@ -2973,8 +3024,8 @@ var torbutton_resizelistener = // instead of assignment or resizeTo() win.resizeBy(width - win.innerWidth, height - win.innerHeight); torbutton_log(3, "Resized new window from: " + win.innerWidth + "x" + - win.innerHeight + " to " + width + "x" + height + " in state " + - window.windowState); + win.innerHeight + " to " + width + "x" + height + + " in state " + window.windowState); // Resizing within this progress listener does not always work as overlays // of other extensions might still influence the height/width of the @@ -2992,7 +3043,7 @@ var torbutton_resizelistener = win.innerWidth + " x " + win.innerHeight); setTimeout(function() { win.resizeBy(width - win.innerWidth, - height - win.innerHeight); + height - win.innerHeight); torbutton_log(3, "Mutation observer: Window " + "dimensions are (after resizing again): " + win. innerWidth + " x " + win.innerHeight);

1 0

[torbutton/master] Bug 10819: Bind new third party isolation pref to the Torbutton pref.
by mikeperry＠torproject.org 27 Jun '14

27 Jun '14

commit e4504d77dad74914803c902d3296de6c5c493e7f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 27 09:42:46 2014 -0700 Bug 10819: Bind new third party isolation pref to the Torbutton pref. This makes the UI option apply to this new pref. --- src/chrome/content/torbutton.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b149a30..3e7cf62 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1995,7 +1995,11 @@ function torbutton_update_fingerprinting_prefs() { function torbutton_update_thirdparty_prefs() { var mode = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty"); - + + try { + m_tb_prefs.setBoolPref("privacy.thirdparty.isolate", mode); + } catch(e) {} + if (mode) { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 1); } else {

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 27 Jun '14

27 Jun '14

commit 00cd79e8b28aa1309bf93bb75232f1fc487451b7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 27 11:45:45 2014 +0000 Update translations for torbutton-torbuttonproperties --- et/torbutton.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/et/torbutton.properties b/et/torbutton.properties index 6700b72..bb3c1f3 100644 --- a/et/torbutton.properties +++ b/et/torbutton.properties @@ -27,7 +27,7 @@ torbutton.popup.external.note = Some types of files can cause applications to co torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n torbutton.popup.launch = Lae alla fail torbutton.popup.cancel = Katkesta -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Automaatselt allalaetud failid nüüdsest torbutton.popup.test.no_http_proxy = Tor vaheserveri kontroll: kohalik HTTP vaheserver kättesaamatu. Kas Polipo jookseb korralikult? torbutton.popup.captcha.title = Vältida Google CAPTCHA-sid? torbutton.popup.captcha.ask = Tor tuvastas Google CAPTCHA. Kas sa soovid, et sind suunatakse selle päringuga ümber mõne teise otsingumootori juurde? @@ -40,16 +40,16 @@ torbutton.popup.use_tbb = Näib, et sa kasutat Torbuttonit koos Firefoxiga, mis torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. -torbutton.title.prompt_torbrowser = Important Torbutton Information +torbutton.title.prompt_torbrowser = Oluline Torbuttoni informatsioon torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.never_ask_again = Ära küsi seda kunagi enam # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future +canvas.allow=Luba tulevikus canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=Mitte kunagi sellel lehel canvas.neverAccessKey=e

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 27 Jun '14

27 Jun '14

commit 459db8aeedfafc30913c7bd593402aafa260e985 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 27 11:15:44 2014 +0000 Update translations for torbutton-torbuttonproperties --- et/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/et/torbutton.properties b/et/torbutton.properties index 5564715..6700b72 100644 --- a/et/torbutton.properties +++ b/et/torbutton.properties @@ -25,7 +25,7 @@ torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.launch = Lae alla fail torbutton.popup.cancel = Katkesta torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor vaheserveri kontroll: kohalik HTTP vaheserver kättesaamatu. Kas Polipo jookseb korralikult?

1 0