tbb-commits

Download

tbb-commits@lists.torproject.org

1 participants
18366 discussions

[tor-browser-build/master] Bug 40060: Define versionName in Fenix build
by gk＠torproject.org 30 Sep '20

30 Sep '20

commit 46c2b00c782ad2f977125e9e3283c0944409a30e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 28 23:01:14 2020 +0000 Bug 40060: Define versionName in Fenix build In addition, we delete the hard-coded Fenix specific `version` and we use `abbrev`, instead. --- projects/fenix/build | 3 ++- projects/fenix/config | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index eedddcc..c9d7e22 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -56,7 +56,8 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ exit 1 fi - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint + version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] diff --git a/projects/fenix/config b/projects/fenix/config index 171eb6b..1798e0d 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 10.0a6 +version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git @@ -22,7 +22,6 @@ targets: nightly: git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 - version: '[% c("abbrev") %]' variant: Beta input_files:

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 25 commits: fixup! Bug 40028: Implement Tor connect and logger screens
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: d404d769 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens Bug 40044: Fixup Connect screen - - - - - ab897368 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens Bug 40044: Fixup Connect screen Add settings cog - - - - - 50a2e757 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - fc5c3aa6 by Matthew Finkel at 2020-09-28T21:52:27+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - 091081a9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor connect and logger screens - - - - - 2e5d5aed by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - f61219e9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - e7c7cefc by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - 5d14717f by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement new home screen - - - - - 3a96ef08 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment Move TorController's BroadcastReceiver registration into FenixApplication because TorController misses events when registration is controlled by HomeFragment. Initialize tor-android-service with FenixApplication's Context. - - - - - 90787eaa by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - a66da2fc by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - b26b2df1 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Integrate Tor Controller into HomeFragment - - - - - d01d44a7 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Rename localBroadcastReceiver as persistentBroadcastReceiver such that it isn't confused with the checkIsTorStarted receiver. - - - - - 0518acac by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Minor improvements - - - - - 0585f943 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Correct indentation and add restartTor() function - - - - - 1ad711c6 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Define enum class for tor's status and define current state using the enums. - - - - - 22b7ca55 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller Add access/mutator for bridge information. - - - - - d62480a2 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Service controller - - - - - dfc7234f by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Implement Tor Onboarding - - - - - 014c4b76 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40028: Define bootstrapping events and Quick Start - - - - - b9f9c4b9 by Matthew Finkel at 2020-09-30T02:21:09+00:00 fixup! Bug 40034: Disable PWA onboading - - - - - 1f8ead03 by Matthew Finkel at 2020-09-30T02:21:09+00:00 Bug 40041: Implement Tor Network Settings - - - - - 313a51e8 by Matthew Finkel at 2020-09-30T02:21:09+00:00 Bug 40041: Integrate Tor Network Settings - - - - - c211ca85 by Matthew Finkel at 2020-09-30T14:10:55+00:00 Merge branch 'bug_40041_09' into tor-browser-81.1.1-10.0-1 - - - - - 30 changed files: - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/Mode.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt - app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - + app/src/main/java/org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt - app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt - + app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - app/src/main/java/org/mozilla/fenix/tor/TorController.kt - app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt - + app/src/main/res/drawable/ic_onion_pattern.xml - + app/src/main/res/drawable/ic_tor_config_bridge.xml - + app/src/main/res/drawable/ic_tor_connect_computer_graphic.xml - + app/src/main/res/drawable/ic_tor_network_settings.xml - app/src/main/res/drawable/rounded_corners.xml - app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - app/src/main/res/layout/fragment_home.xml - app/src/main/res/layout/tor_bootstrap_connect.xml - app/src/main/res/layout/tor_bootstrap_logger.xml - app/src/main/res/navigation/nav_graph.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0a4fbe8a8553… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0a4fbe8a8553… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40002: Ensure system download manager is not used
by Matthew Finkel 30 Sep '20

30 Sep '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: 8c794786 by Alex Catarineu at 2020-09-29T17:38:13+02:00 Bug 40002: Ensure system download manager is not used - - - - - 266410c6 by Matthew Finkel at 2020-09-30T12:53:55+00:00 Merge remote-tracking branch 'acatgl/40002' into android-components-57.0.6-10.0-2 - - - - - 3 changed files: - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt Changes: ===================================== components/feature/downloads/build.gradle ===================================== @@ -20,6 +20,8 @@ android { arg("room.schemaLocation", "$projectDir/schemas".toString()) } } + + buildConfigField("boolean", "ANDROID_DOWNLOADS_INTEGRATION", "false") } buildTypes { ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt ===================================== @@ -326,7 +326,9 @@ abstract class AbstractFetchDownloadService : Service() { PAUSED -> DownloadNotification.createPausedDownloadNotification(context, download) FAILED -> DownloadNotification.createDownloadFailedNotification(context, download) COMPLETED -> { - addToDownloadSystemDatabaseCompat(download.state) + if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION) { + addToDownloadSystemDatabaseCompat(download.state) + } DownloadNotification.createDownloadCompletedNotification(context, download) } CANCELLED -> { @@ -688,7 +690,7 @@ abstract class AbstractFetchDownloadService : Service() { val downloadWithUniqueFileName = makeUniqueFileNameIfNecessary(download, append) updateDownloadState(downloadWithUniqueFileName) - if (getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) { + if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION && getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) { useFileStreamScopedStorage(downloadWithUniqueFileName, block) } else { useFileStreamLegacy(downloadWithUniqueFileName, append, block) ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt ===================================== @@ -25,7 +25,6 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.content.DownloadState import mozilla.components.browser.state.store.BrowserStore import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG -import mozilla.components.feature.downloads.manager.AndroidDownloadManager import mozilla.components.feature.downloads.manager.DownloadManager import mozilla.components.feature.downloads.manager.noop import mozilla.components.feature.downloads.manager.onDownloadStopped @@ -69,7 +68,7 @@ class DownloadsFeature( internal val useCases: DownloadsUseCases, override var onNeedToRequestPermissions: OnNeedToRequestPermissions = { }, onDownloadStopped: onDownloadStopped = noop, - private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store), + private val downloadManager: DownloadManager, private val tabId: String? = null, private val fragmentManager: FragmentManager? = null, private val promptsStyling: PromptsStyling? = null, View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bump mozac rebase branch
by sysrqb＠torproject.org 28 Sep '20

28 Sep '20

commit 13a9ee605b57a013b5b3c044ad127dfab320ecb5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 28 16:16:05 2020 +0000 Bump mozac rebase branch --- projects/android-components/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index c633375..1093a07 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2-build1' git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg @@ -18,7 +18,7 @@ var: targets: nightly: - git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 input_files:

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-57.0.6-10.0-2
by Matthew Finkel 28 Sep '20

28 Sep '20

Matthew Finkel pushed new branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit be335bfb52b05742dc27a91ff5993700bb05412e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 15:52:20 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 4e67ee2ef26e..4320a0de1d3a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d +Subproject commit 4320a0de1d3aab613a30c77c47ccfa812dab4441

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] Merge remote-tracking branch 'gitlab/merge-requests/50' into tor-browser-78.3.0esr-10.5-1
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 7694fb95cdca2cea372681ff14473183b3378271 Merge: 94e52171a339 9233838b9b58 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 15:47:45 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/50' into tor-browser-78.3.0esr-10.5-1 browser/actors/WebRTCParent.jsm | 2 +- browser/base/content/aboutDialog.xhtml | 2 +- browser/base/content/aboutNetError.xhtml | 2 +- browser/base/content/aboutRestartRequired.xhtml | 2 +- browser/base/content/aboutTabCrashed.xhtml | 2 +- browser/base/content/blockedSite.xhtml | 2 +- browser/base/content/browser.js | 2 +- browser/base/content/browser.xhtml | 2 +- browser/base/content/macWindow.inc.xhtml | 2 +- browser/base/content/newInstallPage.html | 2 +- browser/base/content/safeMode.xhtml | 2 +- browser/base/content/webrtcIndicator.xhtml | 2 +- browser/components/aboutconfig/content/aboutconfig.html | 2 +- browser/components/aboutlogins/AboutLoginsParent.jsm | 4 ++-- browser/components/aboutlogins/content/aboutLogins.html | 2 +- browser/components/customizableui/content/panelUI.js | 2 +- .../components/enterprisepolicies/content/aboutPolicies.html | 2 +- browser/components/migration/content/aboutWelcomeBack.xhtml | 2 +- .../components/newtab/aboutwelcome/content/aboutwelcome.html | 2 +- browser/components/newtab/bin/render-activity-stream-html.js | 2 +- .../content-src/asrouter/templates/FirstRun/FirstRun.jsx | 2 +- .../newtab/data/content/abouthomecache/page.html.template | 2 +- .../components/newtab/data/content/activity-stream.bundle.js | 2 +- browser/components/newtab/lib/OnboardingMessageProvider.jsm | 2 +- browser/components/newtab/lib/RemoteL10n.jsm | 2 +- .../components/newtab/prerendered/activity-stream-debug.html | 2 +- .../newtab/prerendered/activity-stream-noscripts.html | 2 +- browser/components/newtab/prerendered/activity-stream.html | 2 +- .../components/newtab/test/unit/asrouter/RemoteL10n.test.js | 4 ++-- browser/components/pioneer/content/pioneer.html | 2 +- browser/components/preferences/dialogs/blocklists.xhtml | 2 +- .../components/preferences/dialogs/browserLanguages.xhtml | 2 +- browser/components/preferences/dialogs/clearSiteData.xhtml | 2 +- browser/components/preferences/dialogs/connection.xhtml | 2 +- browser/components/preferences/dialogs/sanitize.xhtml | 2 +- .../components/preferences/dialogs/siteDataSettings.xhtml | 2 +- browser/components/preferences/main.js | 2 +- browser/components/preferences/preferences.xhtml | 2 +- browser/components/preferences/privacy.js | 2 +- .../privatebrowsing/content/aboutPrivateBrowsing.html | 2 +- browser/components/protections/content/protections.html | 2 +- .../sessionstore/content/aboutSessionRestore.xhtml | 2 +- devtools/client/aboutdebugging/aboutdebugging.js | 2 +- intl/l10n/L10nRegistry.jsm | 12 ++++++++++++ security/manager/pki/resources/content/exceptionDialog.xhtml | 2 +- toolkit/components/certviewer/content/certviewer.html | 2 +- toolkit/content/aboutProfiles.xhtml | 2 +- toolkit/content/aboutRights-unbranded.xhtml | 2 +- toolkit/content/aboutRights.xhtml | 2 +- toolkit/content/aboutServiceWorkers.xhtml | 2 +- toolkit/content/aboutSupport.xhtml | 2 +- toolkit/content/aboutTelemetry.xhtml | 2 +- toolkit/content/resetProfile.xhtml | 2 +- toolkit/mozapps/downloads/content/unknownContentType.xhtml | 2 +- toolkit/mozapps/extensions/content/aboutaddons.html | 2 +- toolkit/mozapps/extensions/content/abuse-report-frame.html | 2 +- toolkit/mozapps/extensions/content/blocklist.xhtml | 2 +- toolkit/mozapps/extensions/content/extensions.xhtml | 2 +- toolkit/mozapps/preferences/changemp.xhtml | 2 +- toolkit/mozapps/update/content/updateElevation.xhtml | 2 +- toolkit/profile/content/createProfileWizard.xhtml | 2 +- toolkit/profile/content/profileDowngrade.xhtml | 2 +- toolkit/profile/content/profileSelection.xhtml | 2 +- 63 files changed, 76 insertions(+), 64 deletions(-)

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 9233838b9b584fdfdb4b90d18482683d211e5b65 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jun 18 16:05:39 2020 +0200 fixup! Bug 2176: Rebrand Firefox to TorBrowser Fix for bug 33954. --- browser/actors/WebRTCParent.jsm | 2 +- browser/base/content/aboutDialog.xhtml | 2 +- browser/base/content/aboutNetError.xhtml | 2 +- browser/base/content/aboutRestartRequired.xhtml | 2 +- browser/base/content/aboutTabCrashed.xhtml | 2 +- browser/base/content/blockedSite.xhtml | 2 +- browser/base/content/browser.js | 2 +- browser/base/content/browser.xhtml | 2 +- browser/base/content/macWindow.inc.xhtml | 2 +- browser/base/content/newInstallPage.html | 2 +- browser/base/content/safeMode.xhtml | 2 +- browser/base/content/webrtcIndicator.xhtml | 2 +- browser/components/aboutconfig/content/aboutconfig.html | 2 +- browser/components/aboutlogins/AboutLoginsParent.jsm | 4 ++-- browser/components/aboutlogins/content/aboutLogins.html | 2 +- browser/components/customizableui/content/panelUI.js | 2 +- .../components/enterprisepolicies/content/aboutPolicies.html | 2 +- browser/components/migration/content/aboutWelcomeBack.xhtml | 2 +- .../components/newtab/aboutwelcome/content/aboutwelcome.html | 2 +- browser/components/newtab/bin/render-activity-stream-html.js | 2 +- .../content-src/asrouter/templates/FirstRun/FirstRun.jsx | 2 +- .../newtab/data/content/abouthomecache/page.html.template | 2 +- .../components/newtab/data/content/activity-stream.bundle.js | 2 +- browser/components/newtab/lib/OnboardingMessageProvider.jsm | 2 +- browser/components/newtab/lib/RemoteL10n.jsm | 2 +- .../components/newtab/prerendered/activity-stream-debug.html | 2 +- .../newtab/prerendered/activity-stream-noscripts.html | 2 +- browser/components/newtab/prerendered/activity-stream.html | 2 +- .../components/newtab/test/unit/asrouter/RemoteL10n.test.js | 4 ++-- browser/components/pioneer/content/pioneer.html | 2 +- browser/components/preferences/dialogs/blocklists.xhtml | 2 +- .../components/preferences/dialogs/browserLanguages.xhtml | 2 +- browser/components/preferences/dialogs/clearSiteData.xhtml | 2 +- browser/components/preferences/dialogs/connection.xhtml | 2 +- browser/components/preferences/dialogs/sanitize.xhtml | 2 +- .../components/preferences/dialogs/siteDataSettings.xhtml | 2 +- browser/components/preferences/main.js | 2 +- browser/components/preferences/preferences.xhtml | 2 +- browser/components/preferences/privacy.js | 2 +- .../privatebrowsing/content/aboutPrivateBrowsing.html | 2 +- browser/components/protections/content/protections.html | 2 +- .../sessionstore/content/aboutSessionRestore.xhtml | 2 +- devtools/client/aboutdebugging/aboutdebugging.js | 2 +- intl/l10n/L10nRegistry.jsm | 12 ++++++++++++ security/manager/pki/resources/content/exceptionDialog.xhtml | 2 +- toolkit/components/certviewer/content/certviewer.html | 2 +- toolkit/content/aboutProfiles.xhtml | 2 +- toolkit/content/aboutRights-unbranded.xhtml | 2 +- toolkit/content/aboutRights.xhtml | 2 +- toolkit/content/aboutServiceWorkers.xhtml | 2 +- toolkit/content/aboutSupport.xhtml | 2 +- toolkit/content/aboutTelemetry.xhtml | 2 +- toolkit/content/resetProfile.xhtml | 2 +- toolkit/mozapps/downloads/content/unknownContentType.xhtml | 2 +- toolkit/mozapps/extensions/content/aboutaddons.html | 2 +- toolkit/mozapps/extensions/content/abuse-report-frame.html | 2 +- toolkit/mozapps/extensions/content/blocklist.xhtml | 2 +- toolkit/mozapps/extensions/content/extensions.xhtml | 2 +- toolkit/mozapps/preferences/changemp.xhtml | 2 +- toolkit/mozapps/update/content/updateElevation.xhtml | 2 +- toolkit/profile/content/createProfileWizard.xhtml | 2 +- toolkit/profile/content/profileDowngrade.xhtml | 2 +- toolkit/profile/content/profileSelection.xhtml | 2 +- 63 files changed, 76 insertions(+), 64 deletions(-) diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm index d50845f9001a..fea1897d63d4 100644 --- a/browser/actors/WebRTCParent.jsm +++ b/browser/actors/WebRTCParent.jsm @@ -482,7 +482,7 @@ function prompt(aActor, aBrowser, aRequest) { let chromeDoc = aBrowser.ownerDocument; let stringBundle = chromeDoc.defaultView.gNavigatorBundle; let localization = new Localization( - ["branding/tor-browser-brand.ftl", "browser/browser.ftl"], + ["branding/brand.ftl", "browser/browser.ftl"], true ); diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 02096fbfa3c0..5274cbc02831 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -35,7 +35,7 @@ #endif <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> </linkset> diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml index 120d4637f533..957b6f15a0be 100644 --- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -27,7 +27,7 @@ <link rel="icon" id="favicon" href="chrome://global/skin/icons/warning.svg"/> <link rel="localization" href="browser/aboutCertError.ftl" /> <link rel="localization" href="browser/nsserrors.ftl" /> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> </head> <body dir="&locale.dir;"> diff --git a/browser/base/content/aboutRestartRequired.xhtml b/browser/base/content/aboutRestartRequired.xhtml index 6b5ce7c201c8..c7e7b9dcbb91 100644 --- a/browser/base/content/aboutRestartRequired.xhtml +++ b/browser/base/content/aboutRestartRequired.xhtml @@ -15,7 +15,7 @@ toolkit/components/places/src/nsFaviconService.h should be updated. --> <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning.svg"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutRestartRequired.ftl"/> </head> <body> diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml index fd7d8f71ae9f..6ac50822f334 100644 --- a/browser/base/content/aboutTabCrashed.xhtml +++ b/browser/base/content/aboutTabCrashed.xhtml @@ -15,7 +15,7 @@ href="chrome://browser/content/aboutTabCrashed.css"/> <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/aboutTabCrashed.css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutTabCrashed.ftl"/> <title data-l10n-id="crashed-title"></title> diff --git a/browser/base/content/blockedSite.xhtml b/browser/base/content/blockedSite.xhtml index af64566af1ac..4601b0db82d7 100644 --- a/browser/base/content/blockedSite.xhtml +++ b/browser/base/content/blockedSite.xhtml @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <link rel="stylesheet" href="chrome://browser/skin/blockedSite.css" type="text/css" media="all" /> <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blocklist_favicon.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/safebrowsing/blockedSite.ftl"/> </head> <body> diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 3f019c5f24c1..230484af503f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -942,7 +942,7 @@ const gStoragePressureObserver = { } this._lastNotificationTime = Date.now(); - MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl"); + MozXULElement.insertFTLIfNeeded("branding/brand.ftl"); MozXULElement.insertFTLIfNeeded("browser/preferences/preferences.ftl"); const BYTES_IN_GIGABYTE = 1073741824; diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index d51fb0f914f3..fd9a5d14aeb2 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -68,7 +68,7 @@ persist="screenX screenY width height sizemode" data-l10n-sync="true"> <head> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="toolkit/global/textActions.ftl"/> diff --git a/browser/base/content/macWindow.inc.xhtml b/browser/base/content/macWindow.inc.xhtml index a4ba07c94d7a..d6327086ff32 100644 --- a/browser/base/content/macWindow.inc.xhtml +++ b/browser/base/content/macWindow.inc.xhtml @@ -11,7 +11,7 @@ # browser-doctype.inc must also be included. <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/branding/sync-brand.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="browser/browserSets.ftl"/> diff --git a/browser/base/content/newInstallPage.html b/browser/base/content/newInstallPage.html index 4c0c4bc69d27..3b7604030f05 100644 --- a/browser/base/content/newInstallPage.html +++ b/browser/base/content/newInstallPage.html @@ -10,7 +10,7 @@ <meta name="referrer" content="no-referrer"> <link rel="stylesheet" type="text/css" href="chrome://global/skin/in-content/common.css"> <link rel="stylesheet" type="text/css" href="chrome://browser/skin/newInstallPage.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/newInstallPage.ftl"> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"> diff --git a/browser/base/content/safeMode.xhtml b/browser/base/content/safeMode.xhtml index 7f10b95b9874..5c95e191372b 100644 --- a/browser/base/content/safeMode.xhtml +++ b/browser/base/content/safeMode.xhtml @@ -18,7 +18,7 @@ buttonidextra1="refresh-profile"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/safeMode.ftl"/> </linkset> diff --git a/browser/base/content/webrtcIndicator.xhtml b/browser/base/content/webrtcIndicator.xhtml index 80b0a12c0329..e56d175a9121 100644 --- a/browser/base/content/webrtcIndicator.xhtml +++ b/browser/base/content/webrtcIndicator.xhtml @@ -20,7 +20,7 @@ chromemargin="0,0,0,0"> <head> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/webrtcIndicator.ftl"/> #ifndef XP_MACOSX <title data-l10n-id="webrtc-indicator-title"></title> diff --git a/browser/components/aboutconfig/content/aboutconfig.html b/browser/components/aboutconfig/content/aboutconfig.html index 5c9dfd830a02..ce7f258f8db6 100644 --- a/browser/components/aboutconfig/content/aboutconfig.html +++ b/browser/components/aboutconfig/content/aboutconfig.html @@ -13,7 +13,7 @@ href="chrome://global/skin/in-content/info-pages.css" title="infop"> <link rel="stylesheet" type="text/css" href="chrome://browser/content/aboutconfig/aboutconfig.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/aboutConfig.ftl"> <script src="chrome://browser/content/aboutconfig/aboutconfig.js"></script> <title data-l10n-id="about-config-page-title"></title> diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index 5d0a0e4e83b9..d06d6d0ec6c7 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -52,7 +52,7 @@ XPCOMUtils.defineLazyPreferenceGetter( false ); XPCOMUtils.defineLazyGetter(this, "AboutLoginsL10n", () => { - return new Localization(["branding/tor-browser-brand.ftl", "browser/aboutLogins.ftl"]); + return new Localization(["branding/brand.ftl", "browser/aboutLogins.ftl"]); }); const ABOUT_LOGINS_ORIGIN = "about:logins"; @@ -716,7 +716,7 @@ var AboutLogins = { ); }, ], - extraFtl: ["branding/tor-browser-brand.ftl", "browser/branding/sync-brand.ftl"], + extraFtl: ["branding/brand.ftl", "browser/branding/sync-brand.ftl"], }); }, diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html index 209681adcd39..3b4f100d4b27 100644 --- a/browser/components/aboutlogins/content/aboutLogins.html +++ b/browser/components/aboutlogins/content/aboutLogins.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; img-src data: blob: https://firefoxusercontent.com;"/> <title data-l10n-id="about-logins-page-title"></title> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/branding/brandings.ftl"> <link rel="localization" href="browser/aboutLogins.ftl"> diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 97b6af51b22b..1f1d39aa23ec 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -898,7 +898,7 @@ const PanelUI = { let anchor = this._getPanelAnchor(this.menuButton); // Insert Fluent files when needed before notification is opened - MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl"); + MozXULElement.insertFTLIfNeeded("branding/brand.ftl"); MozXULElement.insertFTLIfNeeded("browser/appMenuNotifications.ftl"); // After Fluent files are loaded into document replace data-lazy-l10n-ids with actual ones diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.html b/browser/components/enterprisepolicies/content/aboutPolicies.html index 3deb79c0f989..e1da06927128 100644 --- a/browser/components/enterprisepolicies/content/aboutPolicies.html +++ b/browser/components/enterprisepolicies/content/aboutPolicies.html @@ -10,7 +10,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'"> <title data-l10n-id="about-policies-title"></title> <link rel="stylesheet" href="chrome://browser/content/policies/aboutPolicies.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/aboutPolicies.ftl"> <link rel="localization" href="browser/policies/policies-descriptions.ftl"> diff --git a/browser/components/migration/content/aboutWelcomeBack.xhtml b/browser/components/migration/content/aboutWelcomeBack.xhtml index 3958822f560f..e4c02d23d3c1 100644 --- a/browser/components/migration/content/aboutWelcomeBack.xhtml +++ b/browser/components/migration/content/aboutWelcomeBack.xhtml @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://browser/skin/aboutWelcomeBack.css" type="text/css" media="all"/> <link rel="icon" type="image/png" href="chrome://browser/skin/info.svg"/> <link rel="localization" href="browser/aboutSessionRestore.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://browser/content/aboutSessionRestore.js"/> </head> diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html index a2e7dbdc3342..76d9d6be499e 100644 --- a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html +++ b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html @@ -10,7 +10,7 @@ <title data-l10n-id="onboarding-welcome-header"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"> <link rel="stylesheet" href="resource://activity-stream/aboutwelcome/aboutwelcome.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="browser/newtab/onboarding.ftl"/> diff --git a/browser/components/newtab/bin/render-activity-stream-html.js b/browser/components/newtab/bin/render-activity-stream-html.js index 22745cf4ea60..4c2bb95cb16b 100644 --- a/browser/components/newtab/bin/render-activity-stream-html.js +++ b/browser/components/newtab/bin/render-activity-stream-html.js @@ -58,7 +58,7 @@ function templateHTML(options) { <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx b/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx index 428c388038dc..209ffff0c1f7 100644 --- a/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx +++ b/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx @@ -11,7 +11,7 @@ import { BASE_PARAMS } from "./addUtmParams"; const TRANSITION_LENGTH = 500; export const FLUENT_FILES = [ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl", diff --git a/browser/components/newtab/data/content/abouthomecache/page.html.template b/browser/components/newtab/data/content/abouthomecache/page.html.template index cf25f51146ff..f55893077c0e 100644 --- a/browser/components/newtab/data/content/abouthomecache/page.html.template +++ b/browser/components/newtab/data/content/abouthomecache/page.html.template @@ -25,7 +25,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js index 6d2b809735eb..a49d80f05cf7 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js @@ -15890,7 +15890,7 @@ var addUtmParams = __webpack_require__(18); // Note: should match the transition time on .trailheadCards in _Trailhead.scss const TRANSITION_LENGTH = 500; -const FLUENT_FILES = ["branding/tor-browser-brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; +const FLUENT_FILES = ["branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; const helpers = { addFluent(document) { FLUENT_FILES.forEach(file => { diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm index cc2dd91afa01..99c958eab29e 100644 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm @@ -19,7 +19,7 @@ const { FX_MONITOR_OAUTH_CLIENT_ID } = ChromeUtils.import( const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const L10N = new Localization([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl", diff --git a/browser/components/newtab/lib/RemoteL10n.jsm b/browser/components/newtab/lib/RemoteL10n.jsm index 90c587cc560b..72dcf915d81f 100644 --- a/browser/components/newtab/lib/RemoteL10n.jsm +++ b/browser/components/newtab/lib/RemoteL10n.jsm @@ -67,7 +67,7 @@ class _RemoteL10n { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ], false, Services.prefs.getBoolPref(USE_REMOTE_L10N_PREF, true) diff --git a/browser/components/newtab/prerendered/activity-stream-debug.html b/browser/components/newtab/prerendered/activity-stream-debug.html index c410f5a474bf..72c2d8f6d3ac 100644 --- a/browser/components/newtab/prerendered/activity-stream-debug.html +++ b/browser/components/newtab/prerendered/activity-stream-debug.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/prerendered/activity-stream-noscripts.html b/browser/components/newtab/prerendered/activity-stream-noscripts.html index c9d0eb026294..c7ceabc82fd3 100644 --- a/browser/components/newtab/prerendered/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/activity-stream-noscripts.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/prerendered/activity-stream.html b/browser/components/newtab/prerendered/activity-stream.html index 809e29c65529..af52351782c1 100644 --- a/browser/components/newtab/prerendered/activity-stream.html +++ b/browser/components/newtab/prerendered/activity-stream.html @@ -9,7 +9,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';"> <title data-l10n-id="newtab-page-title"></title> <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="browser/branding/brandings.ftl" /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" /> diff --git a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js index a57565e29a7d..7552b5236469 100644 --- a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js +++ b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js @@ -63,7 +63,7 @@ describe("RemoteL10n", () => { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ]); assert.isFalse(args[1]); assert.isFunction(args[2].generateBundles); @@ -81,7 +81,7 @@ describe("RemoteL10n", () => { "browser/newtab/asrouter.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", ]); assert.isFalse(args[1]); assert.isEmpty(args[2]); diff --git a/browser/components/pioneer/content/pioneer.html b/browser/components/pioneer/content/pioneer.html index 897e1c84444b..dc5dc6031e0b 100644 --- a/browser/components/pioneer/content/pioneer.html +++ b/browser/components/pioneer/content/pioneer.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; img-src https:; object-src 'none'"> <link rel="localization" href="browser/branding/brandings.ftl"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl">  <link rel="localization" href="preview/pioneer.ftl"> <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"> diff --git a/browser/components/preferences/dialogs/blocklists.xhtml b/browser/components/preferences/dialogs/blocklists.xhtml index c7141bd86d31..3cccc1952c9a 100644 --- a/browser/components/preferences/dialogs/blocklists.xhtml +++ b/browser/components/preferences/dialogs/blocklists.xhtml @@ -19,7 +19,7 @@ onkeypress="gBlocklistManager.onWindowKeyPress(event);"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/blocklists.ftl"/> </linkset> diff --git a/browser/components/preferences/dialogs/browserLanguages.xhtml b/browser/components/preferences/dialogs/browserLanguages.xhtml index e691773b45b9..2e6065870481 100644 --- a/browser/components/preferences/dialogs/browserLanguages.xhtml +++ b/browser/components/preferences/dialogs/browserLanguages.xhtml @@ -19,7 +19,7 @@ helpTopic="change-language"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/languages.ftl"/> </linkset> diff --git a/browser/components/preferences/dialogs/clearSiteData.xhtml b/browser/components/preferences/dialogs/clearSiteData.xhtml index 5c3714fb391c..fb289f2d27be 100644 --- a/browser/components/preferences/dialogs/clearSiteData.xhtml +++ b/browser/components/preferences/dialogs/clearSiteData.xhtml @@ -17,7 +17,7 @@ persist="screenX screenY width height"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/clearSiteData.ftl"/> </linkset> <script src="chrome://browser/content/preferences/dialogs/clearSiteData.js"/> diff --git a/browser/components/preferences/dialogs/connection.xhtml b/browser/components/preferences/dialogs/connection.xhtml index c7fffda08294..ab7c107992bc 100644 --- a/browser/components/preferences/dialogs/connection.xhtml +++ b/browser/components/preferences/dialogs/connection.xhtml @@ -22,7 +22,7 @@ <linkset> <html:link rel="localization" href="browser/preferences/connection.ftl"/> <html:link rel="localization" href="browser/preferences/preferences.ftl"/> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> </linkset> <script src="chrome://browser/content/utilityOverlay.js"/> diff --git a/browser/components/preferences/dialogs/sanitize.xhtml b/browser/components/preferences/dialogs/sanitize.xhtml index ae97656a4f69..73e7d8acce07 100644 --- a/browser/components/preferences/dialogs/sanitize.xhtml +++ b/browser/components/preferences/dialogs/sanitize.xhtml @@ -23,7 +23,7 @@ <linkset> <html:link rel="localization" href="browser/sanitize.ftl"/> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> </linkset> <script src="chrome://browser/content/utilityOverlay.js"/> diff --git a/browser/components/preferences/dialogs/siteDataSettings.xhtml b/browser/components/preferences/dialogs/siteDataSettings.xhtml index 834f0d9bb924..6e184c2bd83c 100644 --- a/browser/components/preferences/dialogs/siteDataSettings.xhtml +++ b/browser/components/preferences/dialogs/siteDataSettings.xhtml @@ -20,7 +20,7 @@ persist="screenX screenY width height"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/> </linkset> diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index 329cbeba163a..6b258429e773 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -249,7 +249,7 @@ function getBundleForLocales(newLocales) { return L10nRegistry.generateBundles(locales, resourceIds); } return new Localization( - ["browser/preferences/preferences.ftl", "branding/tor-browser-brand.ftl"], + ["browser/preferences/preferences.ftl", "branding/brand.ftl"], false, { generateBundles } ); diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml index 2d01c5c8b775..b09808e83c45 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -35,7 +35,7 @@ <title data-l10n-id="pref-page-title"></title> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/brandings.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/preferences/preferences.ftl"/> diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js index 7f24a0a659f5..92f35dc78d12 100644 --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js @@ -31,7 +31,7 @@ ChromeUtils.defineModuleGetter( ); XPCOMUtils.defineLazyGetter(this, "L10n", () => { return new Localization([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "browser/preferences/preferences.ftl", ]); }); diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html index 98e596a5b81c..8611936b0083 100644 --- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html +++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html @@ -11,7 +11,7 @@ <link rel="icon" href="chrome://browser/skin/privatebrowsing/favicon.svg"/> <link rel="stylesheet" href="chrome://browser/content/aboutPrivateBrowsing.css" media="all"/> <link rel="stylesheet" href="chrome://browser/skin/privatebrowsing/aboutPrivateBrowsing.css" media="all"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/aboutPrivateBrowsing.ftl"/> <script src="chrome://browser/content/aboutPrivateBrowsing.js"></script> <script src="chrome://browser/content/contentSearchHandoffUI.js"></script> diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html index bed9dbd4e145..e7aac37ed6ea 100644 --- a/browser/components/protections/content/protections.html +++ b/browser/components/protections/content/protections.html @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:; object-src 'none'"> <link rel="localization" href="browser/branding/brandings.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"> <link rel="localization" href="browser/protections.ftl">  diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/browser/components/sessionstore/content/aboutSessionRestore.xhtml index 41dbe15f76bf..05c0e4f732ee 100644 --- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml +++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://browser/skin/aboutSessionRestore.css" type="text/css" media="all"/> <link rel="icon" href="chrome://global/skin/icons/warning.svg"/> <link rel="localization" href="browser/aboutSessionRestore.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://browser/content/aboutSessionRestore.js"/> </head> diff --git a/devtools/client/aboutdebugging/aboutdebugging.js b/devtools/client/aboutdebugging/aboutdebugging.js index 8a6795de2246..bbe97b7170d5 100644 --- a/devtools/client/aboutdebugging/aboutdebugging.js +++ b/devtools/client/aboutdebugging/aboutdebugging.js @@ -89,7 +89,7 @@ const AboutDebugging = { this.actions.recordTelemetryEvent("open_adbg", { width }); await l10n.init([ - "branding/tor-browser-brand.ftl", + "branding/brand.ftl", "devtools/client/aboutdebugging.ftl", ]); diff --git a/intl/l10n/L10nRegistry.jsm b/intl/l10n/L10nRegistry.jsm index 69e09f5aa99e..684502ad9002 100644 --- a/intl/l10n/L10nRegistry.jsm +++ b/intl/l10n/L10nRegistry.jsm @@ -139,6 +139,12 @@ class L10nRegistryService { async* generateBundles(requestedLangs, resourceIds) { const resourceIdsDedup = Array.from(new Set(resourceIds)); const sourcesOrder = Array.from(this.sources.keys()).reverse(); + // Always prioritize torbutton sources (keep in sync with generateBundlesSync) + const idxTB = sourcesOrder.indexOf("torbutton"); + if (idxTB > 0) { + sourcesOrder.splice(idxTB, 1); + sourcesOrder.unshift("torbutton"); + } const pseudoStrategy = Services.prefs.getStringPref("intl.l10n.pseudo", ""); for (const locale of requestedLangs) { for await (const dataSets of generateResourceSetsForLocale(locale, sourcesOrder, resourceIdsDedup)) { @@ -172,6 +178,12 @@ class L10nRegistryService { * generateBundlesSync(requestedLangs, resourceIds) { const resourceIdsDedup = Array.from(new Set(resourceIds)); const sourcesOrder = Array.from(this.sources.keys()).reverse(); + // Always prioritize torbutton sources (keep in sync with generateBundles) + const idxTB = sourcesOrder.indexOf("torbutton"); + if (idxTB > 0) { + sourcesOrder.splice(idxTB, 1); + sourcesOrder.unshift("torbutton"); + } const pseudoStrategy = Services.prefs.getStringPref("intl.l10n.pseudo", ""); for (const locale of requestedLangs) { for (const dataSets of generateResourceSetsForLocaleSync(locale, sourcesOrder, resourceIdsDedup)) { diff --git a/security/manager/pki/resources/content/exceptionDialog.xhtml b/security/manager/pki/resources/content/exceptionDialog.xhtml index 5c0c256aa2bb..56be4bc5cbd4 100644 --- a/security/manager/pki/resources/content/exceptionDialog.xhtml +++ b/security/manager/pki/resources/content/exceptionDialog.xhtml @@ -19,7 +19,7 @@ defaultButton="extra2"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="security/certificates/certManager.ftl"/> </linkset> diff --git a/toolkit/components/certviewer/content/certviewer.html b/toolkit/components/certviewer/content/certviewer.html index bc78dd5fc18e..3f097e48ada5 100644 --- a/toolkit/components/certviewer/content/certviewer.html +++ b/toolkit/components/certviewer/content/certviewer.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width" /> <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <link rel="localization" href="toolkit/about/certviewer.ftl"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <script defer="defer" src="chrome://global/content/certviewer/pvutils_bundle.js"></script> <script defer="defer" src="chrome://global/content/certviewer/asn1js_bundle.js"></script> <script defer="defer" src="chrome://global/content/certviewer/pkijs_bundle.js"></script> diff --git a/toolkit/content/aboutProfiles.xhtml b/toolkit/content/aboutProfiles.xhtml index 0411a687525d..56a43b3dd155 100644 --- a/toolkit/content/aboutProfiles.xhtml +++ b/toolkit/content/aboutProfiles.xhtml @@ -13,7 +13,7 @@ <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" /> <script src="chrome://global/content/aboutProfiles.js" /> - <link rel="localization" href="branding/tor-browser-brand.ftl" /> + <link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="toolkit/about/aboutProfiles.ftl" /> </head> <body id="body" class="wide-container"> diff --git a/toolkit/content/aboutRights-unbranded.xhtml b/toolkit/content/aboutRights-unbranded.xhtml index 89e212bc4c5d..44c4c350b2d0 100644 --- a/toolkit/content/aboutRights-unbranded.xhtml +++ b/toolkit/content/aboutRights-unbranded.xhtml @@ -14,7 +14,7 @@ <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> <title data-l10n-id="rights-title"></title> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head> diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml index ff7e2455f312..23dfe8512e1c 100644 --- a/toolkit/content/aboutRights.xhtml +++ b/toolkit/content/aboutRights.xhtml @@ -15,7 +15,7 @@ <title data-l10n-id="rights-title"></title> <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> <link rel="stylesheet" href="chrome://global/skin/aboutRights.css" type="text/css"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head> diff --git a/toolkit/content/aboutServiceWorkers.xhtml b/toolkit/content/aboutServiceWorkers.xhtml index 0d00241f851c..6bf38033e3e6 100644 --- a/toolkit/content/aboutServiceWorkers.xhtml +++ b/toolkit/content/aboutServiceWorkers.xhtml @@ -15,7 +15,7 @@ <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutServiceWorkers.css" type="text/css" /> <link rel="localization" href="toolkit/about/aboutServiceWorkers.ftl"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <script src="chrome://global/content/aboutServiceWorkers.js" /> </head> <body id="body"> diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index c6c5be1470d6..ef35864d52b5 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -20,7 +20,7 @@ type="text/css"/> <script src="chrome://global/content/aboutSupport.js"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutSupport.ftl"/> <link rel="localization" href="toolkit/global/resetProfile.ftl"/> <link rel="localization" href="toolkit/global/processTypes.ftl"/> diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml index dada800b0bfe..1998b12b0655 100644 --- a/toolkit/content/aboutTelemetry.xhtml +++ b/toolkit/content/aboutTelemetry.xhtml @@ -14,7 +14,7 @@ type="text/css"/> <script src="chrome://global/content/aboutTelemetry.js"/> - <link rel="localization" href="branding/tor-browser-brand.ftl"/> + <link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="toolkit/about/aboutTelemetry.ftl"/> </head> diff --git a/toolkit/content/resetProfile.xhtml b/toolkit/content/resetProfile.xhtml index 6f2b7ab8c22d..7ddafefef0e8 100644 --- a/toolkit/content/resetProfile.xhtml +++ b/toolkit/content/resetProfile.xhtml @@ -17,7 +17,7 @@  <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/resetProfile.ftl"/> </linkset> diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xhtml b/toolkit/mozapps/downloads/content/unknownContentType.xhtml index a23d03be4a3b..9a9551d59a43 100644 --- a/toolkit/mozapps/downloads/content/unknownContentType.xhtml +++ b/toolkit/mozapps/downloads/content/unknownContentType.xhtml @@ -29,7 +29,7 @@ persist="screenX screenY" aria-describedby="intro location whichIs type from source unknownPrompt"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/unknownContentType.ftl"/> </linkset> <dialog id="unknownContentType"> diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html index dc30e8c79f52..afe6a9956501 100644 --- a/toolkit/mozapps/extensions/content/aboutaddons.html +++ b/toolkit/mozapps/extensions/content/aboutaddons.html @@ -17,7 +17,7 @@ <link rel="stylesheet" href="chrome://mozapps/content/extensions/aboutaddons.css"> <link rel="stylesheet" href="chrome://mozapps/content/extensions/shortcuts.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> diff --git a/toolkit/mozapps/extensions/content/abuse-report-frame.html b/toolkit/mozapps/extensions/content/abuse-report-frame.html index 5737db251688..16f84d456c0a 100644 --- a/toolkit/mozapps/extensions/content/abuse-report-frame.html +++ b/toolkit/mozapps/extensions/content/abuse-report-frame.html @@ -10,7 +10,7 @@ <link rel="stylesheet" href="chrome://mozapps/content/extensions/aboutaddons.css"> <link rel="stylesheet" href="chrome://mozapps/content/extensions/abuse-report-panel.css"> - <link rel="localization" href="branding/tor-browser-brand.ftl"> + <link rel="localization" href="branding/brand.ftl"> <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> diff --git a/toolkit/mozapps/extensions/content/blocklist.xhtml b/toolkit/mozapps/extensions/content/blocklist.xhtml index dd3e8ed00244..68d0004044d6 100644 --- a/toolkit/mozapps/extensions/content/blocklist.xhtml +++ b/toolkit/mozapps/extensions/content/blocklist.xhtml @@ -23,7 +23,7 @@ buttonidaccept="blocklist-accept"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/extensions/blocklist.ftl"/> </linkset> diff --git a/toolkit/mozapps/extensions/content/extensions.xhtml b/toolkit/mozapps/extensions/content/extensions.xhtml index 62b1cea9f416..f5b05018f768 100644 --- a/toolkit/mozapps/extensions/content/extensions.xhtml +++ b/toolkit/mozapps/extensions/content/extensions.xhtml @@ -14,7 +14,7 @@ <xhtml:link rel="shortcut icon" href="chrome://mozapps/skin/extensions/extension.svg"/> <linkset> - <xhtml:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <xhtml:link rel="localization" href="branding/brand.ftl"/> <xhtml:link rel="localization" href="toolkit/about/aboutAddons.ftl"/> </linkset> diff --git a/toolkit/mozapps/preferences/changemp.xhtml b/toolkit/mozapps/preferences/changemp.xhtml index 9329d8b03e49..3b6941b42abf 100644 --- a/toolkit/mozapps/preferences/changemp.xhtml +++ b/toolkit/mozapps/preferences/changemp.xhtml @@ -16,7 +16,7 @@ <script src="chrome://mozapps/content/preferences/changemp.js"/> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/preferences/preferences.ftl"/> </linkset> diff --git a/toolkit/mozapps/update/content/updateElevation.xhtml b/toolkit/mozapps/update/content/updateElevation.xhtml index 34fe998e9ab6..46ddc5ef7d1b 100644 --- a/toolkit/mozapps/update/content/updateElevation.xhtml +++ b/toolkit/mozapps/update/content/updateElevation.xhtml @@ -32,7 +32,7 @@ <script src="chrome://global/content/editMenuOverlay.js"/> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/updates/elevation.ftl"/> </linkset> diff --git a/toolkit/profile/content/createProfileWizard.xhtml b/toolkit/profile/content/createProfileWizard.xhtml index 5726b8ece29c..9b0dea9547ab 100644 --- a/toolkit/profile/content/createProfileWizard.xhtml +++ b/toolkit/profile/content/createProfileWizard.xhtml @@ -17,7 +17,7 @@ > <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/createProfileWizard.ftl"/> </linkset> diff --git a/toolkit/profile/content/profileDowngrade.xhtml b/toolkit/profile/content/profileDowngrade.xhtml index 9f8c51f4a92b..c2e4c359b79a 100644 --- a/toolkit/profile/content/profileDowngrade.xhtml +++ b/toolkit/profile/content/profileDowngrade.xhtml @@ -17,7 +17,7 @@ <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/branding/sync-brand.ftl"/> <html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/> </linkset> diff --git a/toolkit/profile/content/profileSelection.xhtml b/toolkit/profile/content/profileSelection.xhtml index 9e071ad95e2a..182eceff7ee8 100644 --- a/toolkit/profile/content/profileSelection.xhtml +++ b/toolkit/profile/content/profileSelection.xhtml @@ -24,7 +24,7 @@ buttonidcancel="profile-selection-button-cancel"> <linkset> - <html:link rel="localization" href="branding/tor-browser-brand.ftl"/> + <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="toolkit/global/profileSelection.ftl"/> </linkset>

1 0

[torbutton/master] Bug 40012: Fix about:tor not loading some images in 82
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 94e44055213db5065e94f32d63d8f2d664ca951b Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Sep 25 13:32:46 2020 +0200 Bug 40012: Fix about:tor not loading some images in 82 Changed their URLs to relative ones. --- chrome/skin/aboutTor.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 170cda27..71a8397c 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -195,7 +195,7 @@ body:not([showmanual]) .showForManual { height: auto; width: 50px; display: inline-block; - background: url('chrome://torbutton/skin/searchLogo.png') no-repeat center center; + background: url('searchLogo.png') no-repeat center center; background-size: 30px 30px; } @@ -203,7 +203,7 @@ body:not([showmanual]) .showForManual { height: auto; width: 36px; border: 0; - background: url('chrome://torbutton/skin/forwardArrow.png') no-repeat center center; + background: url('forwardArrow.png') no-repeat center center; background-size: 16px 14px; cursor: pointer; }

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 4320a0de1d3aab613a30c77c47ccfa812dab4441 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 14:55:54 2020 +0000 Translation updates --- chrome/locale/ar/aboutTor.dtd | 6 +- chrome/locale/ca/aboutTor.dtd | 10 ++-- chrome/locale/cs/aboutTor.dtd | 6 +- chrome/locale/da/aboutTor.dtd | 6 +- chrome/locale/de/aboutTor.dtd | 6 +- chrome/locale/el/aboutTor.dtd | 8 +-- chrome/locale/es-AR/aboutTor.dtd | 6 +- chrome/locale/es-ES/aboutTor.dtd | 4 +- chrome/locale/fa/aboutTor.dtd | 24 ++++---- chrome/locale/fr/aboutTor.dtd | 4 +- chrome/locale/ga-IE/aboutTor.dtd | 4 +- chrome/locale/ga-IE/torbutton.properties | 62 ++++++++++---------- chrome/locale/he/aboutTor.dtd | 4 +- chrome/locale/hu/aboutTor.dtd | 4 +- chrome/locale/id/aboutTor.dtd | 2 +- chrome/locale/is/aboutTor.dtd | 4 +- chrome/locale/is/torbutton.properties | 40 ++++++------- chrome/locale/it/aboutTor.dtd | 4 +- chrome/locale/ja/aboutTor.dtd | 4 +- chrome/locale/ka/aboutTor.dtd | 4 +- chrome/locale/ko/aboutTor.dtd | 4 +- chrome/locale/ko/torbutton.dtd | 2 +- chrome/locale/lt/aboutTor.dtd | 6 +- chrome/locale/mk/aboutTor.dtd | 4 +- chrome/locale/nl/aboutTor.dtd | 4 +- chrome/locale/pl/aboutTor.dtd | 4 +- chrome/locale/pt-BR/aboutTor.dtd | 6 +- chrome/locale/pt-BR/torbutton.properties | 2 +- chrome/locale/ro/aboutTor.dtd | 4 +- chrome/locale/ro/torbutton.properties | 4 +- chrome/locale/ru/aboutDialog.dtd | 8 +-- chrome/locale/ru/aboutTBUpdate.dtd | 4 +- chrome/locale/ru/aboutTor.dtd | 14 ++--- chrome/locale/ru/brand.dtd | 4 +- chrome/locale/ru/brand.properties | 6 +- chrome/locale/ru/branding/brand.ftl | 2 +- chrome/locale/ru/torbutton.dtd | 2 +- chrome/locale/ru/torbutton.properties | 98 ++++++++++++++++---------------- chrome/locale/sv-SE/aboutTor.dtd | 4 +- chrome/locale/sv-SE/brand.dtd | 2 +- chrome/locale/sv-SE/torbutton.properties | 2 +- chrome/locale/th/aboutTor.dtd | 4 +- chrome/locale/tr/aboutTor.dtd | 4 +- chrome/locale/vi/aboutTor.dtd | 6 +- chrome/locale/zh-CN/aboutTor.dtd | 4 +- chrome/locale/zh-CN/torbutton.properties | 8 +-- chrome/locale/zh-TW/aboutTor.dtd | 4 +- 47 files changed, 214 insertions(+), 214 deletions(-) diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd index e6d9941d..ba01471e 100644 --- a/chrome/locale/ar/aboutTor.dtd +++ b/chrome/locale/ar/aboutTor.dtd @@ -27,9 +27,9 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> -<!ENTITY aboutTor.donationBanner.freeToUse "تور متاح مجاناً بفضل التبرعات من الأشخاص مثلك"> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor متاح مجاناً بفضل تبرعات من أشخاص مثلك"> <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "لنستخدم قناعًا ،لنستخدم Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "لنواجه جائحة المراقبة."> diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd index 0952deae..3d5966fc 100644 --- a/chrome/locale/ca/aboutTor.dtd +++ b/chrome/locale/ca/aboutTor.dtd @@ -4,19 +4,19 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "Quant a Tor"> +<!ENTITY aboutTor.title "Quant al Tor"> <!ENTITY aboutTor.viewChangelog.label "Mostra el registre de canvis"> <!ENTITY aboutTor.ready.label "Exploreu. Privadament."> <!ENTITY aboutTor.ready2.label "Esteu preparat per a l'experiència de navegació més privada del món."> -<!ENTITY aboutTor.failure.label "Hi ha algun error."> +<!ENTITY aboutTor.failure.label "S'ha produït un error."> <!ENTITY aboutTor.failure2.label "Tor no funciona en aquest navegador."> <!ENTITY aboutTor.search.label "Cerca amb DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Preguntes?"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Cap pregunta?"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "Consulteu el nostre manual del navegador Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Feu una donació">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Useu una màscara, useu Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resistiu la pandèmia de la vigilància."> diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd index a4906cd1..43b8f5f9 100644 --- a/chrome/locale/cs/aboutTor.dtd +++ b/chrome/locale/cs/aboutTor.dtd @@ -27,9 +27,9 @@ <!ENTITY aboutTor.newsletter.tagline "Nechte si posílat nejnovější informace o Toru."> <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor je zdarma k použití díky darům od lidí jako ty."> <!ENTITY aboutTor.donationBanner.buttonA "Přispějte">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Noste masku, používejte Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Odolávejte pandemii dozoru."> diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd index 7076fca9..b7113175 100644 --- a/chrome/locale/da/aboutTor.dtd +++ b/chrome/locale/da/aboutTor.dtd @@ -9,7 +9,7 @@ <!ENTITY aboutTor.viewChangelog.label "Vis ændringslog"> <!ENTITY aboutTor.ready.label "Udforsk. Privat."> -<!ENTITY aboutTor.ready2.label "Du er klar til verdenens mest private browseroplevelse."> +<!ENTITY aboutTor.ready2.label "Du er klar til verdens mest private browseroplevelse."> <!ENTITY aboutTor.failure.label "Noget gik galt!"> <!ENTITY aboutTor.failure2.label "Tor virker ikke i denne browser."> @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Donér nu">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Brug en maske, brug Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Modsæt dig den pandemiske overvågning."> diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd index f8cac6a3..8e82ac2f 100644 --- a/chrome/locale/de/aboutTor.dtd +++ b/chrome/locale/de/aboutTor.dtd @@ -17,7 +17,7 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Fragen?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schaue unser Tor Browser Handbuch an »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schaue in unser Tor Browser Handbuch »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-Handbuch"> @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Nutze eine Maske, nutze Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Wehre dich gegen die Überwachungspandemie."> diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd index 8a4711ac..400bb4cc 100644 --- a/chrome/locale/el/aboutTor.dtd +++ b/chrome/locale/el/aboutTor.dtd @@ -27,9 +27,9 @@ <!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> -<!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι ελεύθερο λογισμικό, λόγω δωρεών από άτομα σαν κι εσας."> -<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> +<!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι ελεύθερο λογισμικό, λόγω δωρεών από άτομα σαν κι εσάς."> +<!ENTITY aboutTor.donationBanner.buttonA "Κάνε μια δωρεά τώρα">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "ΒΑΖΟΥΜΕ ΜΑΣΚΑ, ΒΑΖΟΥΜΕ TOR."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Κόντρα στην πανδημία της παρακολούθησης."> diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index d3c9dc22..ce843db0 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -27,9 +27,9 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor es gratis gracias a las donaciones de personas como vos."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor puede ser usado libremente gracias a las donaciones de personas como vos."> <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Usá un tapaboca, usá Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resistí a la pandemia de vigilancia."> diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd index 5a32a47a..04c2b2bb 100644 --- a/chrome/locale/es-ES/aboutTor.dtd +++ b/chrome/locale/es-ES/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Usa una mascarilla, usa Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resiste a la pandemia de vigilancia."> diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd index 27ab898c..e1e7257b 100644 --- a/chrome/locale/fa/aboutTor.dtd +++ b/chrome/locale/fa/aboutTor.dtd @@ -4,32 +4,32 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "درباره‌ی Tor"> +<!ENTITY aboutTor.title "درباره‌ٔ Tor"> <!ENTITY aboutTor.viewChangelog.label "دیدن گزارش تغییرات"> -<!ENTITY aboutTor.ready.label "کاوش. خصوصی."> -<!ENTITY aboutTor.ready2.label "شما برای تجربه خصوصی‌ترین مرور اینترنت در جهان آماده هستید."> -<!ENTITY aboutTor.failure.label "خطایی پیش آمده است!"> +<!ENTITY aboutTor.ready.label "کاوش کنید. بطور خصوصی."> +<!ENTITY aboutTor.ready2.label "شما برای تجربهٔ خصوصی‌ترین مرور اینترنت در جهان آماده هستید."> +<!ENTITY aboutTor.failure.label "خطایی رخ داد!"> <!ENTITY aboutTor.failure2.label "Tor با این مرورگر کار نمی‌کند."> -<!ENTITY aboutTor.search.label "جستجو توسط داک‌داک‌گو"> +<!ENTITY aboutTor.search.label "جستجو با DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torbrowser_user_manual_questions.label "سوالات؟"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "سؤالات؟"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "بررسی راهنمای مرورگر Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "راهنمای مرورگر Tor"> -<!ENTITY aboutTor.tor_mission.label "پروژه‌ی Tor یک سازمان غیرانتفاعی US 501(c)(3) برای پیشبرد حقوق بشر و آزادی با ایجاد و استقرار تکنولوژی‌های گمنامی متن باز و حریم خصوصی است که از در دسترس بودن نامحدود و استفاده و پیشرفت درک علمی و عمومی بشر حمایت می‌کند."> -<!ENTITY aboutTor.getInvolved.label "دریافت مشارکت »"> +<!ENTITY aboutTor.tor_mission.label "پروژه‌ٔ Tor یک سازمان غیرانتفاعی US 501(c)(3) برای پیشبرد حقوق بشر و آزادی با ایجاد و استقرار تکنولوژی‌های ناشناس‌کننده و حریم خصوصی متن‌باز است که از در دسترس بودن و استفادهٔ نامحدود و گسترش درک علمی و عمومی آنان حمایت می‌کند."> +<!ENTITY aboutTor.getInvolved.label "مشارکت کنید »"> <!ENTITY aboutTor.newsletter.tagline "آخرین اخبار Tor را در صندوق ورودی خود دریافت کنید."> <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار Tor."> -<!ENTITY aboutTor.donationBanner.freeToUse "تور برای استفاده رایگان بوده و این به خاطر افرادی مانند شما می باشد."> -<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor برای استفاده رایگان است، این به خاطر حمایت افرادی مانند شماست."> +<!ENTITY aboutTor.donationBanner.buttonA "اکنون حمایت کنید">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "از ماسک استفاده کنید، از Tor استفاده کنید."> +<!ENTITY aboutTor.ey2020.resistsurveillance "در برابر دنیاگیری نظارت مقاومت کنید."> diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd index 5c09efe7..4f2d79c6 100644 --- a/chrome/locale/fr/aboutTor.dtd +++ b/chrome/locale/fr/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Utilisez un masque, utilisez Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Résistez à la pandémie de surveillance."> diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd index e9c097d3..d9d9a5cf 100644 --- a/chrome/locale/ga-IE/aboutTor.dtd +++ b/chrome/locale/ga-IE/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Úsáid masc, úsáid Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Seas an fód in aghaidh phaindéim an fhaireachais."> diff --git a/chrome/locale/ga-IE/torbutton.properties b/chrome/locale/ga-IE/torbutton.properties index 1c7295c1..8623cabb 100644 --- a/chrome/locale/ga-IE/torbutton.properties +++ b/chrome/locale/ga-IE/torbutton.properties @@ -73,52 +73,52 @@ onionServices.errorPage.onionSite=Suíomh Onion onionServices.descNotFound.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil onionServices.descNotFound.header=Suíomh Onion gan aimsiú onionServices.descNotFound=Is dócha go bhfuil an suíomh onion as líne. Téigh i dteagmháil le riarthóir an tsuímh. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.longDescription=Mionsonraí: %S — Níorbh fhéidir an tuairiscín seo ar sheirbhís onion a aimsiú ar an bhfáinne haiseála, agus dá bharr sin ní féidir leis an gcliant ceangal a bhunú leis an tseirbhís. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil onionServices.descInvalid.header=Ní féidir teagmháil a dhéanamh leis an suíomh Onion -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid=Ní féidir teacht ar an suíomh onion mar gheall ar earráid inmheánach. +onionServices.descInvalid.longDescription=Mionsonraí: %S — Ní féidir an tuairiscín seo ar sheirbhís onion a pharsáil, nó theip ar dheimhniú an tsínithe. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil onionServices.introFailed.header=Bhris an suíomh Onion an ceangal onionServices.introFailed=Is dócha go bhfuil an suíomh onion as líne. Téigh i dteagmháil le riarthóir an tsuímh. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=Mionsonraí: %S — Theip ar an tionscnamh, rud a chiallaíonn gur aimsíodh an tuairiscín, ach níl an tseirbhís ceangailte leis an bpointe tionscnaimh a thuilleadh. Is dócha gur athraigh an tseirbhís a tuairiscín, nó nach bhfuil sí ag rith. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.header=Ní féidir ceangal a bhunú leis an suíomh onion +onionServices.rendezvousFailed=Tá an suíomh onion gnóthach, nó tá barraíocht tráchta ar líonra Tor faoi láthair. Bain triail eile as ar ball. +onionServices.rendezvousFailed.longDescription=Mionsonraí: %S — Theip ar an gcliant rendezvous a dhéanamh leis an tseirbhís, rud a chiallaíonn nach raibh an cliant in ann an ceangal a chur i gcrích. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.pageTitle=Údarú de dhíth +onionServices.clientAuthMissing.header=Teastaíonn fíordheimhniú ón suíomh onion +onionServices.clientAuthMissing=Caithfidh tú eochair a sholáthar chun teacht ar an suíomh onion, ach níor sholáthair tú eochair ar bith. +onionServices.clientAuthMissing.longDescription=Mionsonraí: %S — D'íoslódáil an cliant an tuairiscín ar sheirbhís onion, ach ní raibh sé in ann an t-ábhar a dhíchriptiú toisc bhfuil eolas údaraithe cliaint ar iarraidh. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.pageTitle=Theip ar údarú +onionServices.clientAuthIncorrect.header=Theip ar fhíordheimhniú leis an suíomh onion +onionServices.clientAuthIncorrect=Tá an eochair seo mícheart, nó aisghaireadh í. Téigh i dteagmháil le riarthóir an tsuímh onion. +onionServices.clientAuthIncorrect.longDescription=Mionsonraí: %S — D'éirigh leis an gcliant an tuairiscín ar sheirbhís onion a íoslódáil, ach ní raibh sé in ann an t-ábhar a dhíchriptiú leis an eolas údaraithe cliaint a soláthraíodh. Seans go gciallaíonn seo gur aisghaireadh rochtain air. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.header=Seoladh Neamhbhailí Onion +onionServices.badAddress=Tá an seoladh onion seo neamhbhailí. Deimhnigh gur chuir tú isteach i gceart é. +onionServices.badAddress.longDescription=Mionsonraí: %S — Tá an seoladh .onion seo neamhbhailí. Ceann de na rudaí seo ba chúis leis an earráid: ní mheaitseálann suim sheiceála an tseolaidh, tá an eochair phoiblí ed25519 neamhbhailí, nó tá an t-ionchódú neamhbhailí. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.header=Chuaigh cruthú an chiorcaid onion thar am +onionServices.introTimedOut=Níorbh fhéidir ceangal a bhunú leis an suíomh onion, b'fhéidir mar gheall ar dhroch-cheangal líonra. +onionServices.introTimedOut.longDescription=Mionsonraí: %S — Chuaigh an ceangal leis an tseirbhís onion iarrtha thar am agus an ciorcad rendezvous á thógáil. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=Tá %S ag iarraidh ort fíordheimhniú a dhéanamh. onionServices.authPrompt.keyPlaceholder=Cuir isteach d'eochair phríobháideach le haghaidh na seirbhíse onion seo onionServices.authPrompt.done=Déanta onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Cuir isteach eochair bhailí (52 carachtar base32, nó 44 carachtar base64) onionServices.authPrompt.failedToSetKey=Níorbh fhéidir Tor a chumrú le d'eochair onionServices.authPreferences.header=Fíordheimhniú do Sheirbhísí Onion -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.overview=Éilíonn seirbhísí onion áirithe go ndeimhníonn tú d'aitheantas le heochair (saghas focail faire) sular féidir leat iad a úsáid. onionServices.authPreferences.savedKeys=Eochracha Sábháilte... onionServices.authPreferences.dialogTitle=Eochracha Seirbhíse Onion onionServices.authPreferences.dialogIntro=Tá eochracha a bhaineann leis na suímh onion seo stóráilte ar do ríomhaire @@ -130,15 +130,15 @@ onionServices.authPreferences.failedToGetKeys=Níorbh fhéidir eochracha a fhái onionServices.authPreferences.failedToRemoveKey=Níorbh fhéidir an eochair a bhaint # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Tabhair tús áite do Shuímh Onion onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Níl Anois onionLocation.notNowAccessKey=s -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Tá leagan níos príobháidí níos sláine den suíomh seo ar fáil ar líonra Tor trí sheirbhísí onion. Cabhraíonn seirbhísí onion le foilsitheoirí suíomh Gréasáin agus lena gcuid cuairteoirí an faireachas agus an chinsireacht a sheachaint. +onionLocation.tryThis=Bain Triail as Seirbhísí Onion +onionLocation.onionAvailable=.onion ar fáil +onionLocation.learnMore=Tuilleadh eolais... +onionLocation.always=I gcónaí +onionLocation.askEverytime=Fiafraigh díom i gcónaí +onionLocation.prioritizeOnionsDescription=Tabhair tús áite do shuímh onion nuair is féidir. onionLocation.onionServicesTitle=Seirbhísí Onion diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd index 7f9fb329..90c2e8f0 100644 --- a/chrome/locale/he/aboutTor.dtd +++ b/chrome/locale/he/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "שים מסיכה, שים Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "התנגד למגפת המעקב הסמוי."> diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd index 86740e18..9868c504 100644 --- a/chrome/locale/hu/aboutTor.dtd +++ b/chrome/locale/hu/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Támogasson most">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Használjon maszkot, használjon Tor-t."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Álljon ellen a lehallgatási pandémiának."> diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd index 802431f8..27830d1e 100644 --- a/chrome/locale/id/aboutTor.dtd +++ b/chrome/locale/id/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.useamask "Gunakan masker, gunakan Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd index 1d998a5c..435becb6 100644 --- a/chrome/locale/is/aboutTor.dtd +++ b/chrome/locale/is/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Fáðu þér grímu - notaðu Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Verðu þig fyrir eftirlitsfaraldrinum."> diff --git a/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties index 17a37356..00a29f58 100644 --- a/chrome/locale/is/torbutton.properties +++ b/chrome/locale/is/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Dulrituð tenging (Onion-þjónusta, %1$S, %2$S bita dulritunarlyklar, %3$S) pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Heiti onion-svæðis: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Fræðast frekar @@ -72,46 +72,46 @@ onionServices.errorPage.onionSite=Onion-vefsvæði # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=Vandamál við að hlaða inn onion-vef onionServices.descNotFound.header=Onion-vefsvæði fannst ekki -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound=Líklegasta skýringin er að onion-svæðið sé aftengt við netið. Hafðu samband við kerfisstjóra onion-svæðisins. +onionServices.descNotFound.longDescription=Nánar: %S — Umbeðinn lýsistrengur onion-þjónustu fannst ekki í tætigildahringnum og því er þjónustan ekki aðgengileg fyrir biðlaraforritið. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Vandamál við að hlaða inn onion-vef onionServices.descInvalid.header=Ekki tókst að tengjast onion-vefsvæði -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid=Ekki er hægt að tengjast onion-svæðinu vegna innri villu. +onionServices.descInvalid.longDescription=Nánar: %S — Umbeðinn lýsistreng onion-þjónustu er ekki hægt að túlka eða að sannprófun undirritunar mistókst. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Vandamál við að hlaða inn onion-vef onionServices.introFailed.header=Onion-vefsvæði hefur aftengst -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed=Líklegasta skýringin er að onion-svæðið sé aftengt við netið. Hafðu samband við kerfisstjóra onion-svæðisins. +onionServices.introFailed.longDescription=Nánar: %S — Kynning brást, sem þýðir að lýsistrengurinn fannst en þjónustan er ekki lengur tengd við kynningarpunktinn (introduction point). Það er því líklegt að þjónustan hafi breytt lýsistreng sínum eða að hún sé ekki í gangi. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Vandamál við að hlaða inn onion-vef onionServices.rendezvousFailed.header=Tókst ekki að tengjast onion-vef -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed=Onion-svæðið er upptekið eða Tor-netið yfirhlaðið. Reyndu aftur síðar. +onionServices.rendezvousFailed.longDescription=Nánar: %S — Biðlaraforritinu mistókst að framkvæma 'rendezvous'-handaband við þjónustuna, sem þýðir að biðlaranum tókst ekki að ljúka við gerð tengingarinnar. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Auðkenning er nauðsynleg onionServices.clientAuthMissing.header=Onion-vefur krefst auðkenningar -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing=Aðgangur að onion-svæðinu krefst lykilorðs en ekkert var gefið upp. +onionServices.clientAuthMissing.longDescription=Nánar: %S — Biðlaraforritið náði í umbeðinn lýsistreng onion-þjónustu en gat ekki afkóðað efni hans þar sem upplýsingar um auðkenningu biðlarans vantar. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Auðkenning mistókst onionServices.clientAuthIncorrect.header=Auðkenning á onion-vef mistókst -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect=Lykillinn sem þú gafst upp er rangur eða hefur verið afturkallaður. Hafðu samband við kerfisstjóra onion-svæðisins. +onionServices.clientAuthIncorrect.longDescription=Nánar: %S — Biðlaraforritið gat náð í umbeðinn lýsistreng onion-þjónustu en gat ekki afkóðað efni hans með uppgefnum upplýsingum um auðkenningu biðlarans. Þetta gæti þýtt að aðgangsheimildir hafi verið afturkallaðar. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Vandamál við að hlaða inn onion-vef onionServices.badAddress.header=Ógilt vistfang onion-vefsvæðis -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress=Uppgefið vistfang onion-svæðisins er ógilt. Gakktu úr skugga um að þú hafir sett það rétt inn. +onionServices.badAddress.longDescription=Nánar: %S — Uppgefið .onion vistfang vefsvæðisins er ógilt. Þessi villa kemur upp vegna einnar af eftirfarandi ástæðum: gátsumma vistfangsins samsvarar ekki, dreifilykillinn ed25519 er ógildur eða að dulkóðunin er ógild. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Vandamál við að hlaða inn onion-vef -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.header=Gerð rásar fyrir onion-svæði féll á tíma +onionServices.introTimedOut=Mistókst að tengjast onion-svæðinu, mögulega vegna lélegrar nettengingar. +onionServices.introTimedOut.longDescription=Nánar: %S — Tengingin við umbeðna onion-þjónustu féll á tímamörkum á meðan reynt var að útbúa rendezvous-rásina. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S krefst þess að þú auðkennir þig. onionServices.authPrompt.keyPlaceholder=Settu inn einkalykilinn þinn fyrir þessa onion-þjónustu onionServices.authPrompt.done=Lokið onionServices.authPrompt.doneAccessKey=d @@ -134,7 +134,7 @@ onionLocation.alwaysPrioritize=Alltaf gefa onion-vefjum forgang onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Ekki núna onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.description=Þar er til önnur og öruggari útgáfa af þessu vefsvæði sem aðgengileg er á Tor-netinu í gegnum onion-þjónustur. Onion-þjónustur nýtast þeim sem gefa út vefsíður, jafnt sem þeim sem þær skoða, að komast framhjá ritskoðun og eftirliti. onionLocation.tryThis=Prófaðu onion-þjónustur onionLocation.onionAvailable=.onion er tiltækt onionLocation.learnMore=Fræðast frekar… diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd index 4fecbcda..65fb7f49 100644 --- a/chrome/locale/it/aboutTor.dtd +++ b/chrome/locale/it/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Usa una maschera, usa Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resisti alla pandemia di sorveglianza."> diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd index bc1784dc..f1293ba7 100644 --- a/chrome/locale/ja/aboutTor.dtd +++ b/chrome/locale/ja/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "マスクを使い、Tor も使おう。"> +<!ENTITY aboutTor.ey2020.resistsurveillance "監視パンデミックに対抗しよう。"> diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd index 13017c43..91923279 100644 --- a/chrome/locale/ka/aboutTor.dtd +++ b/chrome/locale/ka/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "გაიკეთეთ ნიღაბი, გამოიყენეთ Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "დაიცავით თავი, მეთვალყურეობის პანდემიისგან."> diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd index 5599d9ee..392643e3 100644 --- a/chrome/locale/ko/aboutTor.dtd +++ b/chrome/locale/ko/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "기부하기">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "마스크를 쓰고, Tor도 쓰세요."> +<!ENTITY aboutTor.ey2020.resistsurveillance "감시의 대유행에 맞서세요."> diff --git a/chrome/locale/ko/torbutton.dtd b/chrome/locale/ko/torbutton.dtd index 8df93287..8190d4d3 100644 --- a/chrome/locale/ko/torbutton.dtd +++ b/chrome/locale/ko/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Onion 서비스 클라이언트 인증 프롬프트 열기"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "이 키 기억"> diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd index 87ae4703..66e29b42 100644 --- a/chrome/locale/lt/aboutTor.dtd +++ b/chrome/locale/lt/aboutTor.dtd @@ -9,7 +9,7 @@ <!ENTITY aboutTor.viewChangelog.label "Rodyti keitinių žurnalą"> <!ENTITY aboutTor.ready.label "Naršykite. Privačiai."> -<!ENTITY aboutTor.ready2.label "Jūs esate pasiruošę privačiausiam naršymo patyrimui pasaulyje."> +<!ENTITY aboutTor.ready2.label "Jūs esate pasiruošę privačiausiam pasaulyje naršymo potyriui."> <!ENTITY aboutTor.failure.label "Kažkas nutiko!"> <!ENTITY aboutTor.failure2.label "Šioje naršyklėje Tor neveikia."> @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Paaukokite dabar">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Dėvėkite kaukę, naudokite Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Pasipriešinkite sekimo pandemijai."> diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd index b8cf4fad..67a47e79 100644 --- a/chrome/locale/mk/aboutTor.dtd +++ b/chrome/locale/mk/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Донирај сега">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Користи маска, користи Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Спротистави се на надзорот за време на пандемијата."> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index 6c881957..b191f724 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Doneer nu">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Gebruik een masker, gebruik Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Weersta de surveillancepandemie."> diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd index b5719a5b..da82b8b6 100644 --- a/chrome/locale/pl/aboutTor.dtd +++ b/chrome/locale/pl/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Użyj maski, użyj Tora."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Przeciwstaw się pandemii nadzoru."> diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd index 0f69f353..9012589f 100644 --- a/chrome/locale/pt-BR/aboutTor.dtd +++ b/chrome/locale/pt-BR/aboutTor.dtd @@ -28,9 +28,9 @@ <!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor é livre para usar por causa de doações de pessoas como você."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor é gratuito por causa das doações de pessoas como você."> <!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Use uma máscara, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resista à pandemia de vigilância."> diff --git a/chrome/locale/pt-BR/torbutton.properties b/chrome/locale/pt-BR/torbutton.properties index 289409bb..d2378e7f 100644 --- a/chrome/locale/pt-BR/torbutton.properties +++ b/chrome/locale/pt-BR/torbutton.properties @@ -40,7 +40,7 @@ canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, canvas.notNow=Por enquanto, não canvas.notNowAccessKey=N canvas.allow=Permitir -canvas.allowAccessKey=Um +canvas.allowAccessKey=A canvas.never=Nunca a este site (recomendado) canvas.neverAccessKey=e diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd index 8a0c22e6..b3149592 100644 --- a/chrome/locale/ro/aboutTor.dtd +++ b/chrome/locale/ro/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Donează Acum">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Folosește o mască, folosește Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Rezistă pandemiei de supraveghere."> diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index cb9c846f..01b9ae0e 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=Se descarcă actualizarea %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexiune Criptată (Serviciu Onion, %1$S, cheie pe %2$S biți, %3$S) pageInfo_OnionEncryption=Conexiune Criptată (Serviciu Onion) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Nume Onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Află mai mult @@ -111,7 +111,7 @@ onionServices.introTimedOut=Eroare la conectarea la Oniosite, posibil din cauza onionServices.introTimedOut.longDescription=Detalii: %S — Conexiunea la serviciul Onion solicitat a expirat în timp ce încercați să construiți circuitul de întâlnire. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S vă cere să vă autentificați. onionServices.authPrompt.keyPlaceholder=Introduceți cheia privată pentru acest serviciu de ceapă onionServices.authPrompt.done=Gata onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/ru/aboutDialog.dtd b/chrome/locale/ru/aboutDialog.dtd index 2952ccc4..88a9978b 100644 --- a/chrome/locale/ru/aboutDialog.dtd +++ b/chrome/locale/ru/aboutDialog.dtd @@ -1,9 +1,9 @@ -<!ENTITY project.start "Разработано &brandShortName;"> +<!ENTITY project.start "&brandShortName; разработан">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", некоммерческий проект для защиты приватности и других свобод в сети."> +<!ENTITY project.end ", некоммерческим проектом для защиты приватности и других свобод в сети."> -<!ENTITY help.start "Желаете помочь?"> +<!ENTITY help.start "Хотите помочь?">  <!ENTITY help.donateLink "Пожертвуйте"> <!ENTITY help.or "или"> @@ -16,4 +16,4 @@ <!ENTITY bottomLinks.grow "Помогите сети Tor стать больше!">  <!ENTITY bottomLinks.license "Информация о лицензии"> -<!ENTITY tor.TrademarkStatement "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "'Tor' и логотип 'Onion' – зарегистрированные торговые марки Tor Project, Inc."> diff --git a/chrome/locale/ru/aboutTBUpdate.dtd b/chrome/locale/ru/aboutTBUpdate.dtd index fd37ca47..9dd5b03c 100644 --- a/chrome/locale/ru/aboutTBUpdate.dtd +++ b/chrome/locale/ru/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ <!ENTITY aboutTBUpdate.changelogTitle "Журнал изменений Tor Browser"> <!ENTITY aboutTBUpdate.updated "Tor Browser обновлен."> -<!ENTITY aboutTBUpdate.linkPrefix "Самая свежая информация об этой версии — "> +<!ENTITY aboutTBUpdate.linkPrefix "Самая свежая информация об этой версии – "> <!ENTITY aboutTBUpdate.linkLabel "на нашем сайте"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Версия"> -<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseDate "Дата выхода"> <!ENTITY aboutTBUpdate.releaseNotes "Примечания к выпуску"> diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd index 0a9259e1..4986b82e 100644 --- a/chrome/locale/ru/aboutTor.dtd +++ b/chrome/locale/ru/aboutTor.dtd @@ -9,7 +9,7 @@ <!ENTITY aboutTor.viewChangelog.label "Список изменений"> <!ENTITY aboutTor.ready.label "Исследуйте. Приватно."> -<!ENTITY aboutTor.ready2.label "Вы готовы к самому приватному просмотру веб-страниц в мире."> +<!ENTITY aboutTor.ready2.label "Вы готовы к самому приватному интернет-серфингу в мире."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> @@ -17,19 +17,19 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Вопросы?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Ознакомьтесь с руководством Тоr Browser »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Предлагаем руководство по Тоr Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "М"> <!ENTITY aboutTor.torbrowser_user_manual.label "Руководство по Tor Browser"> -<!ENTITY aboutTor.tor_mission.label "Проект Tor является некоммерческой организацией США со статусом 501(c)(3), продвигающей права человека и свободы путем создания и развертывания технологий анонимности и конфиденциальности с открытым исходным кодом, поддержки их неограниченной доступности и использования, а также содействия их научному и популярному пониманию."> +<!ENTITY aboutTor.tor_mission.label "Tor Project – некоммерческая организация, зарегистрированная в США со статусом 501(c)(3). Tor Project продвигает права и свободы человека – создает и распространяет технологии для обеспечения анонимности и приватности с открытым исходным кодом, поддерживает их неограниченную доступность, содействует их научному и популярному пониманию."> <!ENTITY aboutTor.getInvolved.label "Присоединяйтесь »"> -<!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> -<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor"> +<!ENTITY aboutTor.newsletter.tagline "Получайте свежие новости от Tor по email."> +<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor бесплатен благодаря пожертвованиям таких людей, как вы."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Используйте Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Не поддавайтесь пандемии слежки."> diff --git a/chrome/locale/ru/brand.dtd b/chrome/locale/ru/brand.dtd index 6efb39e2..7a6225ae 100644 --- a/chrome/locale/ru/brand.dtd +++ b/chrome/locale/ru/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc."> +<!ENTITY trademarkInfo.part1 "'Tor' и логотип 'Onion' – зарегистрированные торговые марки Tor Project, Inc.">  @@ -15,5 +15,5 @@  <!ENTITY plugins.installed.find "Нажмите для загрузки установленных системных плагинов"> <!ENTITY plugins.installed.enable "Включить плагины"> -<!ENTITY plugins.installed.disable "Выключить плагины"> +<!ENTITY plugins.installed.disable "Отключить плагины"> <!ENTITY plugins.installed.disable.tip "Нажмите для предотвращения загрузки системых плагинов"> diff --git a/chrome/locale/ru/brand.properties b/chrome/locale/ru/brand.properties index d5727f42..3d2e3510 100644 --- a/chrome/locale/ru/brand.properties +++ b/chrome/locale/ru/brand.properties @@ -11,10 +11,10 @@ brandFullName=Tor Browser brandProductName=Tor Browser vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start - домашняя страничка со встроенным поиском -homePageImport=Импорт вашей домашней страницы из %S +homePageSingleStartMain=Стартовая страница Firefox со встроенным поиском +homePageImport=Импорт домашней страницы из %S homePageMigrationPageTitle=Выбор домашней страницы -homePageMigrationDescription=Выберите домашнюю страницу +homePageMigrationDescription=Пожалуйста, выберите домашнюю страницу: syncBrandShortName=Синхронизация diff --git a/chrome/locale/ru/branding/brand.ftl b/chrome/locale/ru/branding/brand.ftl index c712a1b7..f081a2ca 100644 --- a/chrome/locale/ru/branding/brand.ftl +++ b/chrome/locale/ru/branding/brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor Project -trademarkInfo = 'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc. +trademarkInfo = 'Tor' и логотип 'Onion' – зарегистрированные торговые марки Tor Project, Inc. diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd index 276bc39a..08879d2c 100644 --- a/chrome/locale/ru/torbutton.dtd +++ b/chrome/locale/ru/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Новая цепочка для этого сайта">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Открыть запрос аутентификации клиента onion-сервиса"> <!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Запомнить этот ключ"> diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index 950faec4..51169997 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Неизвестная страна torbutton.circuit_display.guard = Сторожевой torbutton.circuit_display.guard_note = Ваш [сторожевой] узел не может быть изменен. torbutton.circuit_display.learn_more = Узнать больше -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Нажмите для копирования +torbutton.circuit_display.copied = Скопировано! torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, что усложняет возможность отследить вас в интернете. torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor @@ -60,69 +60,69 @@ updateDownloadingPanelUILabel=Загружается обновление: %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Соединение зашифровано (Onion Service, %1$S, %2$S битные ключи, %3$S) pageInfo_OnionEncryption=Соединение зашифровано (Onion Service) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Имя onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Узнать больше onionServices.errorPage.browser=Браузер onionServices.errorPage.network=Сеть -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Onion-сайт # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.pageTitle=Ошибка загрузки onion-сайта +onionServices.descNotFound.header=Onion-сайт не найден +onionServices.descNotFound=Наиболее вероятная причина – onion-сайт отключен. Свяжитесь с его администратором. +onionServices.descNotFound.longDescription=Подробности: %S – запрошенный дескриптор onion-сервиса не найден в хэше. Сервис недоступен для клиента. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.pageTitle=Ошибка загрузки onion-сайта +onionServices.descInvalid.header=Ошибка доступа к onion-сайту +onionServices.descInvalid=Onion-сайт недоступен из-за внутренней ошибки. +onionServices.descInvalid.longDescription=Подробности: %S – запрошенный дескриптор onion-сайта не может быть обработан, либо произошла ошибка проверки подписи. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.pageTitle=Ошибка загрузки onion-сайта +onionServices.introFailed.header=Разрыв соединения с onion-сайтом +onionServices.introFailed=Наиболее вероятная причина – onion-сайт отключен. Свяжитесь с его администратором. +onionServices.introFailed.longDescription=Подробности: %S – ошибка знакомства. Это значит, что дескриптор обнаружен, но сервис более не подключен к точке знакомства. Вероятная причина: сервис изменил свой дескриптор или вообще не работает. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.pageTitle=Ошибка загрузки onion-сайта +onionServices.rendezvousFailed.header=Ошибка подключения к onion-сайту +onionServices.rendezvousFailed=Onion-сайт занят, или сеть Tor перегружена. Попробуйте позже. +onionServices.rendezvousFailed.longDescription=Подробности: %S – клиенту не удалось установить связь с сервисом. Клиент не сумел завершить подключение. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.pageTitle=Требуется авторизация +onionServices.clientAuthMissing.header=Onion-сайт потребовал авторизоваться +onionServices.clientAuthMissing=Для доступа к onion-сайту нужен ключ, но его нет. +onionServices.clientAuthMissing.longDescription=Подробности: %S – клиент скачал затребованный дескриптор onion-сервиса, но не смог расшифровать его содержание из-за отсутствия авторизационных данных клиента. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.pageTitle=Ошибка авторизации +onionServices.clientAuthIncorrect.header=Ошибка аутентификации на onion-сайте +onionServices.clientAuthIncorrect=Предложенный ключ неверен или был отозван. Свяжитесь с администратором onion-сайта. +onionServices.clientAuthIncorrect.longDescription=Детали: %S – Клиент смог скачать требуемый дескриптор onion-сервиса, но не сумел расшифровать его содержание с помощью предоставленной клиентом авторизационной информации. Возможная причина – ключ был отозван. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.pageTitle=Ошибка загрузки onion-сайта +onionServices.badAddress.header=Ошибка адреса onion-сайта +onionServices.badAddress=Указанный адрес onion-сайта неверен. Пожалуйста, убедитесь, что правильно ввели данные. +onionServices.badAddress.longDescription=Подробности: %S – Неверный адрес onion-сайта. Такая ошибка появляется при проблеме с контрольной суммой адреса, неверном открытом ключе ed25519 или неправильной кодировке. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.pageTitle=Ошибка загрузки onion-сайта +onionServices.introTimedOut.header=Таймаут создания схемы onion-сайта +onionServices.introTimedOut=Не удалось установить связь с onion-сайтом, возможно, из-за плохого соединения. +onionServices.introTimedOut.longDescription=Подробности: %S – Время соединения с запрошенным onion-сервисом истекло. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.description2=%S требует аутентификации. +onionServices.authPrompt.keyPlaceholder=Укажите свой секретный ключ для этого onion-сервиса onionServices.authPrompt.done=Готово onionServices.authPrompt.doneAccessKey=Д onionServices.authPrompt.invalidKey=Пожалуйста, введите правильный ключ (52 символа base32 или 44 символа base64) onionServices.authPrompt.failedToSetKey=Не удается настроить Tor с вашим ключом -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.header=Аутентификация onion-сервисов +onionServices.authPreferences.overview=Некоторые onion-сервисы для доступа требуют, чтобы вы идентифицировали себя с помощью ключа (типа пароля). onionServices.authPreferences.savedKeys=Сохранённые ключи… -onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogTitle=Ключи onion-сервисов onionServices.authPreferences.dialogIntro=Ключи для следующих onion-сайтов хранятся на вашем компьютере -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionSite=Onion-сайт onionServices.authPreferences.onionKey=Ключ onionServices.authPreferences.remove=Удалить onionServices.authPreferences.removeAll=Удалить все @@ -130,15 +130,15 @@ onionServices.authPreferences.failedToGetKeys=Невозможно получи onionServices.authPreferences.failedToRemoveKey=Невозможно удалить ключ # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Onion-ресурсы всегда в приоритете onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Не сейчас onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.description=Есть более приватная и безопасная версия этого сайта. Это onion-версия, которую можно просматривать в сети Tor. Onion-сервисы помогают владельцам сайтов и посетителям избегать слежки и цензуры. +onionLocation.tryThis=Попробуйте onion-сервисы +onionLocation.onionAvailable=.onion доступно +onionLocation.learnMore=Узнать больше... onionLocation.always=Всегда -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.askEverytime=Спрашивайте в любое время +onionLocation.prioritizeOnionsDescription=Onion-сайты в приоритете (по возможности). onionLocation.onionServicesTitle=Onion-ресурсы diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd index 54bd5eb5..f2921c11 100644 --- a/chrome/locale/sv-SE/aboutTor.dtd +++ b/chrome/locale/sv-SE/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Donera nu">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Använd en mask, använd Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Stå emot övervakningspandemin."> diff --git a/chrome/locale/sv-SE/brand.dtd b/chrome/locale/sv-SE/brand.dtd index 24e8695e..7284a534 100644 --- a/chrome/locale/sv-SE/brand.dtd +++ b/chrome/locale/sv-SE/brand.dtd @@ -13,7 +13,7 @@ <!ENTITY brandProductName "Tor Browser">  -<!ENTITY plugins.installed.find "Klicka här för att ladda installerade systemtillägg."> +<!ENTITY plugins.installed.find "Klicka här för att läsa in installerade systemtillägg."> <!ENTITY plugins.installed.enable "Tillåt tillägg"> <!ENTITY plugins.installed.disable "Stäng av tillägg."> <!ENTITY plugins.installed.disable.tip "Klicka för att förhindra laddningen av systemtillägg."> diff --git a/chrome/locale/sv-SE/torbutton.properties b/chrome/locale/sv-SE/torbutton.properties index 09ceeae8..8ad3affd 100644 --- a/chrome/locale/sv-SE/torbutton.properties +++ b/chrome/locale/sv-SE/torbutton.properties @@ -16,7 +16,7 @@ torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor torbutton.panel.label.disabled = Tor inaktiv torbutton.panel.label.enabled = Tor aktiv extensions.torbutton(a)torproject.org.description = Torbutton ger en knapp för att konfigurera Tor inställningar och snabbt och enkelt rensa privat surfdata. -torbutton.popup.external.title = Ladda ned en extern filtyp? +torbutton.popup.external.title = Hämta en extern filtyp? torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behöver öppna den i ett annat program.\n\n torbutton.popup.external.note = Vissa typer av filer kan få program att ansluta till internet utan att använda Tor.\n\n torbutton.popup.external.suggest = Det är säkrast att öppna filer du har hämtat hem bara när du är offline, eller så kan du använda en Tor Live CD som till exempel Tails.\n diff --git a/chrome/locale/th/aboutTor.dtd b/chrome/locale/th/aboutTor.dtd index 5f5f950c..0946f46d 100644 --- a/chrome/locale/th/aboutTor.dtd +++ b/chrome/locale/th/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "ร่วมบริจาค">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "ใช้หน้ากาก ใช้ Tor"> +<!ENTITY aboutTor.ey2020.resistsurveillance "ต้านเชื้อสอดแนมระบาด"> diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd index cc24c2b6..cb28a8c1 100644 --- a/chrome/locale/tr/aboutTor.dtd +++ b/chrome/locale/tr/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Maske kullanın, Tor kullanın."> +<!ENTITY aboutTor.ey2020.resistsurveillance "İzleme salgınından korunun."> diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd index ebf65463..30607b19 100644 --- a/chrome/locale/vi/aboutTor.dtd +++ b/chrome/locale/vi/aboutTor.dtd @@ -27,9 +27,9 @@ <!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor miễn phí là nhờ sự ủng hộ của những người như bạn."> <!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "Hãy dùng khẩu trang, hãy dùng Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Cùng nhau chống đại dịch giám sát."> diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd index cb786cd9..329f2995 100644 --- a/chrome/locale/zh-CN/aboutTor.dtd +++ b/chrome/locale/zh-CN/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "立即捐助">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "口罩防病毒，Tor防监控。"> +<!ENTITY aboutTor.ey2020.resistsurveillance "抗击“监控”全球流行病。"> diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index c2166c19..17ea5d2f 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=正下载 %S 更新 # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=连接已经被加密（洋葱服务，%1$S，%2$S 位密钥，%3$S） pageInfo_OnionEncryption=连接已经被加密（洋葱服务） -pageInfo_OnionName=洋葱名字： +pageInfo_OnionName=洋葱名称： # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=更多详情 @@ -103,7 +103,7 @@ onionServices.clientAuthIncorrect.longDescription=详情：%S — 客户端能 onionServices.badAddress.pageTitle=洋葱站点加载问题 onionServices.badAddress.header=无效洋葱站点地址 onionServices.badAddress=提供的洋葱站点地址无效。请检查是否正确输入。 -onionServices.badAddress.longDescription=详情：%S — 提供的.onion地址失效了。返回该错误，是由于以下原因之一：地址的校验和不匹配、ed25519公钥失效，或编码无效。 +onionServices.badAddress.longDescription=详情：%S — 提供的 .onion 地址失效了。返回该错误，是由于以下原因之一：地址的校验和不匹配、ed25519 公钥失效，或编码无效。 # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=洋葱站点加载问题 onionServices.introTimedOut.header=洋葱站点链路创建超时 @@ -130,7 +130,7 @@ onionServices.authPreferences.failedToGetKeys=无法从 Tor 获得密钥 onionServices.authPreferences.failedToRemoveKey=无法移除密钥 # Onion-Location strings. -onionLocation.alwaysPrioritize=始终优先洋葱 +onionLocation.alwaysPrioritize=始终优先洋葱服务 onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=暂不 onionLocation.notNowAccessKey=n @@ -140,5 +140,5 @@ onionLocation.onionAvailable=可用的 .onion onionLocation.learnMore=详细了解…… onionLocation.always=始终 onionLocation.askEverytime=每次询问 -onionLocation.prioritizeOnionsDescription=请优先使用 .onion站点。 +onionLocation.prioritizeOnionsDescription=请优先使用 .onion 站点。 onionLocation.onionServicesTitle=洋葱服务 diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd index 8f9cd989..2b7abb5e 100644 --- a/chrome/locale/zh-TW/aboutTor.dtd +++ b/chrome/locale/zh-TW/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">  -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.useamask "口罩維持身體健康，Tor 保護網路安全。"> +<!ENTITY aboutTor.ey2020.resistsurveillance "抵制全面監控。">

1 0

[torbutton/master] Bug 40011: rename tor-browser-brand.ftl to brand.ftl
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit becf9537f653105e57222652627ec3c73553d150 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jun 18 14:05:52 2020 +0200 Bug 40011: rename tor-browser-brand.ftl to brand.ftl --- chrome/locale/af/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ak/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/am/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ar/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/arn/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ast/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/az/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/be/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/bg/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/bn-BD/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/bn-IN/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/bn/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/bo/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/br/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/bs/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ca/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/cs/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/csb/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/cy/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/da/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/de/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/dz/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/el/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/en-US/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/eo/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/es-AR/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/es-ES/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/et/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/eu/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fa/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fi/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fil/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fo/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fr/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fur/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/fy/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ga-IE/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/gl/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/gu/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/gun/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ha/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/he/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/hi/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/hr/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ht/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/hu/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/hy/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/id/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/is/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/it/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ja/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/jv/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ka/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/km/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/kn/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ko/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ku/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/kw/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ky/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/lb/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ln/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/lo/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/lt/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/lv/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/mg/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/mi/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/mk/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ml/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/mn/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/mr/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ms/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/mt/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/my/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/nah/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/nap/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/nb-NO/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ne/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/nl/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/nn/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/nso/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/oc/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/or/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/pa/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/pap/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/pl/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/pms/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ps/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/pt-BR/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/pt/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ro/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ru/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sco/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sk/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sl/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/so/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/son/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sq/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sr/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/st/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/su/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sv-SE/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/sw/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ta/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/te/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/tg/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/th/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ti/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/tk/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/tr/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/uk/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ur/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/ve/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/vi/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/wa/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/wo/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/zh-CN/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/zh-HK/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/zh-TW/branding/{tor-browser-brand.ftl => brand.ftl} | 0 chrome/locale/zu/branding/{tor-browser-brand.ftl => brand.ftl} | 0 import-translations.sh | 6 +++--- 120 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/locale/af/branding/tor-browser-brand.ftl b/chrome/locale/af/branding/brand.ftl similarity index 100% rename from chrome/locale/af/branding/tor-browser-brand.ftl rename to chrome/locale/af/branding/brand.ftl diff --git a/chrome/locale/ak/branding/tor-browser-brand.ftl b/chrome/locale/ak/branding/brand.ftl similarity index 100% rename from chrome/locale/ak/branding/tor-browser-brand.ftl rename to chrome/locale/ak/branding/brand.ftl diff --git a/chrome/locale/am/branding/tor-browser-brand.ftl b/chrome/locale/am/branding/brand.ftl similarity index 100% rename from chrome/locale/am/branding/tor-browser-brand.ftl rename to chrome/locale/am/branding/brand.ftl diff --git a/chrome/locale/ar/branding/tor-browser-brand.ftl b/chrome/locale/ar/branding/brand.ftl similarity index 100% rename from chrome/locale/ar/branding/tor-browser-brand.ftl rename to chrome/locale/ar/branding/brand.ftl diff --git a/chrome/locale/arn/branding/tor-browser-brand.ftl b/chrome/locale/arn/branding/brand.ftl similarity index 100% rename from chrome/locale/arn/branding/tor-browser-brand.ftl rename to chrome/locale/arn/branding/brand.ftl diff --git a/chrome/locale/ast/branding/tor-browser-brand.ftl b/chrome/locale/ast/branding/brand.ftl similarity index 100% rename from chrome/locale/ast/branding/tor-browser-brand.ftl rename to chrome/locale/ast/branding/brand.ftl diff --git a/chrome/locale/az/branding/tor-browser-brand.ftl b/chrome/locale/az/branding/brand.ftl similarity index 100% rename from chrome/locale/az/branding/tor-browser-brand.ftl rename to chrome/locale/az/branding/brand.ftl diff --git a/chrome/locale/be/branding/tor-browser-brand.ftl b/chrome/locale/be/branding/brand.ftl similarity index 100% rename from chrome/locale/be/branding/tor-browser-brand.ftl rename to chrome/locale/be/branding/brand.ftl diff --git a/chrome/locale/bg/branding/tor-browser-brand.ftl b/chrome/locale/bg/branding/brand.ftl similarity index 100% rename from chrome/locale/bg/branding/tor-browser-brand.ftl rename to chrome/locale/bg/branding/brand.ftl diff --git a/chrome/locale/bn-BD/branding/tor-browser-brand.ftl b/chrome/locale/bn-BD/branding/brand.ftl similarity index 100% rename from chrome/locale/bn-BD/branding/tor-browser-brand.ftl rename to chrome/locale/bn-BD/branding/brand.ftl diff --git a/chrome/locale/bn-IN/branding/tor-browser-brand.ftl b/chrome/locale/bn-IN/branding/brand.ftl similarity index 100% rename from chrome/locale/bn-IN/branding/tor-browser-brand.ftl rename to chrome/locale/bn-IN/branding/brand.ftl diff --git a/chrome/locale/bn/branding/tor-browser-brand.ftl b/chrome/locale/bn/branding/brand.ftl similarity index 100% rename from chrome/locale/bn/branding/tor-browser-brand.ftl rename to chrome/locale/bn/branding/brand.ftl diff --git a/chrome/locale/bo/branding/tor-browser-brand.ftl b/chrome/locale/bo/branding/brand.ftl similarity index 100% rename from chrome/locale/bo/branding/tor-browser-brand.ftl rename to chrome/locale/bo/branding/brand.ftl diff --git a/chrome/locale/br/branding/tor-browser-brand.ftl b/chrome/locale/br/branding/brand.ftl similarity index 100% rename from chrome/locale/br/branding/tor-browser-brand.ftl rename to chrome/locale/br/branding/brand.ftl diff --git a/chrome/locale/bs/branding/tor-browser-brand.ftl b/chrome/locale/bs/branding/brand.ftl similarity index 100% rename from chrome/locale/bs/branding/tor-browser-brand.ftl rename to chrome/locale/bs/branding/brand.ftl diff --git a/chrome/locale/ca/branding/tor-browser-brand.ftl b/chrome/locale/ca/branding/brand.ftl similarity index 100% rename from chrome/locale/ca/branding/tor-browser-brand.ftl rename to chrome/locale/ca/branding/brand.ftl diff --git a/chrome/locale/cs/branding/tor-browser-brand.ftl b/chrome/locale/cs/branding/brand.ftl similarity index 100% rename from chrome/locale/cs/branding/tor-browser-brand.ftl rename to chrome/locale/cs/branding/brand.ftl diff --git a/chrome/locale/csb/branding/tor-browser-brand.ftl b/chrome/locale/csb/branding/brand.ftl similarity index 100% rename from chrome/locale/csb/branding/tor-browser-brand.ftl rename to chrome/locale/csb/branding/brand.ftl diff --git a/chrome/locale/cy/branding/tor-browser-brand.ftl b/chrome/locale/cy/branding/brand.ftl similarity index 100% rename from chrome/locale/cy/branding/tor-browser-brand.ftl rename to chrome/locale/cy/branding/brand.ftl diff --git a/chrome/locale/da/branding/tor-browser-brand.ftl b/chrome/locale/da/branding/brand.ftl similarity index 100% rename from chrome/locale/da/branding/tor-browser-brand.ftl rename to chrome/locale/da/branding/brand.ftl diff --git a/chrome/locale/de/branding/tor-browser-brand.ftl b/chrome/locale/de/branding/brand.ftl similarity index 100% rename from chrome/locale/de/branding/tor-browser-brand.ftl rename to chrome/locale/de/branding/brand.ftl diff --git a/chrome/locale/dz/branding/tor-browser-brand.ftl b/chrome/locale/dz/branding/brand.ftl similarity index 100% rename from chrome/locale/dz/branding/tor-browser-brand.ftl rename to chrome/locale/dz/branding/brand.ftl diff --git a/chrome/locale/el/branding/tor-browser-brand.ftl b/chrome/locale/el/branding/brand.ftl similarity index 100% rename from chrome/locale/el/branding/tor-browser-brand.ftl rename to chrome/locale/el/branding/brand.ftl diff --git a/chrome/locale/en-US/branding/tor-browser-brand.ftl b/chrome/locale/en-US/branding/brand.ftl similarity index 100% rename from chrome/locale/en-US/branding/tor-browser-brand.ftl rename to chrome/locale/en-US/branding/brand.ftl diff --git a/chrome/locale/eo/branding/tor-browser-brand.ftl b/chrome/locale/eo/branding/brand.ftl similarity index 100% rename from chrome/locale/eo/branding/tor-browser-brand.ftl rename to chrome/locale/eo/branding/brand.ftl diff --git a/chrome/locale/es-AR/branding/tor-browser-brand.ftl b/chrome/locale/es-AR/branding/brand.ftl similarity index 100% rename from chrome/locale/es-AR/branding/tor-browser-brand.ftl rename to chrome/locale/es-AR/branding/brand.ftl diff --git a/chrome/locale/es-ES/branding/tor-browser-brand.ftl b/chrome/locale/es-ES/branding/brand.ftl similarity index 100% rename from chrome/locale/es-ES/branding/tor-browser-brand.ftl rename to chrome/locale/es-ES/branding/brand.ftl diff --git a/chrome/locale/et/branding/tor-browser-brand.ftl b/chrome/locale/et/branding/brand.ftl similarity index 100% rename from chrome/locale/et/branding/tor-browser-brand.ftl rename to chrome/locale/et/branding/brand.ftl diff --git a/chrome/locale/eu/branding/tor-browser-brand.ftl b/chrome/locale/eu/branding/brand.ftl similarity index 100% rename from chrome/locale/eu/branding/tor-browser-brand.ftl rename to chrome/locale/eu/branding/brand.ftl diff --git a/chrome/locale/fa/branding/tor-browser-brand.ftl b/chrome/locale/fa/branding/brand.ftl similarity index 100% rename from chrome/locale/fa/branding/tor-browser-brand.ftl rename to chrome/locale/fa/branding/brand.ftl diff --git a/chrome/locale/fi/branding/tor-browser-brand.ftl b/chrome/locale/fi/branding/brand.ftl similarity index 100% rename from chrome/locale/fi/branding/tor-browser-brand.ftl rename to chrome/locale/fi/branding/brand.ftl diff --git a/chrome/locale/fil/branding/tor-browser-brand.ftl b/chrome/locale/fil/branding/brand.ftl similarity index 100% rename from chrome/locale/fil/branding/tor-browser-brand.ftl rename to chrome/locale/fil/branding/brand.ftl diff --git a/chrome/locale/fo/branding/tor-browser-brand.ftl b/chrome/locale/fo/branding/brand.ftl similarity index 100% rename from chrome/locale/fo/branding/tor-browser-brand.ftl rename to chrome/locale/fo/branding/brand.ftl diff --git a/chrome/locale/fr/branding/tor-browser-brand.ftl b/chrome/locale/fr/branding/brand.ftl similarity index 100% rename from chrome/locale/fr/branding/tor-browser-brand.ftl rename to chrome/locale/fr/branding/brand.ftl diff --git a/chrome/locale/fur/branding/tor-browser-brand.ftl b/chrome/locale/fur/branding/brand.ftl similarity index 100% rename from chrome/locale/fur/branding/tor-browser-brand.ftl rename to chrome/locale/fur/branding/brand.ftl diff --git a/chrome/locale/fy/branding/tor-browser-brand.ftl b/chrome/locale/fy/branding/brand.ftl similarity index 100% rename from chrome/locale/fy/branding/tor-browser-brand.ftl rename to chrome/locale/fy/branding/brand.ftl diff --git a/chrome/locale/ga-IE/branding/tor-browser-brand.ftl b/chrome/locale/ga-IE/branding/brand.ftl similarity index 100% rename from chrome/locale/ga-IE/branding/tor-browser-brand.ftl rename to chrome/locale/ga-IE/branding/brand.ftl diff --git a/chrome/locale/gl/branding/tor-browser-brand.ftl b/chrome/locale/gl/branding/brand.ftl similarity index 100% rename from chrome/locale/gl/branding/tor-browser-brand.ftl rename to chrome/locale/gl/branding/brand.ftl diff --git a/chrome/locale/gu/branding/tor-browser-brand.ftl b/chrome/locale/gu/branding/brand.ftl similarity index 100% rename from chrome/locale/gu/branding/tor-browser-brand.ftl rename to chrome/locale/gu/branding/brand.ftl diff --git a/chrome/locale/gun/branding/tor-browser-brand.ftl b/chrome/locale/gun/branding/brand.ftl similarity index 100% rename from chrome/locale/gun/branding/tor-browser-brand.ftl rename to chrome/locale/gun/branding/brand.ftl diff --git a/chrome/locale/ha/branding/tor-browser-brand.ftl b/chrome/locale/ha/branding/brand.ftl similarity index 100% rename from chrome/locale/ha/branding/tor-browser-brand.ftl rename to chrome/locale/ha/branding/brand.ftl diff --git a/chrome/locale/he/branding/tor-browser-brand.ftl b/chrome/locale/he/branding/brand.ftl similarity index 100% rename from chrome/locale/he/branding/tor-browser-brand.ftl rename to chrome/locale/he/branding/brand.ftl diff --git a/chrome/locale/hi/branding/tor-browser-brand.ftl b/chrome/locale/hi/branding/brand.ftl similarity index 100% rename from chrome/locale/hi/branding/tor-browser-brand.ftl rename to chrome/locale/hi/branding/brand.ftl diff --git a/chrome/locale/hr/branding/tor-browser-brand.ftl b/chrome/locale/hr/branding/brand.ftl similarity index 100% rename from chrome/locale/hr/branding/tor-browser-brand.ftl rename to chrome/locale/hr/branding/brand.ftl diff --git a/chrome/locale/ht/branding/tor-browser-brand.ftl b/chrome/locale/ht/branding/brand.ftl similarity index 100% rename from chrome/locale/ht/branding/tor-browser-brand.ftl rename to chrome/locale/ht/branding/brand.ftl diff --git a/chrome/locale/hu/branding/tor-browser-brand.ftl b/chrome/locale/hu/branding/brand.ftl similarity index 100% rename from chrome/locale/hu/branding/tor-browser-brand.ftl rename to chrome/locale/hu/branding/brand.ftl diff --git a/chrome/locale/hy/branding/tor-browser-brand.ftl b/chrome/locale/hy/branding/brand.ftl similarity index 100% rename from chrome/locale/hy/branding/tor-browser-brand.ftl rename to chrome/locale/hy/branding/brand.ftl diff --git a/chrome/locale/id/branding/tor-browser-brand.ftl b/chrome/locale/id/branding/brand.ftl similarity index 100% rename from chrome/locale/id/branding/tor-browser-brand.ftl rename to chrome/locale/id/branding/brand.ftl diff --git a/chrome/locale/is/branding/tor-browser-brand.ftl b/chrome/locale/is/branding/brand.ftl similarity index 100% rename from chrome/locale/is/branding/tor-browser-brand.ftl rename to chrome/locale/is/branding/brand.ftl diff --git a/chrome/locale/it/branding/tor-browser-brand.ftl b/chrome/locale/it/branding/brand.ftl similarity index 100% rename from chrome/locale/it/branding/tor-browser-brand.ftl rename to chrome/locale/it/branding/brand.ftl diff --git a/chrome/locale/ja/branding/tor-browser-brand.ftl b/chrome/locale/ja/branding/brand.ftl similarity index 100% rename from chrome/locale/ja/branding/tor-browser-brand.ftl rename to chrome/locale/ja/branding/brand.ftl diff --git a/chrome/locale/jv/branding/tor-browser-brand.ftl b/chrome/locale/jv/branding/brand.ftl similarity index 100% rename from chrome/locale/jv/branding/tor-browser-brand.ftl rename to chrome/locale/jv/branding/brand.ftl diff --git a/chrome/locale/ka/branding/tor-browser-brand.ftl b/chrome/locale/ka/branding/brand.ftl similarity index 100% rename from chrome/locale/ka/branding/tor-browser-brand.ftl rename to chrome/locale/ka/branding/brand.ftl diff --git a/chrome/locale/km/branding/tor-browser-brand.ftl b/chrome/locale/km/branding/brand.ftl similarity index 100% rename from chrome/locale/km/branding/tor-browser-brand.ftl rename to chrome/locale/km/branding/brand.ftl diff --git a/chrome/locale/kn/branding/tor-browser-brand.ftl b/chrome/locale/kn/branding/brand.ftl similarity index 100% rename from chrome/locale/kn/branding/tor-browser-brand.ftl rename to chrome/locale/kn/branding/brand.ftl diff --git a/chrome/locale/ko/branding/tor-browser-brand.ftl b/chrome/locale/ko/branding/brand.ftl similarity index 100% rename from chrome/locale/ko/branding/tor-browser-brand.ftl rename to chrome/locale/ko/branding/brand.ftl diff --git a/chrome/locale/ku/branding/tor-browser-brand.ftl b/chrome/locale/ku/branding/brand.ftl similarity index 100% rename from chrome/locale/ku/branding/tor-browser-brand.ftl rename to chrome/locale/ku/branding/brand.ftl diff --git a/chrome/locale/kw/branding/tor-browser-brand.ftl b/chrome/locale/kw/branding/brand.ftl similarity index 100% rename from chrome/locale/kw/branding/tor-browser-brand.ftl rename to chrome/locale/kw/branding/brand.ftl diff --git a/chrome/locale/ky/branding/tor-browser-brand.ftl b/chrome/locale/ky/branding/brand.ftl similarity index 100% rename from chrome/locale/ky/branding/tor-browser-brand.ftl rename to chrome/locale/ky/branding/brand.ftl diff --git a/chrome/locale/lb/branding/tor-browser-brand.ftl b/chrome/locale/lb/branding/brand.ftl similarity index 100% rename from chrome/locale/lb/branding/tor-browser-brand.ftl rename to chrome/locale/lb/branding/brand.ftl diff --git a/chrome/locale/ln/branding/tor-browser-brand.ftl b/chrome/locale/ln/branding/brand.ftl similarity index 100% rename from chrome/locale/ln/branding/tor-browser-brand.ftl rename to chrome/locale/ln/branding/brand.ftl diff --git a/chrome/locale/lo/branding/tor-browser-brand.ftl b/chrome/locale/lo/branding/brand.ftl similarity index 100% rename from chrome/locale/lo/branding/tor-browser-brand.ftl rename to chrome/locale/lo/branding/brand.ftl diff --git a/chrome/locale/lt/branding/tor-browser-brand.ftl b/chrome/locale/lt/branding/brand.ftl similarity index 100% rename from chrome/locale/lt/branding/tor-browser-brand.ftl rename to chrome/locale/lt/branding/brand.ftl diff --git a/chrome/locale/lv/branding/tor-browser-brand.ftl b/chrome/locale/lv/branding/brand.ftl similarity index 100% rename from chrome/locale/lv/branding/tor-browser-brand.ftl rename to chrome/locale/lv/branding/brand.ftl diff --git a/chrome/locale/mg/branding/tor-browser-brand.ftl b/chrome/locale/mg/branding/brand.ftl similarity index 100% rename from chrome/locale/mg/branding/tor-browser-brand.ftl rename to chrome/locale/mg/branding/brand.ftl diff --git a/chrome/locale/mi/branding/tor-browser-brand.ftl b/chrome/locale/mi/branding/brand.ftl similarity index 100% rename from chrome/locale/mi/branding/tor-browser-brand.ftl rename to chrome/locale/mi/branding/brand.ftl diff --git a/chrome/locale/mk/branding/tor-browser-brand.ftl b/chrome/locale/mk/branding/brand.ftl similarity index 100% rename from chrome/locale/mk/branding/tor-browser-brand.ftl rename to chrome/locale/mk/branding/brand.ftl diff --git a/chrome/locale/ml/branding/tor-browser-brand.ftl b/chrome/locale/ml/branding/brand.ftl similarity index 100% rename from chrome/locale/ml/branding/tor-browser-brand.ftl rename to chrome/locale/ml/branding/brand.ftl diff --git a/chrome/locale/mn/branding/tor-browser-brand.ftl b/chrome/locale/mn/branding/brand.ftl similarity index 100% rename from chrome/locale/mn/branding/tor-browser-brand.ftl rename to chrome/locale/mn/branding/brand.ftl diff --git a/chrome/locale/mr/branding/tor-browser-brand.ftl b/chrome/locale/mr/branding/brand.ftl similarity index 100% rename from chrome/locale/mr/branding/tor-browser-brand.ftl rename to chrome/locale/mr/branding/brand.ftl diff --git a/chrome/locale/ms/branding/tor-browser-brand.ftl b/chrome/locale/ms/branding/brand.ftl similarity index 100% rename from chrome/locale/ms/branding/tor-browser-brand.ftl rename to chrome/locale/ms/branding/brand.ftl diff --git a/chrome/locale/mt/branding/tor-browser-brand.ftl b/chrome/locale/mt/branding/brand.ftl similarity index 100% rename from chrome/locale/mt/branding/tor-browser-brand.ftl rename to chrome/locale/mt/branding/brand.ftl diff --git a/chrome/locale/my/branding/tor-browser-brand.ftl b/chrome/locale/my/branding/brand.ftl similarity index 100% rename from chrome/locale/my/branding/tor-browser-brand.ftl rename to chrome/locale/my/branding/brand.ftl diff --git a/chrome/locale/nah/branding/tor-browser-brand.ftl b/chrome/locale/nah/branding/brand.ftl similarity index 100% rename from chrome/locale/nah/branding/tor-browser-brand.ftl rename to chrome/locale/nah/branding/brand.ftl diff --git a/chrome/locale/nap/branding/tor-browser-brand.ftl b/chrome/locale/nap/branding/brand.ftl similarity index 100% rename from chrome/locale/nap/branding/tor-browser-brand.ftl rename to chrome/locale/nap/branding/brand.ftl diff --git a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl b/chrome/locale/nb-NO/branding/brand.ftl similarity index 100% rename from chrome/locale/nb-NO/branding/tor-browser-brand.ftl rename to chrome/locale/nb-NO/branding/brand.ftl diff --git a/chrome/locale/ne/branding/tor-browser-brand.ftl b/chrome/locale/ne/branding/brand.ftl similarity index 100% rename from chrome/locale/ne/branding/tor-browser-brand.ftl rename to chrome/locale/ne/branding/brand.ftl diff --git a/chrome/locale/nl/branding/tor-browser-brand.ftl b/chrome/locale/nl/branding/brand.ftl similarity index 100% rename from chrome/locale/nl/branding/tor-browser-brand.ftl rename to chrome/locale/nl/branding/brand.ftl diff --git a/chrome/locale/nn/branding/tor-browser-brand.ftl b/chrome/locale/nn/branding/brand.ftl similarity index 100% rename from chrome/locale/nn/branding/tor-browser-brand.ftl rename to chrome/locale/nn/branding/brand.ftl diff --git a/chrome/locale/nso/branding/tor-browser-brand.ftl b/chrome/locale/nso/branding/brand.ftl similarity index 100% rename from chrome/locale/nso/branding/tor-browser-brand.ftl rename to chrome/locale/nso/branding/brand.ftl diff --git a/chrome/locale/oc/branding/tor-browser-brand.ftl b/chrome/locale/oc/branding/brand.ftl similarity index 100% rename from chrome/locale/oc/branding/tor-browser-brand.ftl rename to chrome/locale/oc/branding/brand.ftl diff --git a/chrome/locale/or/branding/tor-browser-brand.ftl b/chrome/locale/or/branding/brand.ftl similarity index 100% rename from chrome/locale/or/branding/tor-browser-brand.ftl rename to chrome/locale/or/branding/brand.ftl diff --git a/chrome/locale/pa/branding/tor-browser-brand.ftl b/chrome/locale/pa/branding/brand.ftl similarity index 100% rename from chrome/locale/pa/branding/tor-browser-brand.ftl rename to chrome/locale/pa/branding/brand.ftl diff --git a/chrome/locale/pap/branding/tor-browser-brand.ftl b/chrome/locale/pap/branding/brand.ftl similarity index 100% rename from chrome/locale/pap/branding/tor-browser-brand.ftl rename to chrome/locale/pap/branding/brand.ftl diff --git a/chrome/locale/pl/branding/tor-browser-brand.ftl b/chrome/locale/pl/branding/brand.ftl similarity index 100% rename from chrome/locale/pl/branding/tor-browser-brand.ftl rename to chrome/locale/pl/branding/brand.ftl diff --git a/chrome/locale/pms/branding/tor-browser-brand.ftl b/chrome/locale/pms/branding/brand.ftl similarity index 100% rename from chrome/locale/pms/branding/tor-browser-brand.ftl rename to chrome/locale/pms/branding/brand.ftl diff --git a/chrome/locale/ps/branding/tor-browser-brand.ftl b/chrome/locale/ps/branding/brand.ftl similarity index 100% rename from chrome/locale/ps/branding/tor-browser-brand.ftl rename to chrome/locale/ps/branding/brand.ftl diff --git a/chrome/locale/pt-BR/branding/tor-browser-brand.ftl b/chrome/locale/pt-BR/branding/brand.ftl similarity index 100% rename from chrome/locale/pt-BR/branding/tor-browser-brand.ftl rename to chrome/locale/pt-BR/branding/brand.ftl diff --git a/chrome/locale/pt/branding/tor-browser-brand.ftl b/chrome/locale/pt/branding/brand.ftl similarity index 100% rename from chrome/locale/pt/branding/tor-browser-brand.ftl rename to chrome/locale/pt/branding/brand.ftl diff --git a/chrome/locale/ro/branding/tor-browser-brand.ftl b/chrome/locale/ro/branding/brand.ftl similarity index 100% rename from chrome/locale/ro/branding/tor-browser-brand.ftl rename to chrome/locale/ro/branding/brand.ftl diff --git a/chrome/locale/ru/branding/tor-browser-brand.ftl b/chrome/locale/ru/branding/brand.ftl similarity index 100% rename from chrome/locale/ru/branding/tor-browser-brand.ftl rename to chrome/locale/ru/branding/brand.ftl diff --git a/chrome/locale/sco/branding/tor-browser-brand.ftl b/chrome/locale/sco/branding/brand.ftl similarity index 100% rename from chrome/locale/sco/branding/tor-browser-brand.ftl rename to chrome/locale/sco/branding/brand.ftl diff --git a/chrome/locale/sk/branding/tor-browser-brand.ftl b/chrome/locale/sk/branding/brand.ftl similarity index 100% rename from chrome/locale/sk/branding/tor-browser-brand.ftl rename to chrome/locale/sk/branding/brand.ftl diff --git a/chrome/locale/sl/branding/tor-browser-brand.ftl b/chrome/locale/sl/branding/brand.ftl similarity index 100% rename from chrome/locale/sl/branding/tor-browser-brand.ftl rename to chrome/locale/sl/branding/brand.ftl diff --git a/chrome/locale/so/branding/tor-browser-brand.ftl b/chrome/locale/so/branding/brand.ftl similarity index 100% rename from chrome/locale/so/branding/tor-browser-brand.ftl rename to chrome/locale/so/branding/brand.ftl diff --git a/chrome/locale/son/branding/tor-browser-brand.ftl b/chrome/locale/son/branding/brand.ftl similarity index 100% rename from chrome/locale/son/branding/tor-browser-brand.ftl rename to chrome/locale/son/branding/brand.ftl diff --git a/chrome/locale/sq/branding/tor-browser-brand.ftl b/chrome/locale/sq/branding/brand.ftl similarity index 100% rename from chrome/locale/sq/branding/tor-browser-brand.ftl rename to chrome/locale/sq/branding/brand.ftl diff --git a/chrome/locale/sr/branding/tor-browser-brand.ftl b/chrome/locale/sr/branding/brand.ftl similarity index 100% rename from chrome/locale/sr/branding/tor-browser-brand.ftl rename to chrome/locale/sr/branding/brand.ftl diff --git a/chrome/locale/st/branding/tor-browser-brand.ftl b/chrome/locale/st/branding/brand.ftl similarity index 100% rename from chrome/locale/st/branding/tor-browser-brand.ftl rename to chrome/locale/st/branding/brand.ftl diff --git a/chrome/locale/su/branding/tor-browser-brand.ftl b/chrome/locale/su/branding/brand.ftl similarity index 100% rename from chrome/locale/su/branding/tor-browser-brand.ftl rename to chrome/locale/su/branding/brand.ftl diff --git a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl b/chrome/locale/sv-SE/branding/brand.ftl similarity index 100% rename from chrome/locale/sv-SE/branding/tor-browser-brand.ftl rename to chrome/locale/sv-SE/branding/brand.ftl diff --git a/chrome/locale/sw/branding/tor-browser-brand.ftl b/chrome/locale/sw/branding/brand.ftl similarity index 100% rename from chrome/locale/sw/branding/tor-browser-brand.ftl rename to chrome/locale/sw/branding/brand.ftl diff --git a/chrome/locale/ta/branding/tor-browser-brand.ftl b/chrome/locale/ta/branding/brand.ftl similarity index 100% rename from chrome/locale/ta/branding/tor-browser-brand.ftl rename to chrome/locale/ta/branding/brand.ftl diff --git a/chrome/locale/te/branding/tor-browser-brand.ftl b/chrome/locale/te/branding/brand.ftl similarity index 100% rename from chrome/locale/te/branding/tor-browser-brand.ftl rename to chrome/locale/te/branding/brand.ftl diff --git a/chrome/locale/tg/branding/tor-browser-brand.ftl b/chrome/locale/tg/branding/brand.ftl similarity index 100% rename from chrome/locale/tg/branding/tor-browser-brand.ftl rename to chrome/locale/tg/branding/brand.ftl diff --git a/chrome/locale/th/branding/tor-browser-brand.ftl b/chrome/locale/th/branding/brand.ftl similarity index 100% rename from chrome/locale/th/branding/tor-browser-brand.ftl rename to chrome/locale/th/branding/brand.ftl diff --git a/chrome/locale/ti/branding/tor-browser-brand.ftl b/chrome/locale/ti/branding/brand.ftl similarity index 100% rename from chrome/locale/ti/branding/tor-browser-brand.ftl rename to chrome/locale/ti/branding/brand.ftl diff --git a/chrome/locale/tk/branding/tor-browser-brand.ftl b/chrome/locale/tk/branding/brand.ftl similarity index 100% rename from chrome/locale/tk/branding/tor-browser-brand.ftl rename to chrome/locale/tk/branding/brand.ftl diff --git a/chrome/locale/tr/branding/tor-browser-brand.ftl b/chrome/locale/tr/branding/brand.ftl similarity index 100% rename from chrome/locale/tr/branding/tor-browser-brand.ftl rename to chrome/locale/tr/branding/brand.ftl diff --git a/chrome/locale/uk/branding/tor-browser-brand.ftl b/chrome/locale/uk/branding/brand.ftl similarity index 100% rename from chrome/locale/uk/branding/tor-browser-brand.ftl rename to chrome/locale/uk/branding/brand.ftl diff --git a/chrome/locale/ur/branding/tor-browser-brand.ftl b/chrome/locale/ur/branding/brand.ftl similarity index 100% rename from chrome/locale/ur/branding/tor-browser-brand.ftl rename to chrome/locale/ur/branding/brand.ftl diff --git a/chrome/locale/ve/branding/tor-browser-brand.ftl b/chrome/locale/ve/branding/brand.ftl similarity index 100% rename from chrome/locale/ve/branding/tor-browser-brand.ftl rename to chrome/locale/ve/branding/brand.ftl diff --git a/chrome/locale/vi/branding/tor-browser-brand.ftl b/chrome/locale/vi/branding/brand.ftl similarity index 100% rename from chrome/locale/vi/branding/tor-browser-brand.ftl rename to chrome/locale/vi/branding/brand.ftl diff --git a/chrome/locale/wa/branding/tor-browser-brand.ftl b/chrome/locale/wa/branding/brand.ftl similarity index 100% rename from chrome/locale/wa/branding/tor-browser-brand.ftl rename to chrome/locale/wa/branding/brand.ftl diff --git a/chrome/locale/wo/branding/tor-browser-brand.ftl b/chrome/locale/wo/branding/brand.ftl similarity index 100% rename from chrome/locale/wo/branding/tor-browser-brand.ftl rename to chrome/locale/wo/branding/brand.ftl diff --git a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl b/chrome/locale/zh-CN/branding/brand.ftl similarity index 100% rename from chrome/locale/zh-CN/branding/tor-browser-brand.ftl rename to chrome/locale/zh-CN/branding/brand.ftl diff --git a/chrome/locale/zh-HK/branding/tor-browser-brand.ftl b/chrome/locale/zh-HK/branding/brand.ftl similarity index 100% rename from chrome/locale/zh-HK/branding/tor-browser-brand.ftl rename to chrome/locale/zh-HK/branding/brand.ftl diff --git a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl b/chrome/locale/zh-TW/branding/brand.ftl similarity index 100% rename from chrome/locale/zh-TW/branding/tor-browser-brand.ftl rename to chrome/locale/zh-TW/branding/brand.ftl diff --git a/chrome/locale/zu/branding/tor-browser-brand.ftl b/chrome/locale/zu/branding/brand.ftl similarity index 100% rename from chrome/locale/zu/branding/tor-browser-brand.ftl rename to chrome/locale/zu/branding/brand.ftl diff --git a/import-translations.sh b/import-translations.sh index 78b4b8b9..f2b0fd86 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -90,14 +90,14 @@ for KEYVAL in "${FILEMAP[@]}"; do done ) -# Autogenerate tor-browser-brand.ftl based on brand.properties +# Autogenerate brand.ftl based on brand.properties # and brand.dtd. REGEX_ENTITY='<!ENTITY +([^" ]+) +"(.+)">'; for LOCALE in $BUNDLE_LOCALES; do BRAND_PATH="$LOCALE_DIR/$LOCALE/brand.properties" BRAND_DTD_PATH="$LOCALE_DIR/$LOCALE/brand.dtd" - TOR_BRAND_PATH="$(dirname "$BRAND_PATH")/branding/tor-browser-brand.ftl" + TOR_BRAND_PATH="$(dirname "$BRAND_PATH")/branding/brand.ftl" BRAND_SHORTER_NAME="$(sed -n -e '/^brandShorterName/p' $BRAND_PATH | cut -d= -f2)" BRAND_SHORT_NAME="$(sed -n -e '/^brandShortName/p' $BRAND_PATH | cut -d= -f2)" @@ -107,7 +107,7 @@ do TRADEMARK_INFO='{ " " }' if [[ "$(sed -n -e '/trademarkInfo/p' $BRAND_DTD_PATH)" =~ $REGEX_ENTITY ]] then - # Replace some HTML entities (now just ") for tor-browser-brand.ftl. + # Replace some HTML entities (now just ") for brand.ftl. TRADEMARK_INFO="${BASH_REMATCH[2]//"/\'}" fi

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40059: Use MOZ_BUILD_DATE for versionCode
by Georg Koppen 28 Sep '20

28 Sep '20

Georg Koppen pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: c8fea7b4 by Georg Koppen at 2020-09-25T14:30:34+00:00 Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. - - - - - 0a4fbe8a by Georg Koppen at 2020-09-28T13:43:59+00:00 Merge branch 'bug_40059' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/build.gradle - buildSrc/src/main/java/Config.kt Changes: ===================================== app/build.gradle ===================================== @@ -679,9 +679,12 @@ ext.updateExtensionVersion = { task, extDir -> into extDir def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE') + // MOZ_BUILD_DATE is in the YYYYMMDDHHMMSS format. Thus, we only use a + // substring of it if it is available. def values = ['version': AndroidComponents.VERSION + "." + - (systemEnvBuildDate != null ? systemEnvBuildDate : - new Date().format('MMddHHmmss'))] + (systemEnvBuildDate != null ? + systemEnvBuildDate.substring(4) : + new Date().format('MMddHHmmss'))] inputs.properties(values) expand(values) } ===================================== buildSrc/src/main/java/Config.kt ===================================== @@ -47,7 +47,7 @@ object Config { private val fennecBaseVersionCode by lazy { val format = SimpleDateFormat("YYYYMMDDHHMMSS", Locale.US) val cutoff = format.parse("20150801000000") - val build = Date() + val build = if (System.getenv("MOZ_BUILD_DATE") != null) format.parse(System.getenv("MOZ_BUILD_DATE")) else Date() Math.floor((build.time - cutoff.time) / (1000.0 * 60.0 * 60.0)).toInt() } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8b0f722ffcc6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8b0f722ffcc6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 34163: Fix versionCode for testbuilds
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 691a762b633c16cd7ee00b32f2284cf1bb3e9278 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 25 13:41:53 2020 +0000 Bug 34163: Fix versionCode for testbuilds --- projects/common/get-moz-build-date | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/common/get-moz-build-date b/projects/common/get-moz-build-date index a43f2f7..5932a6f 100755 --- a/projects/common/get-moz-build-date +++ b/projects/common/get-moz-build-date @@ -10,8 +10,9 @@ if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); } elsif ($version eq 'testbuild') { # There is no need for an increasing build date in test builds. Just hardcode - # it. - $date = 20010101010101; + # it to a value that is compatible with the v1 versionCode scheme on Android, + # see: #34163. + $date = 20150801000000; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/80' into master
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit b13fc9ac83e49d833dee28621af182e038ad2331 Merge: f879dec f733e4f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 13:45:19 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/80' into master projects/common/get-moz-build-date | 5 +++-- projects/fenix/build | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 40084: Fix AndroidManifest.xml reproducibility
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit f733e4ff08d2f56ca3cf562d006e5c712b4118a8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 25 14:25:40 2020 +0000 Bug 40084: Fix AndroidManifest.xml reproducibility We need to make sure we just set MOZ_BUILD_DATE and adapt the format where it is actually needed. See: fenix#40059 for the Fenix part that makes use of that to fix #40084. --- projects/fenix/build | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index 7569250..eedddcc 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -54,9 +54,6 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ then echo "MOZ_BUILD_DATE is not set" exit 1 - else - # We only need a MMddHHmmss format and thus no year. - MOZ_BUILD_DATE=${MOZ_BUILD_DATE:4} fi $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint

1 0

[tor-browser-build/master] Fold in 10.0 Changelog
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit f879decd41ec0f289edb0ae3188f7a117188315e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 13:29:10 2020 +0000 Fold in 10.0 Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9798767..9f66e55 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,120 @@ Tor Browser 10.5a1 -- September 22 2020 * Bug 40041: Remove CentOS 6 support for 10.5 series [tor-browser-build] * Bug 40103: Add i386 pkg-config path for linux-i686 [tor-browser-build] +Tor Browser 10.0 -- September 22 2020 + * Windows + OS X + Linux + * Update Firefox to 78.3.0esr + * Update Tor to 0.4.4.5 + * Update Tor Launcher to 0.2.25 + * Bug 32174: Replace XUL <textbox> with <html:input> + * Bug 33890: Rename XUL files to XHTML + * Bug 33862: Fix usages of createTransport API + * Bug 33906: Fix Tor-Launcher issues for Firefox 75 + * Bug 33998: Use CSS grid instead of XUL grid + * Bug 34164: Tor Launcher deadlocks during startup (Firefox 77) + * Bug 34206: Tor Launcher button labels are missing (Firefox 76) + * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher] + * Translations update + * Update NoScript to 11.0.44 + * Bug 40093: Youtube videos on safer produce an error [tor-browser] + * Translations update + * Bug 10394: Let Tor Browser update HTTPS Everywhere + * Bug 11154: Disable TLS 1.0 (and 1.1) by default + * Bug 16931: Sanitize the add-on blocklist update URL + * Bug 17374: Disable 1024-DH Encryption by default + * Bug 21601: Remove unused media.webaudio.enabled pref + * Bug 30682: Disable Intermediate CA Preloading + * Bug 30812: Exempt about: pages from Resist Fingerprinting + * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser] + * Bug 32612: Update MAR_CHANNEL_ID for the alpha + * Bug 32886: Separate treatment of @media interaction features for desktop and android + * Bug 33534: Review FF release notes from FF69 to latest (FF78) + * Bug 33697: Use old search config based on list.json + * Bug 33721: PDF Viewer is not working in the safest security level + * Bug 33734: Set MOZ_NORMANDY to False + * Bug 33737: Fix aboutDialog.js error for Firefox nightlies + * Bug 33848: Disable Enhanced Tracking Protection + * Bug 33851: Patch out Parental Controls detection and logging + * Bug 33852: Clean up about:logins to not mention Sync + * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True + * Bug 33862: Fix usages of createTransport API + * Bug 33867: Disable password manager and password generation + * Bug 33890: Rename XUL files to XHTML + * Bug 33892: Add brandProductName to brand.dtd and brand.properties + * Bug 33962: Uplift patch for bug 5741 (dns leak protection) + * Bug 34125: API change in protocolProxyService.registerChannelFilter + * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton] + * Bug 40002: Remove about:pioneer [tor-browser] + * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton] + * Bug 40003: Adapt code for L10nRegistry API changes [torbutton] + * Bug 40005: Initialize the identity UI before setting up the circuit display [torbutton] + * Bug 40006: Fix new identity for 81 [torbutton] + * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] + * Bug 40008: Style fixes for 78 [torbutton] + * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] + * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] + * Bug 40022: Update new icons in Tor Browser branding [tor-browser] + * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser] + * Bug 40036: Remove product version/update channel from #13379 patch [tor-browser] + * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser] + * Bug 40048: Disable various ESR78 features via prefs [tor-browser] + * Bug 40059: Verify our external helper patch is still working [tor-browser] + * Bug 40066: Update existing prefs for ESR 78 [tor-browser] + * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build] + * Bug 40073: Disable remote Public Suffix List fetching [tor-browser] + * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build] + * Bug 40078: Backport patches for bug 1651680 for now [tor-browser] + * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser] + * Bug 40088: Moat "Submit" button does not work + * Bug 40090: Disable v3 add-on blocklist for now [tor-browser] + * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser] + * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser] + * Bug 40106: Cannot install addons in full screen mode [tor-browser] + * Bug 40109: Playing video breaks after reloading pages [tor-browser] + * Bug 40119: Enable v3 extension blocklisting again [tor-browser] + * Windows + * Bug 33855: Don't use site's icon as window icon in Windows in private mode + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * OS X + * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave) + * Build System + * Windows + OS X + Linux + * Bump Go to 1.14.7 + * Bug 31845: Bump GCC version to 9.3.0 + * Bug 34011: Bump clang to 9.0.1 + * Bug 34014: Enable sqlite3 support in Python + * Bug 34390: Don't copy DBM libraries anymore + * Bug 34391: Remove unused --enable-signmar option + * Bug 40004: Adapt Rust project for Firefox 78 ESR [tor-browser-build] + * Bug 40005: Adapt Node project for Firefox 78 ESR [tor-browser-build] + * Bug 40006: Adapt cbindgen for Firefox 78 ESR [tor-browser-build] + * Bug 40037: Move projects over to clang-source [tor-browser-build] + * Bug 40026: Fix full .mar creation for esr78 [tor-browser-build] + * Bug 40027: Fix incremental .mar creation for esr78 [tor-browser-build] + * Bug 40028: Do not reference unset env variables [tor-browser-build] + * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] + * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] + * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] + * Windows + * Bug 34230: Update Windows toolchain for Firefox 78 ESR + * Bug 40015: Use only 64bit fxc2 [tor-browser-build] + * Bug 40017: Enable stripping again on Windows [tor-browser-build] + * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] + * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build] + * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build] + * OS X + * Bug 34229: Update macOS toolchain for Firefox 78 ESR + * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build] + * Bug 40018: Add libtapi project for cctools [tor-browser-build] + * Bug 40019: Ship our own runtime library for macOS [tor-browser-build] + * Linux + * Bug 34359: Adapt abicheck.cc to deal with newer GCC version + * Bug 34386: Fix up clang compilation on Linux + * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build] + Tor Browser 10.0a7 -- September 14 2020 * Windows + OS X + Linux * Update Tor Launcher to 0.2.24

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Sep '20

26 Sep '20

commit 9e380b2e181813da457c2474ed6629c571131d6e Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 24 20:28:29 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40148. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bac98ce06540..278c368c823c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,6 +180,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // not leak that difference if possible. pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status +pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Sep '20

26 Sep '20

commit 7061f07e6ef910fd35c3a67e378ed8ed979b3bc6 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 24 20:28:29 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40148. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e29c788b720..304443230cf0 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,6 +180,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // not leak that difference if possible. pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status +pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Sep '20

26 Sep '20

commit 94e52171a3390e100f71b4808b675fb61de6939c Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 24 20:28:29 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40148. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bac98ce06540..278c368c823c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,6 +180,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // not leak that difference if possible. pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status +pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 34378: Port external helper app prompting
by Matthew Finkel 25 Sep '20

25 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 67e28112 by Alex Catarineu at 2020-09-22T17:43:24+02:00 Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 8b0f722f by Matthew Finkel at 2020-09-25T19:06:31+00:00 Merge remote-tracking branch 'acatgl/34378' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/share/ShareController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -4,6 +4,7 @@ package org.mozilla.fenix +import android.app.PendingIntent import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -45,6 +46,8 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.WebExtensionState import mozilla.components.concept.engine.EngineSession import mozilla.components.concept.engine.EngineView +import mozilla.components.feature.app.links.RedirectDialogFragment +import mozilla.components.feature.app.links.SimpleRedirectDialogFragment import mozilla.components.feature.contextmenu.DefaultSelectionActionDelegate import mozilla.components.feature.privatemode.notification.PrivateNotificationFeature import mozilla.components.feature.search.BrowserStoreSearchAdapter @@ -58,6 +61,7 @@ import mozilla.components.support.ktx.kotlin.isUrl import mozilla.components.support.ktx.kotlin.toNormalizedUrl import mozilla.components.support.locale.LocaleAwareAppCompatActivity import mozilla.components.support.utils.SafeIntent +import mozilla.components.support.utils.TorUtils import mozilla.components.support.utils.toSafeIntent import mozilla.components.support.webextensions.WebExtensionPopupFeature import org.mozilla.fenix.GleanMetrics.Metrics @@ -154,6 +158,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private lateinit var navigationToolbar: Toolbar + private var dialog: RedirectDialogFragment? = null + final override fun onCreate(savedInstanceState: Bundle?) { // Give Orbot the base Context Prefs.setContext(applicationContext) @@ -387,6 +393,26 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { super.recreate() } + // Copied from mozac AppLinksFeature.kt + internal fun getOrCreateDialog(): RedirectDialogFragment { + val existingDialog = dialog + if (existingDialog != null) { + return existingDialog + } + + SimpleRedirectDialogFragment.newInstance().also { + dialog = it + return it + } + } + private fun isAlreadyADialogCreated(): Boolean { + return findPreviousDialogFragment() != null + } + + private fun findPreviousDialogFragment(): RedirectDialogFragment? { + return supportFragmentManager.findFragmentByTag(RedirectDialogFragment.FRAGMENT_TAG) as? RedirectDialogFragment + } + /** * Handles intents received when the activity is open. */ @@ -394,6 +420,25 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { super.onNewIntent(intent) intent ?: return + val startIntent = intent.getParcelableExtra<PendingIntent>(TorUtils.TORBROWSER_START_ACTIVITY_PROMPT) + if (startIntent != null) { + if (startIntent.creatorPackage == applicationContext.packageName) { + val dialog = getOrCreateDialog() + dialog.onConfirmRedirect = { + try { + startIntent.send() + } catch (error: PendingIntent.CanceledException) { + } + } + dialog.onCancelRedirect = {} + + if (!isAlreadyADialogCreated()) { + dialog.showNow(supportFragmentManager, RedirectDialogFragment.FRAGMENT_TAG) + } + } + return + } + // Diagnostic breadcrumb for "Display already aquired" crash: // https://github.com/mozilla-mobile/android-components/issues/7960 breadcrumb( ===================================== app/src/main/java/org/mozilla/fenix/share/ShareController.kt ===================================== @@ -25,6 +25,7 @@ import mozilla.components.concept.sync.TabData import mozilla.components.feature.accounts.push.SendTabUseCases import mozilla.components.feature.share.RecentAppsStorage import mozilla.components.support.ktx.kotlin.isExtensionUrl +import mozilla.components.support.utils.TorUtils import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.metrics.Event @@ -99,7 +100,7 @@ class DefaultShareController( } val result = try { - context.startActivity(intent) + TorUtils.startActivityPrompt(context, intent) ShareController.Result.SUCCESS } catch (e: SecurityException) { snackbar.setText(context.getString(R.string.share_error_snackbar)) View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/7b11da2715b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/7b11da2715b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-1] 2 commits: Bug 40007: Port external helper app prompting
by Matthew Finkel 25 Sep '20

25 Sep '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-1 at The Tor Project / Applications / android-components Commits: 282eda4d by Alex Catarineu at 2020-09-24T14:55:29+02:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 288e6a1e by Matthew Finkel at 2020-09-25T19:01:43+00:00 Merge remote-tracking branch 'acatgl/40007+1' into android-components-57.0.6-10.0-1 - - - - - 7 changed files: - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt - + components/support/utils/src/main/java/mozilla/components/support/utils/TorUtils.kt Changes: ===================================== components/feature/app-links/build.gradle ===================================== @@ -36,6 +36,7 @@ dependencies { implementation Dependencies.kotlin_stdlib implementation Dependencies.kotlin_coroutines + implementation project(path: ':support-utils') testImplementation project(':support-test') ===================================== components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt ===================================== @@ -67,7 +67,8 @@ class AppLinksFeature( loadUrlUseCase?.invoke(url, session, EngineSession.LoadUrlFlags.none()) } - if (!session.private || fragmentManager == null) { + // useCases.openAppLink will now prompt: calling it directly to avoid prompting twice + if (true || !session.private || fragmentManager == null) { doOpenApp() return } ===================================== components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt ===================================== @@ -19,6 +19,7 @@ import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.android.content.pm.isPackageInstalled import mozilla.components.support.ktx.android.net.isHttpOrHttps import java.net.URISyntaxException +import mozilla.components.support.utils.TorUtils private const val EXTRA_BROWSER_FALLBACK_URL = "browser_fallback_url" private const val MARKET_INTENT_URI_PACKAGE_PREFIX = "market://details?id=" @@ -200,7 +201,7 @@ class AppLinksUseCases( if (launchInNewTask) { it.flags = it.flags or Intent.FLAG_ACTIVITY_NEW_TASK } - context.startActivity(it) + TorUtils.startActivityPrompt(context, it) } catch (e: ActivityNotFoundException) { failedToLaunchAction() Logger.error("failed to start third party app activity", e) ===================================== components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt ===================================== @@ -18,6 +18,7 @@ import mozilla.components.feature.app.links.AppLinksUseCases import mozilla.components.support.ktx.android.content.addContact import mozilla.components.support.ktx.android.content.share import mozilla.components.support.ktx.kotlin.stripMailToProtocol +import mozilla.components.support.utils.TorUtils /** * A candidate for an item to be displayed in the context menu. @@ -320,7 +321,7 @@ data class ContextMenuCandidate( context.getString(R.string.mozac_feature_contextmenu_share_link) ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - context.startActivity(shareIntent) + TorUtils.startActivityPrompt(context, shareIntent) } ) ===================================== components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt ===================================== @@ -70,6 +70,7 @@ import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.kotlin.sanitizeURL import mozilla.components.support.ktx.kotlinx.coroutines.throttleLatest import mozilla.components.support.utils.DownloadUtils +import mozilla.components.support.utils.TorUtils import java.io.File import java.io.FileOutputStream import java.io.IOException @@ -812,7 +813,7 @@ abstract class AbstractFetchDownloadService : Service() { } return try { - context.startActivity(newIntent) + TorUtils.startActivityPrompt(context, newIntent) true } catch (error: ActivityNotFoundException) { false ===================================== components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt ===================================== @@ -35,6 +35,7 @@ import mozilla.components.support.base.log.Log import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.R import mozilla.components.support.ktx.android.content.res.resolveAttribute +import mozilla.components.support.utils.TorUtils /** * The (visible) version name of the application, as specified by the <manifest> tag's versionName @@ -105,7 +106,7 @@ fun Context.share(text: String, subject: String = getString(R.string.mozac_suppo flags = FLAG_ACTIVITY_NEW_TASK } - startActivity(shareIntent) + TorUtils.startActivityPrompt(this, shareIntent) true } catch (e: ActivityNotFoundException) { Log.log(Log.Priority.WARN, message = "No activity to share to found", throwable = e, tag = "Reference-Browser") @@ -136,7 +137,7 @@ fun Context.email( flags = FLAG_ACTIVITY_NEW_TASK } - startActivity(emailIntent) + TorUtils.startActivityPrompt(this, emailIntent) true } catch (e: ActivityNotFoundException) { Logger.warn("No activity found to handle email intent", throwable = e) @@ -167,7 +168,7 @@ fun Context.call( flags = FLAG_ACTIVITY_NEW_TASK } - startActivity(callIntent) + TorUtils.startActivityPrompt(this, callIntent) true } catch (e: ActivityNotFoundException) { Logger.warn("No activity found to handle dial intent", throwable = e) @@ -195,7 +196,7 @@ fun Context.addContact( addFlags(FLAG_ACTIVITY_NEW_TASK) } - startActivity(intent) + TorUtils.startActivityPrompt(this, intent) true } catch (e: ActivityNotFoundException) { Logger.warn("No activity found to handle dial intent", throwable = e) ===================================== components/support/utils/src/main/java/mozilla/components/support/utils/TorUtils.kt ===================================== @@ -0,0 +1,26 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package mozilla.components.support.utils + +import android.app.PendingIntent +import android.content.Context +import android.content.Intent + +object TorUtils { + const val TORBROWSER_START_ACTIVITY_PROMPT = "torbrowser_start_activity_prompt" + + // Delegates showing prompt and possibly starting the activity to the main app activity. + // Highly dependant on Fenix/Tor Browser for Android. + // One downside of this implementation is that it does not throw exceptions like the + // direct context.startActivity, so the UI will behave as if the startActivity call was + // done successfully, which may not always be the case. + fun startActivityPrompt(context: Context, intent: Intent) { + val intentContainer = Intent() + intentContainer.setPackage(context.applicationContext.packageName) + intentContainer.putExtra(TORBROWSER_START_ACTIVITY_PROMPT, PendingIntent.getActivity(context, 0, intent, 0)) + intentContainer.flags = Intent.FLAG_ACTIVITY_NEW_TASK + context.startActivity(intentContainer) + } +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40105: Enhance Gradle dependency script
by sysrqb＠torproject.org 23 Sep '20

23 Sep '20

commit 4f9ab234282887c8b0394da8ef9a5b8802afa863 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 12:02:59 2020 +0000 Bug 40105: Enhance Gradle dependency script We sort now in a way that makes the output reproducible on different machines and exclude .module files, too, as we do not need them. --- tools/gen_gradle_deps_file.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/gen_gradle_deps_file.sh b/tools/gen_gradle_deps_file.sh index 377676f..99d0517 100755 --- a/tools/gen_gradle_deps_file.sh +++ b/tools/gen_gradle_deps_file.sh @@ -38,12 +38,13 @@ # having made a copy of `gradle-dependencies-list.txt` from 1) and comparing # the two .txt files. +export LC_ALL=C log="$1" # Step 1: Extract all the download attempts out of the log file, ignore the ones -# for maven-metadata.xml files. We don't need those. +# for maven-metadata.xml and module files. We don't need those. cat $log | grep "Performing HTTP" | grep -o "https://.*" | \ - grep -v "maven-metadata.xml" | sort | uniq > dl-attempts + grep -vE "\.module|maven-metadata\.xml" | sort | uniq > dl-attempts # Step 2: Fetch all the dependencies and calculate the SHA-256 sum while read line

1 0

[tor-browser-build/master] Bug 40101: Pick up 81.1.1 updates
by sysrqb＠torproject.org 23 Sep '20

23 Sep '20

1 0

[tor-browser-build/maint-10.0] Fixup changelog typos
by sysrqb＠torproject.org 22 Sep '20

22 Sep '20

commit 55a886cf6943bd7223834493020a82eeb499d6b5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 22 20:43:13 2020 +0000 Fixup changelog typos --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0700ae9..ce725b3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -68,8 +68,7 @@ Tor Browser 10.0 -- September 22 2020 * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser] * Bug 40106: Cannot install addons in full screen mode [tor-browser] * Bug 40109: Playing video breaks after reloading pages [tor-browser] - * Big 40119: Enable v3 extension blocklisting again [tor-browser] - * Translations update + * Bug 40119: Enable v3 extension blocklisting again [tor-browser] * Windows * Bug 33855: Don't use site's icon as window icon in Windows in private mode * Bug 40061: Omit the Windows default browser agent from the build [tor-browser]

1 0

[Git][tpo/applications/android-components] Deleted branch 40007
by Alex Catarineu 22 Sep '20

22 Sep '20

Alex Catarineu deleted branch 40007 at The Tor Project / Applications / android-components -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

Jump to page: