deleted file mode 100644

@@ -1,129 +0,0 @@

-## translation metadata

-# Revision: $Revision$

-# Translation-Priority: 3-low

-

-#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8"

-<div id="content" class="clearfix">

-	<div id="breadcrumbs">

-    <a href="<page index>">Home &raquo; </a>

-    <a href="<page torbutton/index>">Torbutton</a>

-  </div>

-	<div id="maincol"> 

-    <!-- PUT CONTENT AFTER THIS TAG -->

-    

-    <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>

-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/>

-    <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>

-    <script type="text/javascript">

-    

-    function addSearchProvider(prov) {

-    

-    try {

-    window.external.AddSearchProvider(prov);

-    }

-    

-    catch (e) {

-    alert("Search plugins require Firefox 2");

-    return;

-    }

-    }

-    

-    function addEngine(name,ext,cat,pid)

-    {

-      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {

-        window.sidebar.addSearchEngine(

-          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src",

-          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat );

-      } else {

-        alert("You will need a browser which supports Sherlock to install this plugin.");

-      }

-    }

-    

-    function addOpenSearch(name,ext,cat,pid,meth)

-    {

-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {

-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {

-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");

-        } else {

-          window.external.AddSearchProvider(

-            "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml");

-        }

-      } else {

-        alert("You will need a browser which supports OpenSearch to install this plugin.");

-      }

-    }

-    

-    function addOpenSearch2(name,ext,cat,pid,meth)

-    {

-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {

-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {

-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");

-        } else {

-          window.external.AddSearchProvider(

-            "http://torbutton.torproject.org/dev/search/" + name + ".xml");

-        }

-      } else {

-        alert("You will need a browser which supports OpenSearch to install this plugin.");

-      }

-    }

-    

-    function install (aEvent)

-    {

-      var params = {

-        "Torbutton": { URL: aEvent.target.href,

-                 Hash: aEvent.target.getAttribute("hash"),

-                 toString: function () { return this.URL; }

-        }

-      };

-      InstallTrigger.install(params);

-    

-      return false;

-    }

-    

-    

-    </script>

-    

-    <h2>Torbutton</h2>

-    <hr>

-

-    <p>

-    Torbutton is the component in <a href="<page projects/torbrowser>">Tor

-    Browser Bundle</a> that takes care of application-level

-    security and privacy concerns in Firefox.  To keep you safe,

-    Torbutton disables many types of active content.

-    </p>

-

-    <p>

-    Now that the <a href="<page projects/torbrowser>">Tor Browser

-    Bundle</a> includes a patched version of Firefox, and because we don't

-    have enough developer resources to keep up with the accelerated

-    Firefox release schedule, the toggle model of Torbutton is <a

-    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

-    longer supported</a>. <b>Users should be using Tor Browser Bundle,

-    not installing Torbutton themselves.</b>

-    </p>

-

-    <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

-

-    <strong>Source:</strong> You can <a

-    href="https://gitweb.torproject.org/torbutton.git">browse the

-    repository</a> or simply unzip the xpi.

-    <br/>

-    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>

-    <strong>Documents:</strong> 

-    <b>[</b> 

-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>

-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>

-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>

-    

-  </div>

-  <!-- END MAINCOL -->

-  <div id = "sidecol">

-#include "side.wmi"

-#include "info.wmi"

-  </div>

-  <!-- END SIDECOL -->

-</div>

-<!-- END CONTENT -->

-#include <foot.wmi>

-

@@ -99,37 +99,10 @@

     have enough developer resources to keep up with the accelerated

     Firefox release schedule, the toggle model of Torbutton is <a

     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

-    longer recommended</a>. <b>Users should be using Tor Browser Bundle,

+    longer supported</a>. <b>Users should be using Tor Browser Bundle,

     not installing Torbutton themselves.</b>

     </p>

-    <br/><br/>

-    <strong>Current stable version:</strong><version-torbutton><br/>

-    <strong>Current alpha version:</strong><version-torbutton-alpha><br/>

-    <br/>

-    <strong>Maintainer:</strong> Mike Perry<br/>

-    <br/>

-    <strong>Expert Install (Stable):</strong> Click to <a

-    href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"

-    hash="<version-hash-torbutton>" onclick="return

-    install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>

-<!--

-    <strong>Expert Install (Alpha):</strong> Click to 

-    <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"

-      hash="<version-hash-torbutton-alpha>"

-      onclick="return install(event);">install from this website</a>

-    <br/>

-  -->

-<!--

-   <strong>English Google Search:</strong> 

-    Google search plugins for

-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

-     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 

-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

-     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

-    <br/>

-  -->

-    <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>

     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

     <strong>Source:</strong> You can <a

@@ -137,8 +110,8 @@

     repository</a> or simply unzip the xpi.

     <br/>

     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>

-    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>

-    <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b>

+    <strong>Documents:</strong> 

+    <b>[</b> 

     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>

     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>

     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 3-low

-#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

+#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8"

 <div id="content" class="clearfix">

 	<div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

@@ -85,23 +85,42 @@

     <h2>Torbutton</h2>

     <hr>

-    

+

+    <p>

+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor

+    Browser Bundle</a> that takes care of application-level

+    security and privacy concerns in Firefox.  To keep you safe,

+    Torbutton disables many types of active content.

+    </p>

+

+    <p>

+    Now that the <a href="<page projects/torbrowser>">Tor Browser

+    Bundle</a> includes a patched version of Firefox, and because we don't

+    have enough developer resources to keep up with the accelerated

+    Firefox release schedule, the toggle model of Torbutton is <a

+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

+    longer recommended</a>. <b>Users should be using Tor Browser Bundle,

+    not installing Torbutton themselves.</b>

+    </p>

+

+    <br/><br/>

     <strong>Current stable version:</strong><version-torbutton><br/>

     <strong>Current alpha version:</strong><version-torbutton-alpha><br/>

     <br/>

     <strong>Maintainer:</strong> Mike Perry<br/>

     <br/>

-    <strong>Install Stable:</strong> Click to <a

+    <strong>Expert Install (Stable):</strong> Click to <a

     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"

     hash="<version-hash-torbutton>" onclick="return

     install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>

 <!--

-    <strong>Install Alpha:</strong> Click to 

+    <strong>Expert Install (Alpha):</strong> Click to 

     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"

       hash="<version-hash-torbutton-alpha>"

       onclick="return install(event);">install from this website</a>

     <br/>

   -->

+<!--

    <strong>English Google Search:</strong> 

     Google search plugins for

     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

@@ -109,8 +128,8 @@

     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

     <br/>

+  -->

     <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>

-    <br/>

     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

     <strong>Source:</strong> You can <a

@@ -119,47 +138,11 @@

     <br/>

     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>

     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>

+    <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b>

     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>

     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>

-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b><br/>

+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>

-    <br/>

-    

-    <p>

-    Torbutton is the component in <a href="<page projects/torbrowser>">Tor

-    Browser Bundle</a> that takes care of application-level security

-    and privacy concerns in Firefox.  To keep you safe, Torbutton

-    disables many types of active content. You can learn more from

-    the <a href="en/design/index.html.en">Design Document</a>, the <a

-    href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more

-    details in the <a href="<page torbutton/torbutton-options>">Torbutton

-    options</a> list.

-    </p>

-

-    <p>

-    Some users may prefer a toolbar button instead of a statusbar panel.

-    Torbutton lets you add a toolbar button by right-clicking

-    on the desired toolbar, selecting "Customize...", and then dragging the

-    Torbutton icon onto the toolbar.  There is an option in the preferences

-    to hide the statusbar panel (Tools->Extensions, select Torbutton,

-    and click on Preferences).

-    </p>

-

-    <p>

-    Originally Torbutton was a 1-click way for Firefox users to enable or disable

-    the browser's use of <a href="<page index>">Tor</a>.

-    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or

-    "Tor Disabled" (in red).  The user may click on the panel to toggle

-    the status.  If the user (or some other extension) changes the proxy

-    settings, the change is automatically reflected in the statusbar.) But

-    now that the <a href="<page projects/torbrowser>">Tor Browser

-    Bundle</a> includes a patched version of Firefox, and because we don't

-    have enough developer resources to keep up with the accelerated

-    Firefox release schedule, the toggle model of Torbutton is <a

-    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

-    longer recommended</a>.

-    </p>

-

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -136,6 +136,15 @@

     options</a> list.

     </p>

+    <p>

+    Some users may prefer a toolbar button instead of a statusbar panel.

+    Torbutton lets you add a toolbar button by right-clicking

+    on the desired toolbar, selecting "Customize...", and then dragging the

+    Torbutton icon onto the toolbar.  There is an option in the preferences

+    to hide the statusbar panel (Tools->Extensions, select Torbutton,

+    and click on Preferences).

+    </p>

+

     <p>

     Originally Torbutton was a 1-click way for Firefox users to enable or disable

     the browser's use of <a href="<page index>">Tor</a>.

@@ -151,14 +160,6 @@

     longer recommended</a>.

     </p>

-    <p>

-    Some users may prefer a toolbar button instead of a statusbar panel.

-    Torbutton lets you add a toolbar button by right-clicking

-    on the desired toolbar, selecting "Customize...", and then dragging the

-    Torbutton icon onto the toolbar.  There is an option in the preferences

-    to hide the statusbar panel (Tools->Extensions, select Torbutton,

-    and click on Preferences).

-    </p>

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -126,21 +126,31 @@

     <br/>

     <p>

-    Torbutton is a 1-click way for Firefox users to enable or disable

+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor

+    Browser Bundle</a> that takes care of application-level security

+    and privacy concerns in Firefox.  To keep you safe, Torbutton

+    disables many types of active content. You can learn more from

+    the <a href="en/design/index.html.en">Design Document</a>, the <a

+    href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more

+    details in the <a href="<page torbutton/torbutton-options>">Torbutton

+    options</a> list.

+    </p>

+

+    <p>

+    Originally Torbutton was a 1-click way for Firefox users to enable or disable

     the browser's use of <a href="<page index>">Tor</a>.

-    It adds a panel to the statusbar that says "Tor Enabled" (in green) or

+    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or

     "Tor Disabled" (in red).  The user may click on the panel to toggle

     the status.  If the user (or some other extension) changes the proxy

-    settings, the change is automatically reflected in the statusbar.

+    settings, the change is automatically reflected in the statusbar.) But

+    now that the <a href="<page projects/torbrowser>">Tor Browser

+    Bundle</a> includes a patched version of Firefox, and because we don't

+    have enough developer resources to keep up with the accelerated

+    Firefox release schedule, the toggle model of Torbutton is <a

+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

+    longer recommended</a>.

     </p>

-    

-    <p>

-    To keep you safe, Torbutton disables many types of active content. You

-    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,

-    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton

-    options</a> list.

-    </p>

-    

+

     <p>

     Some users may prefer a toolbar button instead of a statusbar panel.

     Torbutton lets you add a toolbar button by right-clicking

@@ -158,4 +168,5 @@

   <!-- END SIDECOL -->

 </div>

 <!-- END CONTENT -->

-#include <foot.wmi>      

+#include <foot.wmi>

+

@@ -94,7 +94,7 @@

     <strong>Install Stable:</strong> Click to <a

     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"

     hash="<version-hash-torbutton>" onclick="return

-    install(event);">install from this website</a>.<br/>

+    install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>

 <!--

     <strong>Install Alpha:</strong> Click to 

     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"

@@ -89,17 +89,19 @@

     <strong>Current stable version:</strong><version-torbutton><br/>

     <strong>Current alpha version:</strong><version-torbutton-alpha><br/>

     <br/>

-    <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>

+    <strong>Maintainer:</strong> Mike Perry<br/>

     <br/>

     <strong>Install Stable:</strong> Click to <a

     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"

     hash="<version-hash-torbutton>" onclick="return

     install(event);">install from this website</a>.<br/>

+<!--

     <strong>Install Alpha:</strong> Click to 

     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"

       hash="<version-hash-torbutton-alpha>"

       onclick="return install(event);">install from this website</a>

     <br/>

+  -->

    <strong>English Google Search:</strong> 

     Google search plugins for

     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

@@ -94,9 +94,7 @@

     <strong>Install Stable:</strong> Click to <a

     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"

     hash="<version-hash-torbutton>" onclick="return

-    install(event);">install from this website</a> or <a

-    href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install

-    from Mozilla's Add-On site</a><br/>

+    install(event);">install from this website</a>.<br/>

     <strong>Install Alpha:</strong> Click to 

     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"

       hash="<version-hash-torbutton-alpha>"

@@ -109,7 +109,7 @@

     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

     <br/>

-    <strong>Past Releases:</strong> <a href="../dist/torbutton/">Local</a><br/>

+    <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>

     <br/>

     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

@@ -12,7 +12,7 @@

     <!-- PUT CONTENT AFTER THIS TAG -->

     <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>

-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml">

+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/>

     <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>

     <script type="text/javascript">

@@ -119,9 +119,9 @@

     <br/>

     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>

     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>

-    <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>

-    <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>

-    <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS">credits</a> <b>]</b><br/>

+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>

+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>

+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b><br/>

     <br/>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 3-low

-#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

+#include "head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

 <div id="content" class="clearfix">

 	<div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

@@ -1,5 +1,5 @@

 ## translation metadata

-# Revision: $Revision: 0 $

+# Revision: $Revision$

 # Translation-Priority: 3-low

 #include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

@@ -109,7 +109,7 @@

     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

     <br/>

-    <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>

+    <strong>Past Releases:</strong> <a href="../dist/torbutton/">Local</a><br/>

     <br/>

     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

@@ -102,18 +102,17 @@

       hash="<version-hash-torbutton-alpha>"

       onclick="return install(event);">install from this website</a>

     <br/>

+   <strong>English Google Search:</strong> 

+    Google search plugins for

+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

+     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 

+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

+     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

+    <br/>

     <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>

     <br/>

     <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

-#   <strong>Extras:</strong> 

-#    Google search plugins for

-#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

-#     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 

-#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

-#     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

-#    <br/>

-

     <strong>Source:</strong> You can <a

     href="https://gitweb.torproject.org/torbutton.git">browse the

     repository</a> or simply unzip the xpi.

@@ -103,18 +103,17 @@

       onclick="return install(event);">install from this website</a>

     <br/>

     <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>

-    <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

-

-   <strong>Extras:</strong> 

-    

-    Google search plugins for

-    

-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

-     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 

-    

-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

-     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

     <br/>

+    <strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

+

+#   <strong>Extras:</strong> 

+#    Google search plugins for

+#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

+#     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 

+#    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

+#     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

+#    <br/>

+

     <strong>Source:</strong> You can <a

     href="https://gitweb.torproject.org/torbutton.git">browse the

     repository</a> or simply unzip the xpi.

@@ -102,7 +102,7 @@

       hash="<version-hash-torbutton-alpha>"

       onclick="return install(event);">install from this website</a>

     <br/>

-    <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>

+    <strong>Past Releases:</strong> <a href="/dist/torbutton/">Local</a><br/>

     <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

    <strong>Extras:</strong> 

@@ -91,13 +91,14 @@

     <br/>

     <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>

     <br/>

-    <strong>Install Stable:</strong> Click to 

-    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"

-      hash="<version-hash-torbutton>"

-      onclick="return install(event);">install from this website</a> or 

-    <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>

+    <strong>Install Stable:</strong> Click to <a

+    href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"

+    hash="<version-hash-torbutton>" onclick="return

+    install(event);">install from this website</a> or <a

+    href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install

+    from Mozilla's Add-On site</a><br/>

     <strong>Install Alpha:</strong> Click to 

-    <a href="http://www.torproject.org/torbutton/torbutton-current-alpha.xpi"

+    <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"

       hash="<version-hash-torbutton-alpha>"

       onclick="return install(event);">install from this website</a>

     <br/>

@@ -86,15 +86,21 @@

     <h2>Torbutton</h2>

     <hr>

-    <strong>Current version:</strong><version-torbutton><br/>

+    <strong>Current stable version:</strong><version-torbutton><br/>

+    <strong>Current alpha version:</strong><version-torbutton-alpha><br/>

     <br/>

     <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>

     <br/>

-    <strong>Install:</strong> Click to 

-    <a href="https://www.torproject.org/torbutton/torbutton-current.xpi"

+    <strong>Install Stable:</strong> Click to 

+    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"

       hash="<version-hash-torbutton>"

       onclick="return install(event);">install from this website</a> or 

     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>

+    <strong>Install Alpha:</strong> Click to 

+    <a href="http://www.torproject.org/torbutton/torbutton-current-alpha.xpi"

+      hash="<version-hash-torbutton-alpha>"

+      onclick="return install(event);">install from this website</a>

+    <br/>

     <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>

     <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

@@ -96,7 +96,7 @@

       onclick="return install(event);">install from this website</a> or 

     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>

     <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>

-    <strong>Developer Documentation:</strong> <a href="design/index.html.en>">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

+    <strong>Developer Documentation:</strong> <a href="design/index.html.en">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

    <strong>Extras:</strong> 

@@ -96,8 +96,9 @@

       onclick="return install(event);">install from this website</a> or 

     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>

     <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>

-    <strong>Developer Documentation:</strong> <a href="design/">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

-    <strong>Extras:</strong> 

+    <strong>Developer Documentation:</strong> <a href="design/index.html.en>">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

+

+   <strong>Extras:</strong> 

     Google search plugins for

@@ -91,7 +91,7 @@

     <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>

     <br/>

     <strong>Install:</strong> Click to 

-    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"

+    <a href="https://www.torproject.org/torbutton/torbutton-current.xpi"

       hash="<version-hash-torbutton>"

       onclick="return install(event);">install from this website</a> or 

     <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>

@@ -12,7 +12,7 @@

     <!-- PUT CONTENT AFTER THIS TAG -->

     <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>

-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />

+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml">

     <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>

     <script type="text/javascript">

@@ -84,7 +84,7 @@

     </script>

     <h2>Torbutton</h2>

-    <hr />

+    <hr>

     <strong>Current version:</strong><version-torbutton><br/>

     <br/>

@@ -6,7 +6,7 @@

 <div id="content" class="clearfix">

 	<div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

-    <a href="<page torbutton>">TorButton</a>

+    <a href="<page torbutton/index>">Torbutton</a>

   </div>

 	<div id="maincol"> 

     <!-- PUT CONTENT AFTER THIS TAG -->

@@ -111,7 +111,7 @@

     href="https://gitweb.torproject.org/torbutton.git">browse the

     repository</a> or simply unzip the xpi.

     <br/>

-    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/">Torproject Bug Tracker</a><br/>

+    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>

     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>

     <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>

     <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>

new file mode 100644

@@ -0,0 +1,155 @@

+## translation metadata

+# Revision: $Revision: 0 $

+# Translation-Priority: 3-low

+

+#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

+<div id="content" class="clearfix">

+	<div id="breadcrumbs">

+    <a href="<page index>">Home &raquo; </a>

+    <a href="<page torbutton>">TorButton</a>

+  </div>

+	<div id="maincol"> 

+    <!-- PUT CONTENT AFTER THIS TAG -->

+    

+    <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>

+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />

+    <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>

+    <script type="text/javascript">

+    

+    function addSearchProvider(prov) {

+    

+    try {

+    window.external.AddSearchProvider(prov);

+    }

+    

+    catch (e) {

+    alert("Search plugins require Firefox 2");

+    return;

+    }

+    }

+    

+    function addEngine(name,ext,cat,pid)

+    {

+      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {

+        window.sidebar.addSearchEngine(

+          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src",

+          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat );

+      } else {

+        alert("You will need a browser which supports Sherlock to install this plugin.");

+      }

+    }

+    

+    function addOpenSearch(name,ext,cat,pid,meth)

+    {

+      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {

+        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {

+          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");

+        } else {

+          window.external.AddSearchProvider(

+            "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml");

+        }

+      } else {

+        alert("You will need a browser which supports OpenSearch to install this plugin.");

+      }

+    }

+    

+    function addOpenSearch2(name,ext,cat,pid,meth)

+    {

+      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {

+        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {

+          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");

+        } else {

+          window.external.AddSearchProvider(

+            "http://torbutton.torproject.org/dev/search/" + name + ".xml");

+        }

+      } else {

+        alert("You will need a browser which supports OpenSearch to install this plugin.");

+      }

+    }

+    

+    function install (aEvent)

+    {

+      var params = {

+        "Torbutton": { URL: aEvent.target.href,

+                 Hash: aEvent.target.getAttribute("hash"),

+                 toString: function () { return this.URL; }

+        }

+      };

+      InstallTrigger.install(params);

+    

+      return false;

+    }

+    

+    

+    </script>

+    

+    <h2>Torbutton</h2>

+    <hr />

+    

+    <strong>Current version:</strong><version-torbutton><br/>

+    <br/>

+    <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>

+    <br/>

+    <strong>Install:</strong> Click to 

+    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi"

+      hash="<version-hash-torbutton>"

+      onclick="return install(event);">install from this website</a> or 

+    <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail">install from Mozilla's Add-On site</a><br/>

+    <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>

+    <strong>Developer Documentation:</strong> <a href="design/">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>

+    <strong>Extras:</strong> 

+    

+    Google search plugins for

+    

+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

+     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 

+    

+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"

+     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.

+    <br/>

+    <strong>Source:</strong> You can <a

+    href="https://gitweb.torproject.org/torbutton.git">browse the

+    repository</a> or simply unzip the xpi.

+    <br/>

+    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/">Torproject Bug Tracker</a><br/>

+    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>

+    <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>

+    <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>

+    <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS">credits</a> <b>]</b><br/>

+    

+    <br/>

+    

+    <p>

+    Torbutton is a 1-click way for Firefox users to enable or disable

+    the browser's use of <a href="<page index>">Tor</a>.

+    It adds a panel to the statusbar that says "Tor Enabled" (in green) or

+    "Tor Disabled" (in red).  The user may click on the panel to toggle

+    the status.  If the user (or some other extension) changes the proxy

+    settings, the change is automatically reflected in the statusbar.

+    </p>

+    

+    <p>

+    To keep you safe, Torbutton disables many types of active content. You

+    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,

+    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton

+    options</a> list.

+    </p>

+    

+    <p>

+    Some users may prefer a toolbar button instead of a statusbar panel.

+    Torbutton lets you add a toolbar button by right-clicking

+    on the desired toolbar, selecting "Customize...", and then dragging the

+    Torbutton icon onto the toolbar.  There is an option in the preferences

+    to hide the statusbar panel (Tools->Extensions, select Torbutton,

+    and click on Preferences).

+    </p>

+  </div>

+  <!-- END MAINCOL -->

+  <div id = "sidecol">

+#include "side.wmi"

+#include "info.wmi"

+  </div>

+  <!-- END SIDECOL -->

+</div>

+<!-- END CONTENT -->

+#include <foot.wmi>