Andrew Lewman commited on 2012-06-20 22:28:07
              Zeige 1 geänderte Dateien mit 12 Einfügungen und 17 Löschungen.
            
| ... | ... | 
                      @@ -79,7 +79,7 @@  | 
                  
| 79 | 79 | 
                        e.g. the Desktop or a USB flash drive.</p>  | 
                    
| 80 | 80 | 
                         | 
                    
| 81 | 81 | 
                        <p id="Download-torbrowserbundle" style="font-size: 120%; margin:  | 
                    
| 82 | 
                        - 5mm">Tor Browser Bundle for Windows with Firefox Aurora (version  | 
                    |
| 82 | 
                        + 5mm">Tor Browser Bundle for Windows (version  | 
                    |
| 83 | 83 | 
                        <version-torbrowserbundle>)</p>  | 
                    
| 84 | 84 | 
                         | 
                    
| 85 | 85 | 
                        <ul>  | 
                    
| ... | ... | 
                      @@ -170,13 +170,9 @@  | 
                  
| 170 | 170 | 
                         | 
                    
| 171 | 171 | 
                        </ul>  | 
                    
| 172 | 172 | 
                         | 
                    
| 173 | 
                        - <p>The Tor IM Browser Bundle has been <a  | 
                    |
| 174 | 
                        - href="https://blog.torproject.org/blog/tor-im-browser-bundle-discontinued-temporarily">temporarily  | 
                    |
| 175 | 
                        - discontinued</a>.</p>  | 
                    |
| 176 | 
                        -  | 
                    |
| 177 | 173 | 
                        <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin:  | 
                    
| 178 | 
                        - 5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher  | 
                    |
| 179 | 
                        - with Firefox Aurora (version <version-torbrowserbundleosx32>, 28 MB)</p>  | 
                    |
| 174 | 
                        + 5mm">Tor Browser Bundle for Intel Mac OS X 10.6 and higher (version  | 
                    |
| 175 | 
                        + <version-torbrowserbundleosx32>)</p>  | 
                    |
| 180 | 176 | 
                         | 
                    
| 181 | 177 | 
                         | 
                    
| 182 | 178 | 
                        <ul>  | 
                    
| ... | ... | 
                      @@ -325,9 +321,9 @@  | 
                  
| 325 | 321 | 
                        </ul>  | 
                    
| 326 | 322 | 
                         | 
                    
| 327 | 323 | 
                        <p id="Download-torbrowserbundlelinux" style="font-size: 120%;  | 
                    
| 328 | 
                        - margin: 5mm">BETA: Tor Browser Bundle for Linux with Firefox  | 
                    |
| 329 | 
                        - Aurora (version <version-torbrowserbundlelinux32> (32-bit),  | 
                    |
| 330 | 
                        - <version-torbrowserbundlelinux64> (64-bit), 24 MB)</p>  | 
                    |
| 324 | 
                        + margin: 5mm">BETA: Tor Browser Bundle for Linux  | 
                    |
| 325 | 
                        + (version <version-torbrowserbundlelinux32> (32-bit),  | 
                    |
| 326 | 
                        + <version-torbrowserbundlelinux64> (64-bit))</p>  | 
                    |
| 331 | 327 | 
                         | 
                    
| 332 | 328 | 
                        <ul>  | 
                    
| 333 | 329 | 
                        <li>English (en-US): <a  | 
                    
| ... | ... | 
                      @@ -489,9 +485,9 @@  | 
                  
| 489 | 485 | 
                        <p>See our instructions on <a href="<page  | 
                    
| 490 | 486 | 
                        docs/verifying-signatures>">how to verify package signatures</a>,  | 
                    
| 491 | 487 | 
                        which allows you to make sure you've downloaded the file we intended  | 
                    
| 492 | 
                        - you to get. Also, note that the Firefox Aurora in our bundles is  | 
                    |
| 488 | 
                        + you to get. Also, note that the Firefox ESR in our bundles is  | 
                    |
| 493 | 489 | 
                        <a href="<tbbrepo>/build-scripts/config/">modified</a> from the <a  | 
                    
| 494 | 
                        - href="http://www.mozilla.com/firefox/">default Firefox Aurora</a>;  | 
                    |
| 490 | 
                        + href="http://www.mozilla.com/firefox/">default Firefox ESR</a>;  | 
                    |
| 495 | 491 | 
                        we're currently working with Mozilla to see if they want us to change  | 
                    
| 496 | 492 | 
                        the name to make this clearer.</p>  | 
                    
| 497 | 493 | 
                         | 
                    
| ... | ... | 
                      @@ -501,7 +497,7 @@  | 
                  
| 501 | 497 | 
                        X will automatically unarchive it and you will have a TorBrowser  | 
                    
| 502 | 498 | 
                        application in your chosen language (for example, TorBrowser_en-US.app).  | 
                    
| 503 | 499 | 
                        Click the TorBrowser application to launch Vidalia. Once Vidalia connects to Tor, it will  | 
                    
| 504 | 
                        - launch Firefox Aurora.</p>  | 
                    |
| 500 | 
                        + launch Firefox ESR.</p>  | 
                    |
| 505 | 501 | 
                         | 
                    
| 506 | 502 | 
                        <p><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" /></p>  | 
                    
| 507 | 503 | 
                         | 
                    
| ... | ... | 
                      @@ -532,7 +528,7 @@  | 
                  
| 532 | 528 | 
                         | 
                    
| 533 | 529 | 
                        <p>Download the file above, and save it somewhere, then double click on it.  | 
                    
| 534 | 530 | 
                        Click on the button labelled <strong>"..."</strong> (1) and select where you want  | 
                    
| 535 | 
                        - to save the bundle then click <strong>OK</strong> (2). At least 50 MB free  | 
                    |
| 531 | 
                        + to save the bundle then click <strong>OK</strong> (2). At least 50 MB free  | 
                    |
| 536 | 532 | 
                        space must be available in the location you select. If you want to leave the  | 
                    
| 537 | 533 | 
                        bundle on the computer, saving it to the Desktop is a good choice. If you want  | 
                    
| 538 | 534 | 
                        to move it to a different computer or limit the traces you leave behind, save  | 
                    
| ... | ... | 
                      @@ -622,9 +618,8 @@  | 
                  
| 622 | 618 | 
                        instructions</a>.</p>  | 
                    
| 623 | 619 | 
                         | 
                    
| 624 | 620 | 
                        <p>Tor Browser Bundle is partially based on <a  | 
                    
| 625 | 
                        - href="http://portableapps.com/apps/internet/firefox_portable">Mozilla  | 
                    |
| 626 | 
                        - Firefox Aurora, Portable Edition</a> from <a  | 
                    |
| 627 | 
                        - href="http://portableapps.com/">PortableApps.com</a>.</p>  | 
                    |
| 621 | 
                        + href="https://www.mozilla.org/en-US/firefox/organizations/">Mozilla  | 
                    |
| 622 | 
                        + Firefox ESR</a>.</p>  | 
                    |
| 628 | 623 | 
                         | 
                    
| 629 | 624 | 
                        </div>  | 
                    
| 630 | 625 | 
                        <!-- END MAINCOL -->  | 
                    
| 631 | 626 |