commit 42ece714278aee288f63d3aab1450c9c1badcbac Author: Richard Pospesel richard@torproject.org Date: Wed Oct 9 16:46:45 2019 -0700

Bug 31286: New strings for about:preferences#tor

Adds several new strings for the about:preferences#tor page. Not quite complete and a few tedious things to do:

- Remove the colon (':') character from several strings (Username, Password, Port, etc) to match style of existing fields in about:preferences - Duplicate some existing strings living in torlauncher.properties over to network-settings.dtd --- src/chrome/locale/en-US/network-settings.dtd | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)

diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index c6c5687..2c6e5a5 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -26,17 +26,23 @@ <!ENTITY torsettings.optional "Optional">

<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!-- TODO: remove colon--> <!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!-- TODO: remove colon--> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!-- TODO: remove colon--> <!ENTITY torsettings.useProxy.port "Port:"> +<!-- TODO: remove colon--> <!ENTITY torsettings.useProxy.username "Username:"> +<!-- TODO: remove colon--> <!ENTITY torsettings.useProxy.password "Password:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!-- TODO: remove colon--> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> @@ -60,3 +66,28 @@

<!-- Progress --> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.&#160; This may take several minutes."> + +<!-- #31286 about:preferences strings --> +<!ENTITY torPreferences.categoryTitle "Tor"> +<!ENTITY torPreferences.torSettings "Tor Settings"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.learnMore "Learn More"> +<!ENTITY torPreferences.bridges "Bridges"> +<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> +<!ENTITY torPreferences.useBridge "Use a bridge"> +<!-- torlauncher.request_a_new_bridge --> +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge&#x2026;"> +<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.advanced "Advanced"> +<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> +<!-- torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. --> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!-- torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. --> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!--torlauncher.bad_captcha_solution=The solution is not correct. Please try again.--> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> +<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> +<!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">