This is an automated email from the git hooks/post-receive script.
richard pushed a change to branch master in repository tor-launcher.
from a1803fc Bug 40823: Revert tor-launcher 5fcd4edb836fcab3db21139e670bddc77811e30c new 1488b0e Bug 40773: Added new localized strings for about:torconnect new 18f3549 Bug 40774: Added new localized strings for about:preferences#connection new abd6b89 Release preparations for 0.2.34
The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: src/chrome/locale/en-US/network-settings.dtd | 97 +++++++++++++++++++++++----- src/install.rdf | 2 +- 2 files changed, 83 insertions(+), 16 deletions(-)
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch master in repository tor-launcher.
commit 1488b0ebe1cc24631bb03643fb84b4d78f5f330f Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Apr 5 18:54:58 2022 +0200
Bug 40773: Added new localized strings for about:torconnect --- src/chrome/locale/en-US/network-settings.dtd | 29 +++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index fe905bf..47bd3ed 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -86,11 +86,30 @@ <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
<!-- #24746 about:torconnect strings --> -<!ENTITY torConnect.tryAgain "Try Connecting Again"> +<!ENTITY torConnect.notConnectedConcise "Not Connected"> +<!ENTITY torConnect.connectingConcise "Connecting…"> +<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor"> +<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> +<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> +<!ENTITY torConnect.tryingBridge "Trying a bridge…"> +<!ENTITY torConnect.tryingBridge "Trying one more time…"> +<!ENTITY torConnect.addLocation "Add your location settings"> +<!ENTITY torConnect.addLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> +<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you"> +<!ENTITY torConnect.errorLocationDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again."> +<!ENTITY torConnect.breadcrumbAssist "Connection assist"> +<!ENTITY torConnect.breadcrumbLocation "Location settings"> +<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge"> +<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser"> +<!ENTITY torConnect.configureConnection "Configure Connection…"> +<!ENTITY torConnect.viewLog "View logs…"> +<!ENTITY torConnect.tryAgain "Try connecting again"> <!ENTITY torConnect.offline "Offline"> <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect"> <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> -<!ENTITY torConnect.connectingConcise "Connecting…"> -<!ENTITY torConnect.connectedConcise "Connected"> -<!ENTITY torConnect.notConnectedConcise "Not Connected"> -<!ENTITY torConnect.copyLog "Copy Tor Logs"> +<!ENTITY torConnect.yourLocation "Your Location"> +<!ENTITY torConnect.tryBridge "Try a Bridge"> +<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed"> +<!ENTITY torConnect.autoBootstrappingFailed "None of the configurations we tried worked"> +<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country"> +<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch master in repository tor-launcher.
commit 18f3549bdaa4f8eac0b902fe7bff3d5916fbac68 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Apr 5 18:57:05 2022 +0200
Bug 40774: Added new localized strings for about:preferences#connection --- src/chrome/locale/en-US/network-settings.dtd | 68 ++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 10 deletions(-)
diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 47bd3ed..a9b1135 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -61,28 +61,76 @@ <!-- Progress --> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
-<!-- #31286 about:preferences strings --> +<!-- #31286 about:preferences strings --> <!ENTITY torPreferences.categoryTitle "Connection"> <!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.learnMore "Learn more"> +<!-- Status --> +<!ENTITY torPreferences.statusInternetLabel "Internet:"> +<!ENTITY torPreferences.statusInternetTest "Test"> +<!ENTITY torPreferences.statusInternetOnline "Online"> +<!ENTITY torPreferences.statusInternetOffline "Offline"> +<!ENTITY torPreferences.statusTorLabel "Tor Network:"> +<!ENTITY torPreferences.statusTorConnected "Connected"> +<!ENTITY torPreferences.statusTorNotConnected "Not Connected"> +<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked"> +<!ENTITY torPreferences.learnMore "Learn more"> +<!-- Quickstart --> <!ENTITY torPreferences.quickstart "Quickstart"> -<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically."> +<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings."> <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically"> +<!-- Bridge settings --> <!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"> -<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.bridgeLocation "Your location"> +<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic"> +<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…"> +<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges"> +<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> +<!ENTITY torPreferences.remove "Remove"> +<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges"> +<!ENTITY torPreferences.bridgeShare "Share your bridge by presenting the QR code or copying its bridge line."> +<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address"> +<!ENTITY torPreferences.copied "Copied!"> +<!ENTITY torPreferences.bridgeShowAll "Show all bridges"> +<!ENTITY torPreferences.bridgeRemoveAll "Remove all bridges"> +<!ENTITY torPreferences.bridgeAdd "Add a New Bridge"> +<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges"> +<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…"> +<!ENTITY torPreferences.bridgeRequest "Request a Bridge…"> +<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know"> +<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…"> +<!-- Advanced settings --> <!ENTITY torPreferences.advanced "Advanced"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> +<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet"> +<!ENTITY torPreferences.advancedButton "Settings…"> +<!ENTITY torPreferences.viewTorLogs "View the Tor logs"> +<!ENTITY torPreferences.viewLogs "View Logs…"> +<!-- Scan bridge QR dialog --> +<!ENTITY torPreferences.scanQrTitle "Scan the QR code"> +<!-- Builtin bridges dialog --> +<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges"> +<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”."> +<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4"> +<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges."> +<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake"> +<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers."> +<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure"> +<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor."> +<!-- Request bridges dialog --> <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!-- Provide bridge dialog --> +<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge"> +<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source"> +<!-- Connection settings dialog --> +<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings"> +<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet"> +<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values"> +<!-- Log dialog --> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
<!-- #24746 about:torconnect strings -->
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch master in repository tor-launcher.
commit abd6b8986180e4f14bb8f17d0e57c8a932cafde7 Author: Richard Pospesel richard@torproject.org AuthorDate: Tue Apr 5 21:25:57 2022 +0000
Release preparations for 0.2.34 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/install.rdf b/src/install.rdf index 55cc0d5..fd0250d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ em:creatorThe Tor Project, Inc.</em:creator> em:contributorPearl Crescent, LLC</em:contributor> em:idtor-launcher@torproject.org</em:id> - em:version0.2.33</em:version> + em:version0.2.34</em:version> em:multiprocessCompatibletrue</em:multiprocessCompatible> em:homepageURLhttps://www.torproject.org/projects/torbrowser.html</em:homepageURL> em:updateURLdata:text/plain,</em:updateURL>
tbb-commits@lists.torproject.org
-
gitolite role