henry pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
31c4bf89
by Henry Wilkes at 2026-03-31T10:20:56+01:00
-
65283c72
by Henry Wilkes at 2026-03-31T10:21:41+01:00
-
d44fec0a
by Henry Wilkes at 2026-03-31T10:21:42+01:00
3 changed files:
- browser/components/preferences/main.js
- toolkit/locales/en-US/toolkit/global/base-browser.ftl
- + tools/torbrowser/l10n/migrations/bug-44765-sidebar-description.py
Changes:
| ... | ... | @@ -3141,7 +3141,9 @@ SettingGroupManager.registerGroups({ |
| 3141 | 3141 | },
|
| 3142 | 3142 | {
|
| 3143 | 3143 | id: "browserLayoutShowSidebar",
|
| 3144 | - l10nId: "browser-layout-show-sidebar2",
|
|
| 3144 | + // Update the sidebar description to remove mentioning features that we
|
|
| 3145 | + // don't have in Base Browser. See tor-browser#44159.
|
|
| 3146 | + l10nId: "browser-layout-show-sidebar-limited",
|
|
| 3145 | 3147 | },
|
| 3146 | 3148 | ],
|
| 3147 | 3149 | },
|
| ... | ... | @@ -104,7 +104,11 @@ letterboxing-enable-button = |
| 104 | 104 | |
| 105 | 105 | ## Preferences - Sidebar.
|
| 106 | 106 | |
| 107 | -browser-layout-show-sidebar-desc-limited = Quickly access bookmarks and more without leaving your main view.
|
|
| 107 | +# Here "sidebar" is a term inherited from Firefox. It refers to the panel that is either side of the main browser window, containing the bookmarks and vertical tabs, if they are enabled.
|
|
| 108 | +# In general, "Show sidebar" should use the same translation as Firefox translators have chosen for the string "browser-layout-show-sidebar2". See Firefox's translation on Pontoon, using the "LOCALES" tab: https://pontoon.mozilla.org/ar/firefox/browser/browser/preferences/preferences.ftl/?string=328898 . Or use the translation for "sidebar": https://pontoon.mozilla.org/af/terminology/common/?string=212298 .
|
|
| 109 | +browser-layout-show-sidebar-limited =
|
|
| 110 | + .label = Show sidebar
|
|
| 111 | + .description = Quickly access bookmarks and more without leaving your main view.
|
|
| 108 | 112 | |
| 109 | 113 | ## Preferences - Contrast Control.
|
| 110 | 114 |
| 1 | +from fluent.migrate.helpers import transforms_from
|
|
| 2 | + |
|
| 3 | + |
|
| 4 | +def migrate(ctx):
|
|
| 5 | + # NOTE: preferences.ftl comes from firefox-l10n repository, under the path:
|
|
| 6 | + # <locale>/browser/browser/preferences/preferences.ftl
|
|
| 7 | + # which will need to be added the translations worktree under the path:
|
|
| 8 | + # <locale>/preferences.ftl
|
|
| 9 | + # prior to running this migration.
|
|
| 10 | + ctx.add_transforms(
|
|
| 11 | + "base-browser.ftl",
|
|
| 12 | + "base-browser.ftl",
|
|
| 13 | + transforms_from(
|
|
| 14 | + """
|
|
| 15 | +browser-layout-show-sidebar-limited =
|
|
| 16 | + .label = { COPY_PATTERN(preferences_path, "browser-layout-show-sidebar2.label") }
|
|
| 17 | + .description = { COPY_PATTERN(path, "browser-layout-show-sidebar-desc-limited") }
|
|
| 18 | +""",
|
|
| 19 | + path="base-browser.ftl",
|
|
| 20 | + preferences_path="preferences.ftl",
|
|
| 21 | + ),
|
|
| 22 | + ) |