This is an automated email from the git hooks/post-receive script.
richard pushed a change to branch master in repository tor-launcher.
from 5fe21ef Bug 40896: [Connection Settings] Update strings for current bridges new adb2ef8 fixup! Bug 40774: Added new localized strings for about:preferences#connection new 0e0b648 fixup! Bug 40773: Added new localized strings for about:torconnect
The 2 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 | 36 ++++++++++++++++++---------- 1 file changed, 24 insertions(+), 12 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 adb2ef85ad2e5758bc93e0503e03d95a4697f33b Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Apr 22 18:49:51 2022 +0200
fixup! Bug 40774: Added new localized strings for about:preferences#connection
Second iteration of the changes on about:preferences#connection --- src/chrome/locale/en-US/network-settings.dtd | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 9318d67..4c4b5f7 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -85,17 +85,19 @@ <!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.bridgeLocation "Your location"> <!ENTITY torPreferences.bridgeLocationAutomatic "Automatic"> +<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations"> +<!ENTITY torPreferences.bridgeLocationOther "Other locations"> <!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…"> <!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges"> <!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed."> -<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> +<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id --> <!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.bridgeShare "Share this bridge using the QR code or by copying its address:"> <!ENTITY torPreferences.bridgeCopy "Copy Bridge Address"> <!ENTITY torPreferences.copied "Copied!"> -<!ENTITY torPreferences.bridgeShowAll "Show all bridges"> -<!ENTITY torPreferences.bridgeRemoveAll "Remove all bridges"> +<!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…"> @@ -108,6 +110,10 @@ <!ENTITY torPreferences.advancedButton "Settings…"> <!ENTITY torPreferences.viewTorLogs "View the Tor logs"> <!ENTITY torPreferences.viewLogs "View Logs…"> +<!-- Remove all bridges dialog --> +<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?"> +<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone."> +<!ENTITY torPreferences.cancel "Cancel"> <!-- Scan bridge QR dialog --> <!ENTITY torPreferences.scanQrTitle "Scan the QR code"> <!-- Builtin bridges dialog -->
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch master in repository tor-launcher.
commit 0e0b64891c444a07355e0df495b574a99b8a3615 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Apr 22 18:51:56 2022 +0200
fixup! Bug 40773: Added new localized strings for about:torconnect
Second iteration of the changes on about:torconnect --- src/chrome/locale/en-US/network-settings.dtd | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 4c4b5f7..cd86d0c 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -143,23 +143,29 @@ <!-- #24746 about:torconnect strings --> <!ENTITY torConnect.notConnectedConcise "Not Connected"> <!ENTITY torConnect.connectingConcise "Connecting…"> +<!ENTITY torConnect.tryingAgain "Trying again…"> +<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet"> <!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.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) --> +<!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."> <!-- #1 = "configure your connection" link --> <!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.tryingBridgeAgain "Trying one more time…"> <!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.errorLocationDescription "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."> <!-- #1 = "configure your connection" link --> +<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?"> +<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link --> <!ENTITY torConnect.breadcrumbAssist "Connection assist"> <!ENTITY torConnect.breadcrumbLocation "Location settings"> <!ENTITY torConnect.breadcrumbTryBridge "Try a bridge"> +<!ENTITY torConnect.automatic "Automatic"> +<!ENTITY torConnect.selectCountryRegion "Select Country or Region"> +<!ENTITY torConnect.frequentLocations "Frequently selected locations"> +<!ENTITY torConnect.otherLocations "Other locations"> <!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.tryAgain "Try Again"> +<!ENTITY torConnect.offline "Internet not reachable"> <!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.yourLocation "Your Location">
tor-commits@lists.torproject.org
-
gitolite role