Commit 4e9c7c8b authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Georg Koppen
Browse files

Bug 21243: Add links to es, fr, pt Tor Browser manual

parent 7439de87

src/chrome/content/menu-overlay.xul

+4 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- -->



<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">

<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/aboutTor.dtd">



<overlay id="torbutton-menu-overlay"

         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -20,8 +20,8 @@ 
    <menuitem name="torBrowserUserManual"

              id="torBrowserUserManual"

              position="1"

              label="&torbutton.torbrowser_user_manual.label;"

              accesskey="&torbutton.torbrowser_user_manual.accesskey;"

              oncommand="torbutton_open_torbrowser_user_manual()" />

              label="&aboutTor.torbrowser_user_manual.label;"

              accesskey="&aboutTor.torbrowser_user_manual.accesskey;"

              oncommand="gBrowser.selectedTab = gBrowser.addTab('&aboutTor.torbrowser_user_manual.link;')" />

  </menupopup>

</overlay>

src/chrome/content/torbutton.js

+3 −7
Original line number Diff line number Diff line
@@ -2440,15 +2440,11 @@ function torbutton_update_noscript_button() 
  }, 0);

}



// Opens the Tor Browser User Manual in a new tab

function torbutton_open_torbrowser_user_manual() {

  gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org");

}



// Returns true if we should show the tor browser manual.

function torbutton_show_torbrowser_manual() {

  let locale = torbutton_get_general_useragent_locale();

  return locale.startsWith("en");

  let availableLocales = ["en", "es", "fr", "pt"];

  let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2);

  return availableLocales.indexOf(shortLocale) >= 0;

}



// Makes sure the item in the Help Menu and the link in about:tor

src/chrome/locale/en/aboutTor.dtd

+2 −1
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ 
<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">

<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">

<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">

<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">

<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">

<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org">

<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US">

<!ENTITY aboutTor.helpInfo1.label "You Can Help!">

<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">

<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">

src/chrome/locale/en/torbutton.dtd

+0 −2
Original line number Diff line number Diff line
@@ -59,5 +59,3 @@ 
<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">

<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked.">

<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
 
<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">

<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">

src/chrome/locale/es/aboutTor.dtd

+2 −1
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ 
<!ENTITY aboutTor.whatnextAnswer.label "¡Tor NO es todo lo que necesita para navegar anónimamente! Puede necesitar cambiar alguno de sus hábitos de navegación para asegurar que su identidad permanezca segura.">

<!ENTITY aboutTor.whatnext.label "Consejos para permenecer anónimo »">

<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">

<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">

<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor »">

<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org">

<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/es-ES">

<!ENTITY aboutTor.helpInfo1.label "¡Usted puede ayudar!">

<!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte.">

<!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »">