henry pushed to branch tor-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 048a9ee4 by Henry Wilkes at 2025-08-11T08:06:43+00:00 fixup! TB 40041 [android]: Implement Tor Network Settings TB 44069: Update meek name. TB 44083: Capitalise Snowflake name. - - - - - c387352e by Henry Wilkes at 2025-08-11T08:06:43+00:00 fixup! [android] TBA strings TB 44069: Update meek name. TB 44083: Capitalise Snowflake name. - - - - - 308bfd2a by Henry Wilkes at 2025-08-11T08:06:43+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 44069: Update built-in meek name and description. Also change the radio options strings to have their .label point directly to the corresponding bridge type name string. - - - - - cca7d67e by Henry Wilkes at 2025-08-11T08:06:43+00:00 fixup! Tor Browser strings TB 44069: Update the meek name and description. Update the radio option strings to point their .label directly to the name strings. - - - - - 5 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.xhtml - browser/components/torpreferences/content/connectionPane.js - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.xhtml ===================================== @@ -33,7 +33,7 @@ - only the latter description should contribute. --> <radio value="obfs4" - data-l10n-id="built-in-dialog-obfs4-radio-option" + data-l10n-id="built-in-dialog-obfs4-radio-option2" /> <html:span class="bridge-status-badge"> <html:div class="bridge-status-icon"></html:div> @@ -54,7 +54,7 @@ <hbox> <radio value="snowflake" - data-l10n-id="built-in-dialog-snowflake-radio-option" + data-l10n-id="built-in-dialog-snowflake-radio-option2" /> <html:span class="bridge-status-badge"> <html:div class="bridge-status-icon"></html:div> @@ -75,7 +75,7 @@ <hbox> <radio value="meek-azure" - data-l10n-id="built-in-dialog-meek-azure-radio-option" + data-l10n-id="built-in-dialog-meek-radio-option2" /> <html:span class="bridge-status-badge"> <html:div class="bridge-status-icon"></html:div> @@ -88,7 +88,7 @@ </hbox> <html:div class="indent builtin-bridges-option-description" - data-l10n-id="tor-bridges-built-in-meek-azure-description" + data-l10n-id="tor-bridges-built-in-meek-description" > </html:div> </vbox> ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1080,8 +1080,8 @@ const gBuiltinBridgesArea = { description: "tor-bridges-built-in-snowflake-description", }, "meek-azure": { - name: "tor-bridges-built-in-meek-azure-name", - description: "tor-bridges-built-in-meek-azure-description", + name: "tor-bridges-built-in-meek-name", + description: "tor-bridges-built-in-meek-description", }, }, ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -23,9 +23,12 @@ <string name="preferences_tor_network_settings_bridge_config_explanation">Bridges are unlisted relays that make it more difficult to block connections to the Tor network. Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.</string> <string name="preferences_tor_network_settings_bridge_config_toggle">Use a Bridge</string> <string name="preferences_tor_network_settings_bridge_config_toggle_description">Config a bridge to connect to Tor</string> + <!-- "obfs4" is a technical name, and likely should not be translated. --> <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> - <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> - <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> + <!-- "meek" is a technical name, and likely should not be translated. --> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek">meek</string> + <!-- "Snowflake" is a proper noun for a type of Tor bridge, and likely should not be translated. --> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake2">Snowflake</string> <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Provide a Bridge I know</string> <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Enter bridge information from a trusted source</string> <string name="preferences_tor_network_settings_bridge_config_current_bridge">Current Configured Bridge: %s</string> ===================================== mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml ===================================== @@ -21,12 +21,12 @@ android:defaultValue="false" android:dependency="@string/pref_key_tor_network_settings_bridge_config_toggle" android:key="@string/pref_key_tor_network_settings_bridge_config_builtin_bridge_meek_azure" - android:title="@string/preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure" /> + android:title="@string/preferences_tor_network_settings_bridge_config_builtin_bridge_meek" /> <org.mozilla.fenix.settings.RadioButtonPreference android:defaultValue="false" android:dependency="@string/pref_key_tor_network_settings_bridge_config_toggle" android:key="@string/pref_key_tor_network_settings_bridge_config_builtin_bridge_snowflake" - android:title="@string/preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake" /> + android:title="@string/preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake2" /> <EditTextPreference android:dependency="@string/pref_key_tor_network_settings_bridge_config_toggle" android:key="@string/pref_key_tor_network_settings_bridge_config_user_provided_bridge" ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -135,12 +135,12 @@ tor-bridges-built-in-obfs4-description = Makes your Tor traffic look like random tor-bridges-built-in-snowflake-name = Snowflake # "Snowflake" is a proper noun for a type of Tor bridge, and likely should not be translated. tor-bridges-built-in-snowflake-description = Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. -# "meek-azure" is a technical name, and likely should not be translated. -tor-bridges-built-in-meek-azure-name = meek-azure -tor-bridges-built-in-meek-azure-description = Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow. +# "meek" is a technical name, and likely should not be translated. +tor-bridges-built-in-meek-name = meek +tor-bridges-built-in-meek-description = Connects you to the Tor network through a big cloud provider. May work in heavily censored regions, but is usually very slow. # Shown at the start of a Tor bridge line. -# $type (String) - The Tor bridge type ("snowflake", "obfs4", "meek-azure"). +# $type (String) - The Tor bridge type ("snowflake", "obfs4", "meek", etc). tor-bridges-type-prefix = { $type } bridge: # Shown at the start of a Tor bridge line, when the transport type is unknown (or "vanilla"). tor-bridges-type-prefix-generic = Tor bridge: @@ -385,15 +385,12 @@ built-in-dialog-title = .title = Select a Built-In Bridge # -brand-short-name refers to 'Tor Browser', localized. built-in-dialog-introduction = { -brand-short-name } includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. -# "obfs4" is a technical name, and likely should not be translated. -built-in-dialog-obfs4-radio-option = - .label = obfs4 -# "Snowflake" is a proper noun for a type of Tor bridge, and likely should not be translated. -built-in-dialog-snowflake-radio-option = - .label = Snowflake -# "meek-azure" is a technical name, and likely should not be translated. -built-in-dialog-meek-azure-radio-option = - .label = meek-azure +built-in-dialog-obfs4-radio-option2 = + .label = { tor-bridges-built-in-obfs4-name } +built-in-dialog-snowflake-radio-option2 = + .label = { tor-bridges-built-in-snowflake-name } +built-in-dialog-meek-radio-option2 = + .label = { tor-bridges-built-in-meek-name } # Label attached to the built-in bridge option that is already in use. # The "aria-label" should use the same text, but include some ending punctuation to separate it from the sentence that follows. This is used for screen reader users. built-in-dialog-current-bridge-label = Current bridge View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efc66d2... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efc66d2... You're receiving this email because of your account on gitlab.torproject.org.