tbb-commits
Threads by month
- ----- 2026 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 21316 discussions
[tor-browser/tor-browser-88.0b4-10.5-1] Bug 31607: App menu items stop working on macOS
by sysrqb@torproject.org 19 Apr '21
by sysrqb@torproject.org 19 Apr '21
19 Apr '21
commit 873a2a8500178775f1138b377c2258b9a9064b2d
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Oct 3 10:53:43 2019 -0400
Bug 31607: App menu items stop working on macOS
Avoid re-creating the hidden window, since this causes the nsMenuBarX
object that is associated with the app menu to be freed (which in
turn causes all of the app menu items to stop working).
More detail: There should only be one hidden window.
XREMain::XRE_mainRun() contains an explicit call to create the
hidden window and that is the normal path by which it is created.
However, when Tor Launcher's wizard/progress window is opened during
startup, a hidden window is created earlier as a side effect of
calls to nsAppShellService::GetHiddenWindow(). Then, when
XREMain::XRE_mainRun() creates its hidden window, the original one
is freed which also causes the app menu's nsMenuBarX object which
is associated with that window to be destroyed. When that happens,
the menuGroupOwner property within each Cocoa menu items's MenuItemInfo
object is cleared. This breaks the link that is necessary for
NativeMenuItemTarget's menuItemHit method to dispatch a menu item
event.
---
xpfe/appshell/nsAppShellService.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
index c7c3da49d86e..1cb1c6f5a7f9 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -93,6 +93,10 @@ void nsAppShellService::EnsureHiddenWindow() {
NS_IMETHODIMP
nsAppShellService::CreateHiddenWindow() {
+ if (mHiddenWindow) {
+ return NS_OK;
+ }
+
if (!XRE_IsParentProcess()) {
return NS_ERROR_NOT_IMPLEMENTED;
}
1
0
[Git][tpo/applications/android-components][android-components-74.0.6-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel 19 Apr '21
by Matthew Finkel 19 Apr '21
19 Apr '21
Matthew Finkel pushed to branch android-components-74.0.6-10.5-1 at The Tor Project / Applications / android-components
Commits:
283e6c4b by Matthew Finkel at 2021-04-20T02:28:37+00:00
Bug 40005: Modify Default toolbar menu
- - - - -
e13c7ff9 by Alex Catarineu at 2021-04-20T02:28:37+00: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`.
- - - - -
65f9abf0 by Alex Catarineu at 2021-04-20T02:28:38+00:00
Bug 40002: Ensure system download manager is not used
- - - - -
5f17ce5f by Alex Catarineu at 2021-04-20T02:28:38+00:00
Bug 40009: Change the default search engines
This matches the search engines from desktop, that is:
DDG as the default, then YouTube, Google, DDGOnion,
Startpage, Twitter, Wikipedia and Yahoo.
- - - - -
0d7125a6 by Alex Catarineu at 2021-04-20T02:28:39+00:00
Modify Addon support
Bug 40011: Hide option for disallowing addons in private mode
Bug 40016: Allow inheriting from AddonCollectionProvider
This will allow implementing our own AddonsProvider in fenix.
- - - - -
3f1f2fc6 by Georg Koppen at 2021-04-20T02:28:39+00:00
Bug 40013: Add option do overwrite timestamp in extension version
- - - - -
1fd6b2b7 by Alex Catarineu at 2021-04-20T02:28:40+00:00
Bug 40015: Port padlock states for .onion services
- - - - -
001f280e by Alex Catarineu at 2021-04-20T02:28:40+00:00
Bug 40021: Force telemetry=false in Fennec settings migration
- - - - -
64a36949 by Alex Catarineu at 2021-04-20T02:28:41+00:00
Bug 40022: Migrate Tor security level from Fennec
- - - - -
9a622ba1 by Matthew Finkel at 2021-04-20T02:28:42+00:00
Modify Tracking Protection configuration
Bug 40020: Disable third-party cookies
Bug 40024: Disable tracking protection by default
- - - - -
51cf313c by Matthew Finkel at 2021-04-20T02:28:42+00:00
Bug 40023: Stop PrivateNotificationService
- - - - -
98991432 by Matthew Finkel at 2021-04-20T02:28:43+00:00
Add support for new GeckoView interfaces
Bug 40006: Expose Security Level interface
Bug 40019: Expose spoofEnglish pref
Bug 34439: Isolate Icon loader on Android
- - - - -
30 changed files:
- build.gradle
- components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
- components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
- components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
- components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
- components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
- components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
- components/browser/search/src/main/assets/search/list.json
- + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml
- components/browser/search/src/main/assets/searchplugins/ddg.xml
- + components/browser/search/src/main/assets/searchplugins/startpage.xml
- + components/browser/search/src/main/assets/searchplugins/yahoo.xml
- components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt
- components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt
- components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml
- components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml
- components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt
- components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt
- components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
- components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt
- components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt
- components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml
- 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/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
- components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt
The diff was not included because it is too large.
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
[Git][tpo/applications/fenix][tor-browser-88.0.0b4-10.5-1] 8 commits: Bug 40002: Add GitLab CI
by Matthew Finkel 19 Apr '21
by Matthew Finkel 19 Apr '21
19 Apr '21
Matthew Finkel pushed to branch tor-browser-88.0.0b4-10.5-1 at The Tor Project / Applications / fenix
Commits:
5338cbd3 by Matthew Finkel at 2021-04-06T22:08:25+00:00
Bug 40002: Add GitLab CI
Pin CI builds to runners with 32GB of RAM to avoid OOM conditions.
- - - - -
191a835d by Matthew Finkel at 2021-04-06T22:08:25+00:00
Rename as Tor Browser
Bug 40020: Change applicationId
Bug 40020: Change app name
Bug 40020: Change deeplink scheme
Bug 40020: Change App icons
Bug 40073: Use correct branding on About page
Bug 40088: Use Tor Browser logo in migration screen
- - - - -
805473e1 by Matthew Finkel at 2021-04-06T22:08:25+00:00
Disable features and functionality
Bug 33594: Disable data collection by default (Glean)
Bug 40019: Adjust is disabled on Release when data collection is disabled
Bug 34338: Disable the crash reporter
Bug 40014: Neuter Google Advertising ID
Bug 40018: Disable Push service
Bug 40034: Disable PWA onboading
Bug 40072: Disable Tracking Protection
Bug 40061: Do not show "Send to device" in sharing menu
Bug 40109: Reduce requested permissions
Exclude LOCATION and NETWORK_STATE
- - - - -
fa2eafbb by Georg Koppen at 2021-04-06T22:08:25+00:00
Modify build system
Bug 40083: Make locale ordering in BuildConfig deterministic
Bug 40042: Add option do overwrite timestamp in extension version
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.
Bug 40067: Fix reproducibility issue in classes2.dex
We make sure our MOZ_BUILD_DATE gets used as a source for showing date
related information on the Fenix about page.
Bug 40071: Show only supported locales
Bug 40064: Use Gecko Beta for Nightly and Debug variants
Bug 40123: Allow building the instrumented tests apks for variants other than debug
This allows to specify the variant of the instrumented tests via
a `testBuildType` gradle argument. It also applies a workaround for
a R8 issue from https://issuetracker.google.com/issues/140851070.
Bug 40143: Use deterministic date in Test apk
The build config was using Date() when generating the Test apk's
versionName.
- - - - -
47deabfc by Matthew Finkel at 2021-04-20T02:19:33+00:00
Add Tor integration and UI
Bug 40001: Start Tor as part of the Fenix initialization
Bug 40028: Implement Tor Service controller
Bug 40028: Integrate Tor Controller into HomeFragment
Bug 40028: Implement Tor connect and logger screens
Bug 40028: Implement Tor Onboarding
Bug 40028: Implement new home screen
Bug 40028: Define bootstrapping events and Quick Start
Bug 40041: Implement Tor Network Settings
Bug 40041: Integrate Tor Network Settings
- - - - -
f2645d89 by Alex Catarineu at 2021-04-20T02:19:33+00:00
Modify UI/UX
Bug 40015: Modify Home menu
Bug 40016: Hide unwanted Settings
Bug 40016: Modify Default toolbar menu
Bug 40016: Add Donate settings button
Bug 40016: Move Allow Screenshots under Advanced
Bug 40016: Don't install WebCompat webext
Bug 40016: Don't onboard Search Suggestions
Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment
Bug 40095: Hide "Sign in to sync" in bookmarks
Bug 40031: Hide Mozilla-specific items on About page
Bug 40032: Set usesCleartextTraffic as false
Bug 40063: Do not sort search engines alphabetically
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`.
Bug 34403: Disable Normal mode by default
Bug 40087: Implement a switch for english locale spoofing
Bug 40144: Hide Download Manager
Bug 40141: Hide EME site permission
- - - - -
16e71cc2 by Alex Catarineu at 2021-04-20T02:19:33+00:00
Modify Add-on support
Bug 40030: Install HTTPS Everywhere and NoScript addons on startup
HTTPS Everywhere is installed as a builtin extension and NoScript as
a regular AMO addon. To avoid unnecessary I/O we only install NoScript
the first time, and rely on the browser addon updating mechanism for
keeping up with new versions. This is the same behaviour that was
implemented in the Fennec-based Tor Browser, where it was installed
as a "distribution addon", which also only occurred once.
Bug 40062: HTTPS Everywhere is not shown as installed
Also 40070: Consider storing the list of recommended addons
This implements our own AddonsProvider, which loads the list of
available addons from assets instead of fetching it from an
endpoint. In this list, we replace https-everywhere by
our https-everywhere-eff, so that the EFF one is shown as installed
in the addons list and the AMO one is not displayed.
Also, we hide the uninstall button for builtin addons.
Bug 40058: Hide option for disallowing addon in private mode
- - - - -
81e94daa by Matthew Finkel at 2021-04-20T02:23:54+00:00
Add Security Level UI
Bug 40026: Implement Security Level settings
Bug 40026: Integrate Security Level settings
- - - - -
30 changed files:
- + .gitlab-ci.yml
- app/build.gradle
- app/proguard-rules.pro
- app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt
- − app/src/beta/res/drawable/ic_launcher_foreground.xml
- app/src/beta/res/mipmap-hdpi/ic_launcher.png
- app/src/beta/res/mipmap-mdpi/ic_launcher.png
- app/src/beta/res/mipmap-xhdpi/ic_launcher.png
- app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
- app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
- app/src/beta/res/values/static_strings.xml
- app/src/beta/res/xml/shortcuts.xml
- − app/src/debug/res/drawable/ic_launcher_foreground.xml
- app/src/debug/res/xml/shortcuts.xml
- app/src/main/AndroidManifest.xml
- + app/src/main/assets/allowed_addons.json
- 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/addons/InstalledAddonDetailsFragment.kt
- app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
- app/src/main/java/org/mozilla/fenix/components/Analytics.kt
- app/src/main/java/org/mozilla/fenix/components/Components.kt
- app/src/main/java/org/mozilla/fenix/components/Core.kt
- + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt
- + app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt
- app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt
- app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt
- app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
- app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/bcea234cee6b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/bcea234cee6b…
You're receiving this email because of your account on gitlab.torproject.org.
1
0
commit 54694e57164831ec0f170c42402090d8331be61c
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Apr 19 08:57:43 2021 +0000
Pick up rbm fix for rbm#40022
---
rbm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rbm b/rbm
index 1ebbf5e..4072294 160000
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 1ebbf5ee34239a58d91e59acd0c2c85e1900aceb
+Subproject commit 407229448b4e714b4761a1a4f73208170671087a
1
0
[rbm/master] Bug 40022: Use projects/common directory in input_files
by gk@torproject.org 19 Apr '21
by gk@torproject.org 19 Apr '21
19 Apr '21
commit 407229448b4e714b4761a1a4f73208170671087a
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Tue Apr 13 17:01:29 2021 +0200
Bug 40022: Use projects/common directory in input_files
---
lib/RBM.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/RBM.pm b/lib/RBM.pm
index a81a290..57b5dde 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -793,6 +793,7 @@ sub input_files {
goto RETURN_RES unless $input_files;
my $proj_dir = rbm_path(project_config($project, 'projects_dir', $options));
my $src_dir = "$proj_dir/$project";
+ my $common_dir = "$proj_dir/common";
my $old_cwd = getcwd;
chdir $src_dir || exit_error "cannot chdir to $src_dir";
foreach my $input_file_alias (@$input_files) {
@@ -883,7 +884,7 @@ sub input_files {
origin_project => $project, %$input_file})
if $input_file->{project};
exit_error("Missing filename:\n" . pp($input_file)) unless $name;
- my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir);
+ my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir, $common_dir);
my $file_gpg_id = gpg_id($t->('file_gpg_id'));
if (input_file_need_dl($input_file, $t, $fname, $action)) {
if ($t->('content')) {
@@ -911,7 +912,7 @@ sub input_files {
dd $input_file;
exit_error "Missing file $name";
}
- ($fname) = file_in_dir($name, $src_dir, $proj_out_dir);
+ ($fname) = file_in_dir($name, $src_dir, $proj_out_dir, $common_dir);
exit_error "Error getting file $name" unless $fname;
}
if ($action eq 'input_files_id') {
1
0
[tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.16
by sysrqb@torproject.org 16 Apr '21
by sysrqb@torproject.org 16 Apr '21
16 Apr '21
commit 67473253d678b22f0102dac6c370c8ac38e1048d
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Apr 15 03:49:57 2021 +0000
Release preparation for 10.0.16
Versions bump and Changelog update
---
projects/firefox/config | 4 ++--
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++
projects/tor-browser/config | 4 ++--
projects/tor-launcher/config | 2 +-
rbm.conf | 4 ++--
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index 22b491c..e5baf06 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
git_submodule: 1
gpg_keyring: torbutton.gpg
var:
- firefox_platform_version: 78.9.0
+ firefox_platform_version: 78.10.0
firefox_version: '[% c("var/firefox_platform_version") %]esr'
torbrowser_branch: 10.0
branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 924c893..59c6316 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,11 @@
+Tor Browser 10.0.16 -- April 20 2021
+ * Windows + OS X + Linux
+ * Update Firefox to 78.10.0esr
+ * Update NoScript to 11.2.4
+ * Bug 40007: Update domain fronting config for Moat [tor-launcher]
+ * Bug 40390: Add Burmese as a new locale [tor-browser]
+ * Bug 40408: Disallow SVG Context Paint in all web content [tor-browser]
+
Tor Browser 10.0.15 -- March 26 2021
* Windows + OS X + Linux
* Update Openssl to 1.1.1k
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 20d920d..2c4575c 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -77,9 +77,9 @@ input_files:
enable: '[% c("var/snowflake") && ! c("var/android") %]'
- filename: Bundle-Data
enable: '[% ! c("var/android") %]'
- - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
+ - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
name: noscript
- sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae
+ sha256sum: 278ee526d7c3ce5236c1a04aa5b6605c81b82399b846e43cdf6f93f11fef1ec9
- filename: 'RelativeLink/start-tor-browser.desktop'
enable: '[% c("var/linux") %]'
- filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 0c9698a..1ebf3e1 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 0.2.26
+version: 0.2.28
git_url: https://git.torproject.org/tor-launcher.git
git_hash: '[% c("version") %]'
gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index 56f2cd7..e40f731 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,11 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '10.0.15'
+ torbrowser_version: '10.0.16'
torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 10.0.12
- 10.0.14
+ - 10.0.15
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0
[tor-browser-build/maint-10.0-android] Bug 40268: Add Burmese (my) as a locale
by boklm@torproject.org 15 Apr '21
by boklm@torproject.org 15 Apr '21
15 Apr '21
commit ce84f0c196f010996904714d055e2d3741c9c63e
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Apr 7 15:35:07 2021 +0000
Bug 40268: Add Burmese (my) as a locale
Backported in Bug 40278
---
rbm.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rbm.conf b/rbm.conf
index 7546f1f..cbc705a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -86,6 +86,7 @@ var:
- lt
- mk
- ms
+ - my
- nb-NO
- nl
- pl
@@ -119,6 +120,7 @@ var:
- ka
- ko
- lt
+ - my
- nb-rNO
- nl
- pl
1
0
[tor-browser-build/maint-10.0-desktop] Bug 40268: Add Burmese (my) as a locale
by boklm@torproject.org 15 Apr '21
by boklm@torproject.org 15 Apr '21
15 Apr '21
commit d5c080f0c1eb3c49d15a0e2e76274035f0b4a9ad
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Apr 7 15:35:07 2021 +0000
Bug 40268: Add Burmese (my) as a locale
Backported in Bug 40277
---
rbm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/rbm.conf b/rbm.conf
index 6cdedde..56f2cd7 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -87,6 +87,7 @@ var:
- lt
- mk
- ms
+ - my
- nb-NO
- nl
- pl
1
0
[tor-browser/tor-browser-78.10.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb@torproject.org 15 Apr '21
by sysrqb@torproject.org 15 Apr '21
15 Apr '21
commit da7e5f4c2ce2e427f4db2f8e72989feafef2c8ab
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Apr 15 14:56:07 2021 +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 a9372507c5c0..8a1913cdda9d 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit a9372507c5c035aa94109223302f1c3e77932baa
+Subproject commit 8a1913cdda9d5f263596b47d7d77386452236dd0
1
0
15 Apr '21
commit 8a1913cdda9d5f263596b47d7d77386452236dd0
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Apr 7 15:23:38 2021 +0000
Bug 40033: Add Burmese (my) as a locale
Backported in Bug 40034
---
chrome/locale/my/aboutDialog.dtd | 19 +++
chrome/locale/my/aboutTBUpdate.dtd | 8 ++
chrome/locale/my/aboutTor.dtd | 56 +++------
chrome/locale/my/brand.dtd | 17 ++-
chrome/locale/my/brand.properties | 19 +--
chrome/locale/my/branding/tor-browser-brand.ftl | 12 +-
chrome/locale/my/browserOnboarding.properties | 72 +++++++++++
chrome/locale/my/torbutton.dtd | 51 ++++++--
chrome/locale/my/torbutton.properties | 155 +++++++++++++++++++++---
import-translations.sh | 2 +-
jar.mn | 2 +
11 files changed, 328 insertions(+), 85 deletions(-)
diff --git a/chrome/locale/my/aboutDialog.dtd b/chrome/locale/my/aboutDialog.dtd
new file mode 100644
index 00000000..74eef2f4
--- /dev/null
+++ b/chrome/locale/my/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start "&brandShortName; ááᯠáááºáá®ážáá°ááẠ">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink "&vendorShortName;">
+<!ENTITY project.end "á áááºážááẠá¡áœááºááá¯ááºážáá±á«áºááœáẠáááºá áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž ááŸáá·áº ááœááºáááºááœáá·áºááᯠáá¯áá¶áá¬ááœááºááẠáá¯ááºáá±á¬ááºáá±á¬ á¡áá»áá¯ážá¡ááŒááºááá°áá±á¬ á¡ááœá²á·á¡á
ááºážáá
áºáá¯ááŒá
áºáááºá">
+
+<!ENTITY help.start "áá°áá®áá»ááºáá«ááá¬áž?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink "ááŸá°áá«ááºážáááº">
+<!ENTITY help.or "ááá¯á·ááá¯ááº">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink "áá«áááºáá¯ááºáá±á¬ááºáááº">
+<!ENTITY help.end "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions "áá±ážá
áá¬áá»á¬ážááŸááŠážááá¬áž?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow "Tor ááœááºáááºááᯠááŒá®ážááœá¬ážáááºáá°áá®áá«!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license "ááá¯ááºá
ááºá¡ááŒá±á¬ááºáž áááá±á¬ááºážá
áá¬">
+<!ENTITY tor.TrademarkStatement ""Tor" ááŸáá·áº "Onion Logo" (ááŒááºááœááºáá®á¡ááŸááºáá¶ááááºáááºá¹áá±á) ááẠTor Project, Inc. áááŸááºáá¯á¶áááºáá¬ážáá±á¬áá¯ááºá¡ááŸááºáá¶ááááºááŒá
áºáááºá">
diff --git a/chrome/locale/my/aboutTBUpdate.dtd b/chrome/locale/my/aboutTBUpdate.dtd
new file mode 100644
index 00000000..3878e860
--- /dev/null
+++ b/chrome/locale/my/aboutTBUpdate.dtd
@@ -0,0 +1,8 @@
+<!ENTITY aboutTBUpdate.changelogTitle "Tor ááá±á¬ááºáᬠChangeLog (ááŒá±á¬ááºážáá²ááŸá¯ááŸááºáááºáž)">
+<!ENTITY aboutTBUpdate.updated "Tor ááá±á¬ááºáá¬ááᯠá¡ááºááááºááŒá¯áá¯ááºáá¬ážáááºá">
+<!ENTITY aboutTBUpdate.linkPrefix "á€áá¯ááºááœáŸááºááŸá¯ááŸáá·áº áááºáááºá áá±á¬ááºáá¯á¶ážáá±á«áº ááááºážá¡áá»ááºá¡áááºáá»á¬ážá¡ááœááº">
+<!ENTITY aboutTBUpdate.linkLabel "áá»áœááºá¯ááºááá¯á·ááááºááºááá¯ááºááá¯á· áááºáá±á¬ááºááŒáá·áºááŸá¯áá«">
+<!ENTITY aboutTBUpdate.linkSuffix "á">
+<!ENTITY aboutTBUpdate.version "áá¬ážááŸááºáž">
+<!ENTITY aboutTBUpdate.releaseDate "ááŒááºá·áá»á®áááºá·áááºá
áœá²">
+<!ENTITY aboutTBUpdate.releaseNotes "ááŒáá·áºáá»á®ááŸááºáá»ááºáá»á¬áž">
diff --git a/chrome/locale/my/aboutTor.dtd b/chrome/locale/my/aboutTor.dtd
index 9f14022b..bdde5b28 100644
--- a/chrome/locale/my/aboutTor.dtd
+++ b/chrome/locale/my/aboutTor.dtd
@@ -1,47 +1,31 @@
<!--
- - Copyright (c) 2014, The Tor Project, Inc.
+ - Copyright (c) 2019, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Tor á¡ááŒá±á¬ááºáž">
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.viewChangelog.label "ááŒá±á¬ááºážáá²ááŸááºáááºáž ááŒááºá·áááº">
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.ready.label "áá¯á¶ááŒá¯á¶á
áœá¬ áá¯á¶ážá
áœá²áá«á">
+<!ENTITY aboutTor.ready2.label "áááºááẠá¡ááºáá¬áááºááᯠá¡áá¯á¶ááŒá¯á¶áá¯á¶ážá
áœá¬ áá¯á¶ážá
áœá²ááá¯á· á¡áááºáááºá·ááŒá
áºáá«ááŒá®á">
+<!ENTITY aboutTor.failure.label "áá
áºáá¯áᯠááŸá¬ážááœááºážááœá¬ážáá«áááº!">
+<!ENTITY aboutTor.failure2.label "ဠááá±á¬ááºáá¬ááœáẠTor á¡áá¯ááºááá¯ááºáá«á">
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.search.label "DuckDuckGo ááŒááºá· ááŸá¬ááœá±áááº">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "áá±ážá
áá¬áá»á¬áž ááŸááŠážááá¬áž?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "áá»áœááºá¯ááºááá¯á· Tor ááá±á¬ááºáᬠáááºá
áœá²á
á¬á¡á¯ááºá¡á¬áž ááŒáá·áºááŒááºá·á᫠»">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor ááá±á¬ááºáᬠáááºá
áœá²á
á¬á¡á¯ááº">
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
+<!ENTITY aboutTor.tor_mission.label "Tor Project ááẠáá°á·á¡ááœááºá·á¡áá±ážááŸááºá· ááœááºáááºáá±ážááœááºá·áá»á¬ážááᯠááá¯ážáááºá
á±ááẠá¡áá±ááááẠá¡áá»áá¯ážá¡ááŒááºááá°áá±á¬ á
áá(á)(á) á¡ááœá²á·á¡á
ááºážáá
áºáᯠááŒá
áºáá«áááºá ááœááºáááºá á¡áááºááŸááºáᬠá¡áá»á¬ážáá¯á¶ážááá¯ááºááŒá®áž áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±ážá
á±á¬ááºá·ááŸá±á¬ááºáá±á¬ áááºážááá¬áá»á¬áž á¡áá¯á¶ážááŒá¯áá«áááºá áááºážáááºážááá¬áá»á¬ážááᯠá¡áááºá·á¡áááºáááŸáá
áœá¬ áá¯á¶ážá
áœá²ááá¯ááºááŒááºážááŸááºá· áááá¹áá¶ááá¯ááºáá¬ááŸááºá· ááŒááºáá°áá»á¬ážáá¬ážáááºááá¯ááºá
á±ááẠáá¶á·
ááá¯ážáá±á¬ááºáá¶á·áá«áááºá">
+<!ENTITY aboutTor.getInvolved.label "áá«áááºá᫠»">
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
+<!ENTITY aboutTor.newsletter.tagline "Tor á០áá±á¬ááºáá¯á¶ážááááºážáá»á¬ážááᯠáááºá· á
á¬áááºáá¯á¶ážáá²áááºáž ááá°ááá¯ááºáá«á">
+<!ENTITY aboutTor.newsletter.link_text "Tor News ááááºážáá»á¬ážá¡ááœáẠá¡ááẠá
á¬áááºážááœááºážááá¯ááºáá«á">
+<!ENTITY aboutTor.donationBanner.freeToUse "Tor ááẠáááºá·ááᯠáá¯á¶ážáá°áá»á¬ážá០ááŸá°áá«ááºážááœá±ááŒá±á¬ááºá· á¡ááá²á·áá¯á¶ážááá¯ááºáá«áááºá">
+<!ENTITY aboutTor.donationBanner.buttonA "á¡áá¯áá² ááŸá°áááº">
diff --git a/chrome/locale/my/brand.dtd b/chrome/locale/my/brand.dtd
index 6b072f5c..6df03e49 100644
--- a/chrome/locale/my/brand.dtd
+++ b/chrome/locale/my/brand.dtd
@@ -2,11 +2,18 @@
- 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/. -->
-<!ENTITY brandShortName "Tor Browser">
-<!ENTITY brandFullName "Tor Browser">
-<!ENTITY vendorShortName "Tor Project">
-<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
+<!ENTITY brandShorterName "Tor ááá±á¬ááºáá¬">
+<!ENTITY brandShortName "Tor ááá±á¬ááºáá¬">
+<!ENTITY brandFullName "Tor ááá±á¬ááºáá¬">
+<!ENTITY vendorShortName "Tor á
á®áá¶ááááºáž ááá±á¬áá»ááº">
+<!ENTITY trademarkInfo.part1 ""Tor" ááŸáá·áº "Onion Logo" (ááŒááºááœááºáá®á¡ááŸááºáá¶ááááºáááºá¹áá±á) ááẠTor Project, Inc. á ááŸááºáá¯á¶áááºáá¬ážáá±á¬ áá¯ááºá¡ááŸááºáá¶ááááºááŒá
áºáááºá">
<!-- LOCALIZATION NOTE (brandProductName):
This brand name can be used in messages where the product name needs to
remain unchanged across different versions (Nightly, Beta, etc.). -->
-<!ENTITY brandProductName "Tor Browser">
+<!ENTITY brandProductName "Tor ááá±á¬ááºáá¬">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "áááºááœááºážáá¬ážáá±á¬ áááºááá¯ážá
áá
áºáá±á¬á·áá²áá»á¬ážááᯠáááºáá¯á¶ážááẠááŸáááºáá«">
+<!ENTITY plugins.installed.enable "áááºááá¯áž áá±á¬á·áá²áá»á¬áž ááœááºá·áááº">
+<!ENTITY plugins.installed.disable "áááºááá¯áž áá±á¬á·áá²áá»á¬áž ááááºáááº">
+<!ENTITY plugins.installed.disable.tip "áááºááá¯ážá
áá
áºáá±á¬á·áá²áá»á¬ážááᯠáááºáá¯á¶ážááŒááºážááŸâ ááŸá±á¬ááºááŒá¥áºááẠááŸáááºáá«">
diff --git a/chrome/locale/my/brand.properties b/chrome/locale/my/brand.properties
index 1ba6ed31..385dab96 100644
--- a/chrome/locale/my/brand.properties
+++ b/chrome/locale/my/brand.properties
@@ -2,18 +2,19 @@
# 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/.
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShorterName=Tor ááá±á¬ááºáá¬
+brandShortName=Tor ááá±á¬ááºáá¬
+brandFullName=Tor ááá±á¬ááºáá¬
# LOCALIZATION NOTE(brandProductName):
# This brand name can be used in messages where the product name needs to
# remain unchanged across different versions (Nightly, Beta, etc.).
-brandProductName=Tor Browser
-vendorShortName=Tor Project
+brandProductName=Tor ááá±á¬ááºáá¬
+vendorShortName=Tor á
á®áá¶ááááºáž ááá±á¬áá»ááº
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Startá ááŸá¬ááœá±ááẠáááááá¬ááœááºážáá¬ážááŒá®áž áá»ááºááŒááºáá±á¬ áááºáá
á¬áá»ááºááŸá¬
+homePageImport=%S áá¶á០áááºá· áááºáá
á¬áá»ááºááŸá¬ áááºááœááºážáá«
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=áááºá á
á¬áá»ááºááŸá¬ ááœá±ážáá»ááºááŸá¯
+homePageMigrationDescription=áááºáá¯á¶ážááá¯áá±á¬ áááºáá
á¬áá»ááºááŸá¬ááᯠááœá±ážáá±ážáá« -
-syncBrandShortName=Sync
+syncBrandShortName=ááá¯ááºááá¯ááºááŸááá°áááº
diff --git a/chrome/locale/my/branding/tor-browser-brand.ftl b/chrome/locale/my/branding/tor-browser-brand.ftl
index af1fd648..d859549c 100644
--- a/chrome/locale/my/branding/tor-browser-brand.ftl
+++ b/chrome/locale/my/branding/tor-browser-brand.ftl
@@ -2,11 +2,11 @@
# that is used by Firefox) to avoid picking up the -brand-short-name values
# that Mozilla includes in the Firefox language packs.
--brand-shorter-name = Tor Browser
--brand-short-name = Tor Browser
--brand-full-name = Tor Browser
+-brand-shorter-name = Tor ááá±á¬ááºáá¬
+-brand-short-name = Tor ááá±á¬ááºáá¬
+-brand-full-name = Tor ááá±á¬ááºáá¬
# This brand name can be used in messages where the product name needs to
# remain unchanged across different versions (Nightly, Beta, etc.).
--brand-product-name = Tor Browser
--vendor-short-name = Tor Project
-trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
+-brand-product-name = Tor ááá±á¬ááºáá¬
+-vendor-short-name = Tor á
á®áá¶ááááºáž ááá±á¬áá»ááº
+trademarkInfo = 'Tor' ááŸáá·áº 'Onion Logo' (ááŒááºááœááºáá®á¡ááŸááºáá¶ááááºáááºá¹áá±á) ááẠTor Project, Inc. á ááŸááºáá¯á¶áááºáá¬ážáá±á¬ áá¯ááºá¡ááŸááºáá¶ááááºááŒá
áºáááºá
diff --git a/chrome/locale/my/browserOnboarding.properties b/chrome/locale/my/browserOnboarding.properties
new file mode 100644
index 00000000..1dbe28c9
--- /dev/null
+++ b/chrome/locale/my/browserOnboarding.properties
@@ -0,0 +1,72 @@
+# Copyright (c) 2019, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=ááŒáá¯ááá¯áá«áááº
+onboarding.tour-tor-welcome.title=ááẠá¡áááºáááºá·ááŒá
áºáá«ááŒá®á
+onboarding.tour-tor-welcome.description=Tor ááá±á¬ááºáá¬ááẠá¡ááºáá¬áááºáá¯á¶ážá
áœá²á
á¥áº á¡ááŒááºá·áá¯á¶áž áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶ááŸá¯á¡á¬áž áá±ážááá¯á·áá«áááºá áááºá· á¡áœááºááá¯ááºážááŒá±áá¬ááá¯ááºáá¶áááŒááºážá á
á±á¬ááºá·ááŒááºá·áá¶áááŒááºáž ááŸááºá· áááºáá¬áá¶áááŒááºážááá¯á·á០ááá¯áá¬ááœááºáá¬ážáá±ážáá«áááºá ဠáááºážááœáŸááºááá¯ááẠáááºá·á¡á¬ážáááºáá²á·ááá¯á· áá¬ááœááºáá±ážáááºááᯠááŸááºážááŒáá«áááºá
+onboarding.tour-tor-welcome.next-button=áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž ááá¯á·ááœá¬ážáááº
+
+onboarding.tour-tor-privacy=áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž
+onboarding.tour-tor-privacy.title=áááºá· á¡áœááºááá¯ááºážááŒá±áá¬ááá¯ááºáá°áá»á¬ážááŸááºá· ááá±á¬ááºáá»á¬ážááᯠáááºáá»áá«á
+onboarding.tour-tor-privacy.description=Tor ááá±á¬ááºáá¬ááẠááœááºáá®ážáá»á¬ážááᯠáá®ážááŒá¬ážá
áœá¬áá¬ážá áááºá· ááá±á¬ááºáᬠáá¬ááááºá¡á¬áž áááºá¡áá¯á¶ážááŒá¯ááŒá®ážáá»áŸáẠáá»ááºááááºážáá±ážáá«áááºá á€áá¯ááºáá±á¬ááºááŸá¯áá»á¬ážááẠááá±á¬ááºáá¬á¡ááœááºážááŸá áááºá·áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶ááŸá¯ááᯠá
á±á¬ááºá·ááŸá±á¬ááºáá±ážáá«áááºá "Tor ááœááºáááº" ááá¯ááŸáááºá áá»áœááºá¯ááºááá¯á·á០ááœááºáááºá¡áááºá·ááœáẠáááºá·ááá¯áááºáá²á·ááá¯á· áá¬ááœááºááŸá¯áá±ážáááºááᯠáá±á·áá¬áá«á
+onboarding.tour-tor-privacy.button=Tor ááœááºááẠááá¯á·ááœá¬ážáááº
+
+onboarding.tour-tor-network=Tor ááœááºáááº
+onboarding.tour-tor-network.title=áááá¯ááááºážáá»á¯ááºááŸá¯ áááŸááá±á¬ ááœááºáááºáá±á«áº áááºááá¯ááºáá«á
+onboarding.tour-tor-network.description=ááá¹áá¬á¡ááŸá¶á·ááŸá áá¯ááºá¡á¬ážáá±ážáá°áá»á¬ážá០áááºáááºáá±ážáá±á¬ Tor ááœááºáááºááᯠáááºááŸááºá· Tor ááá±á¬ááºáá¬á០áá»áááºáá±ážáá«áááºá á¡ááºáá¬áááºááᯠáá¯á¶ááŒá¯á¶á
áœá¬áá¶á
á¬ážááá¯ááºáááºá¡ááœáẠVPN ááŸááºá·ááá°áá² áá»ááºááœááºááŸá¯áááŸááá« ááá¯á·ááá¯áẠáááá¯áá»á¯ááºá¡áá¬áá
áºáá¯á¡á¬áž áá¯á¶ááŒááºáááºáááá¯áá«á
+onboarding.tour-tor-network.description-para2=á¡áá
Ạ- Tor ááœááºááẠá¡ááŒááºá¡áááºáá»á¬ážááᯠáá»áááºááŸááá»ááºáá»á¬áž (âPreferences) ááá¯áááºá· ááá¹áááœáẠááœá±á·ááŸáááá¯ááºáá«áááºá (á¡áá»ááºážáá»ááºážáá»áááºáááºá áá»áœá±áá¬ááŒááºážáá¯ááºá
á¥áºáá»á¬áž (bridges) áá±á¬ááºážááá¯ááá¯ááºááŒááºáž á¡áá«á¡áááº)
+onboarding.tour-tor-network.action-button=áááºá· Tor ááœááºááẠá¡ááŒááºá¡áááºáá»á¬áž áá»áááºááŸááá«
+onboarding.tour-tor-network.button=áááºážááŒá±á¬ááºážá
á¥áº ááá¯á·ááœá¬ážáááº
+
+onboarding.tour-tor-circuit-display=áááºážááŒá±á¬ááºážá
á¥áº
+onboarding.tour-tor-circuit-display.title=áááºá·áááºážááŒá±á¬ááºážááᯠááŒááºá·áá«á
+onboarding.tour-tor-circuit-display.description=áááºáááºáá±á¬ááºááŒááºá·ááŸá¯áááºá· ááá¯ááááºážáá
áºáá¯áá»ááºážá
á®á¡ááœáẠáááºá·á¡ááœá¬ážá¡áá¬áá»á¬ážááᯠáááºáááºá·áááºážá ááá¹áá¬á¡ááŸá¶á·ááŸáâ Tor áááºážááŒá±á¬ááºáž á áá¯áá±á«áºá áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºáá«áááºáâ áááºáááºáááºá·áá±áá¬á០áááºááœááºáá±áááºááᯠáááºáááºá·áááºááá¯ááºááá»áŸ ááááá«á áá»áœááºá¯ááºááá¯á·á áááºážááŒá±á¬ááºážá
á¥áºááŸá "á€ááá¯ááºá¡ááœáẠáááºážááŒá±á¬ááºážá¡áá
áº" ááᯠááŸáááºá áááºážááŒá±á¬ááºážá¡áá
áºááᯠáááºáá±á¬ááºážááá¯ááá¯ááºáá«áááºá
+onboarding.tour-tor-circuit-display.button=áá»áœááºá¯ááºá áááºážááŒá±á¬ááºážááŒááºá·áááº
+onboarding.tour-tor-circuit-display.next-button=áá¯á¶ááŒá¯á¶áá±áž ááá¯á·ááœá¬ážáááº
+
+onboarding.tour-tor-security=áá¯á¶ááŒá¯á¶áá±áž
+onboarding.tour-tor-security.title=áááºá· á¡ááœá±á·á¡ááŒá¯á¶ááᯠááœá±ážáá«á
+onboarding.tour-tor-security.description=áá»áœááºá¯ááºááá¯á·ááẠáááºá· ááá±á¬ááºáá¬áá¯á¶ááŒá¯á¶ááŸá¯ááᯠááá¯ááá¯áá¯á¶ááŒá¯á¶á
á±ááẠáááºá·á¡á¬áž á¡ááá¯á¡ááŒááºá¡áááºáá»á¬ážááŸááá«áááºá áá»áœááºá¯ááºááá¯á·á áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬ážááẠáááºá·ááœááºáá»á°áá¬ááᯠááá¯ááºááá¯ááºááá¯ááºáá±á¬ á¡áá¬áá»á¬ážááᯠááááºáááºááá¯ááºáá«áááºá á¡á±á¬ááºááœáẠááŸáááºá áááºááá¯á· ááŒááºáááºááá¯ááºááẠáá±á·áá¬áá«á
+onboarding.tour-tor-security.description-suffix=ááŸááºáá»áẠ- NoScript ááŸááºá· HTTPS Everywhere ááá¯áá±á¬ áááºááá¯ážáá±á¬á·áá²áá»á¬ážááẠáááááá¬á¡á¶áá²ááœáẠáá°áááŒááºáááºááŸá¯á¡á ááá«áá«á ááá¯á·áá±á¬áºáºáááºáž áááºá០áááááá¬á¡á¶ááᯠá
áááºááŒáá¯ááºá
áœá¬ ááŒá±á¬ááºážá áááºážááá¯á·ááᯠáá±á«ááºážáááºá·ááá¯ááºáá«áááºá
+onboarding.tour-tor-security-level.button=áááºá· áá¯á¶ááŒá¯á¶áá±ážá¡áááºá·ááᯠááŒááºá·áááº
+onboarding.tour-tor-security-level.next-button=á¡ááœá±á·á¡ááŒá¯á¶ á¡ááŒá¶áá±ážáá»ááºáá»á¬ážááá¯á· ááœá¬ážáááº
+
+onboarding.tour-tor-expect-differences=á¡ááœá±á·á¡ááŒá¯á¶ á¡ááŒá¶áá±ážáá»ááºáá»á¬áž
+onboarding.tour-tor-expect-differences.title=á¡áá»áá¯á·ááœá¬ááŒá¬ážááŸá¯áá»á¬áž áá»áŸá±á¬áºáááºá·áá¬ážáá«á
+onboarding.tour-tor-expect-differences.description=Tor á០áá¶á·ááá¯ážáá±ážáá¬ážáá±á¬ áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž á¡ááºá¹áá«áááºáá»á¬ážááŒá±á¬ááºá· áááºá¡ááºáá¬áááºáá¯á¶ážá
áœá²áá±á¬ á¡ááœá±á·á¡ááŒá¯á¶ááẠáá¬áááºááẠááœá¬ááŒá¬ážááá¯ááºáá«áááºá áááºá· áá¯á¶ááŒá¯á¶áá±ážá¡áááºá·áá±á«áºáá°áááºá áááºááá¯ááºá¡áá¬áá»á¬áž áááºááŒááŒááºážááẠááá¯ááŸá±ážááá¯ááºáá«áááºá á¡áá»áá¯á·á¡áá¬áá»á¬ážááẠá¡áá¯ááºááá¯ááºááŒááºáž ááá¯á·ááá¯áẠááááºááŒááá¯ááºááŒááºáž ááá¯á·ááŒá
áºáááºáá«áááºá áááºááẠáá°áá¯ááºááá¯ááºáááºááᯠá
á
áºáá±ážááŸá¯áá¶áááá¯ááºáá«á
ááºá
+onboarding.tour-tor-expect-differences.button=áá±ážáá±á·áá±ážáááŸááá±á¬ áá±ážááœááºážáá»á¬áž áááºáááº
+onboarding.tour-tor-expect-differences.next-button=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž ááá¯á·ááœá¬ážáááº
+
+onboarding.tour-tor-onion-services=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž
+onboarding.tour-tor-onion-services.title=á¡ááá¯áá¬ááœááºááŸá¯áá¶áá¬ážáá«á
+onboarding.tour-tor-onion-services.description= Onion áááºáá±á¬ááºááŸá¯áá»á¬ážááẠ.onion ááŸááºá· áá¯á¶ážáááºá· áááºááá¯ááºáá»á¬ážááŒá
áºáá«áááºá áááºážáááºáá±á¬ááºááŸá¯áá»á¬ážááẠáá¯ááºáá±áá°áá»á¬ážááŸááºá· áá¯á¶ážá
áœá²áá°áá»á¬ážááᯠá¡ááá¯áá¬ááœááºááŸá¯áá»á¬ážáá±ážáááºá·á¡ááŒáẠáááºáá¬áá¶áááŒááºážááá¯á·ááá¯áááºáž áááºá·áá»ááºááẠá¡áá¬ááœááºááŸá¯áá»á¬ážáááºážáá«áááºáá«áááºá Onion áááºáá±á¬ááºááŸá¯áá»á¬ážááẠáááºáá°ááá¯áááᯠá¡áááºááá±á«áºáá² á¡ááŒá±á¬ááºážá¡áá¬áá»á¬áž ááŸááºá· á¡ááŒá¬ážáááºáá±á¬ááºááŸá¯áá»á¬áž áá¯ááºáá±ááá¯ááºááẠá¡ááœááºá·áá
áºážáá±ážáá«áááºá á¡á±á¬ááºááœáẠááŸáááºá DuckDuckGo onion ááá¯ááºá¡á¬ážáááºáá±á·áá¬áá«á
+onboarding.tour-tor-onion-services.button=Onion ááá¯á·áááºáá±á¬ááºáá«
+onboarding.tour-tor-onion-services.next-button=ááŒá®ážááœá¬ážááŒá®
+
+onboarding.overlay-icon-tooltip-updated2=%S ááœááº\náá¬áá°ážááŒá¬ážáá»ááºááŸááá²ááŒááºá·áá«
+onboarding.tour-tor-update.prefix-new=á¡áá
áº
+onboarding.tour-tor-update.prefix-updated=á¡ááºááááºáá¯ááºááŒá®áž
+
+onboarding.tour-tor-toolbar=áááááá¬á¡á¶ toolbar
+onboarding.tour-tor-toolbar-update-9.0.title=ááœááºááá¯áẠOnion ááá¯ááºá
+onboarding.tour-tor-toolbar-update-9.0.description=áá»áœááºá¯ááºááá¯á·á០ááẠTor á¡áá¯á¶ážááŒá¯ááŒááºáž á¡ááœá±á·á¡ááŒá¯á¶ááᯠTor ááá±á¬ááºáá¬á¡áá²á á¡ááŒááºá·á¡á áá±á«ááºážá
ááºážáá¬ážá
á±áá»ááºáá«áááºá
+onboarding.tour-tor-toolbar-update-9.0.description-para2=á¡á²á·áá«ááŒá±á¬ááºá· onion ááá¯ááºáá¯á¶ážáááºá·á¡á
á¬áž áááºááẠáááºá· Tor áááºážááŒá±á¬ááºážááᯠ[i] URL á¡ááœááºááœáẠááœá±á·ááŸáááá¯ááºááŒá®áž áááááá¬á¡á¶ (toolbar) ááá¯áẠááá¯á·ááá¯áẠ[â¡] áá®áá°áž áá¯á¶ážá á¡áá±á¬ááºá¡áá¬ážá¡áá
áºááᯠáá±á¬ááºážááá¯ááá¯ááºáá«áááºá
+onboarding.tour-tor-toolbar-update-9.0.button=á¡áá±á¬ááºá¡áá¬ážá¡áá
Ạáááºááá¯á· áá±á¬ááºážááá¯ááááºáááºáž
+onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ááœááºáááºáá±á«áº ááá¯á·ááœá¬ážáá«
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=ááŸá±á·áááºáááº
+onboarding.tor-circuit-display.done=ááŒá®ážááœá¬ážááŒá®
+onboarding.tor-circuit-display.one-of-three=á áá¯á០á áá¯
+onboarding.tor-circuit-display.two-of-three=á áá¯á០á áá¯
+onboarding.tor-circuit-display.three-of-three=á áá¯á០á áá¯
+
+onboarding.tor-circuit-display.intro.title=áááºážááŒá±á¬ááºážá
á¥áºáá»á¬áž áááºáá²á·ááá¯á· á¡áá¯ááºáá¯ááºááááºáž?
+onboarding.tor-circuit-display.intro.msg=áá¬ážáá
áºáááºážááŒá±á¬ááºážáá»á¬ážááẠáá»áááºážáááºááŸááºáá¬ážáá±á¬ áááºáááºá·áááºážááŒááºážáá»á¬ážááŒááºá· áááºáá±á¬ááºáá¬ážáá«áááºá áááºážáááºáááºá·áááºážááŸá¯áá»á¬ážááẠááá¹áá¬á¡ááŸá¶á·ááŸá Tor á¡ááœá¬ážá¡áá¬áá»á¬ážááᯠáááºáááºá·áááºážááá¯ááºááẠáá»áááºááŸááá¬ážáááºá· ááœááºáá»á°áá¬áá»á¬ážááŒá
áºáá«áááºá áá¬ážáá
áºáááºážááŒá±á¬ááºážáá»á¬ážáááºÂ áááºá·ááᯠá¡ááºáá¬áááºáá¯á¶ááŒá¯á¶á
áœá¬áá¯á¶ážá
áœá²ááá¯ááºá
á±áááºááŸááºá· onion áááºáá±á¬ááºááŸá¯áá»á¬ážááŸááºá· áá»áááºáááºá
á±ááá¯ááºáá«áááºá
+
+onboarding.tor-circuit-display.diagram.title=áááºážááŒá±á¬ááºážá
á¥áº
+onboarding.tor-circuit-display.diagram.msg=á€áá¯á¶ááẠáááºážáááºááá¯ááºá¡ááœáẠáááºážááŒá±á¬ááºážá
á¥áºáá±ážáá±á¬ áááºáááºá·áááºážááŸá¯ááá¯á·ááᯠááŒááá«áááºá áááºááá¯ááºáá»á¬áž á¡áá»ááºážáá»ááºáž áá»áááºáááºááŒááºážáá»á¬ážááᯠáá¬ážááŒá
áºááẠáááºááá¯ááºáá
áºáá¯ááᯠááá°áá®áá±á¬ áááºážááŒá±á¬ááºážáá
áºáá¯á
á®áᬠáááŸááá«áááºá
+
+onboarding.tor-circuit-display.new-circuit.title=ááẠáááºážááŒá±á¬ááºážá¡áá
Ạááá¯á¡ááºáá«ááá¬áž?
+onboarding.tor-circuit-display.new-circuit.msg=áááºáááºáá±á¬ááºááẠááŒáá¯ážá
á¬ážáá±áá±á¬ áááºááá¯ááºááŸááºá· áá»áááºáááºááááá»áŸáẠáááºááẠá€ááá¯ááºá¡á¬ážá¡áá¯á¶ážááŒá¯á áááºááá¯ááºá¡á¬áž áááºážááŒá±á¬ááºážá¡áá
áºááŒááºá· ááŒááºáááºááá¯ááºáá«áááºá
diff --git a/chrome/locale/my/torbutton.dtd b/chrome/locale/my/torbutton.dtd
index eed16215..8f54338e 100644
--- a/chrome/locale/my/torbutton.dtd
+++ b/chrome/locale/my/torbutton.dtd
@@ -1,11 +1,15 @@
<!ENTITY torbutton.context_menu.new_identity "á¡áá±á¬ááºá¡áá¬áž á¡áá
áº">
-<!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "ááœááºáá®áž áá¬ááœááºááŸá¯áá»á¬áž">
-<!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Torbutton ááᯠá¡á
ááŒá¯ááẠááŸáááºáá«á">
+<!ENTITY torbutton.context_menu.new_identity_key "á">
+<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!ENTITY torbutton.context_menu.new_circuit_key "á">
+<!ENTITY torbutton.context_menu.networksettings "Tor ááœááºááẠá¡ááŒááºá¡áááºáá»á¬áž...">
+<!ENTITY torbutton.context_menu.networksettings.key "á">
+<!ENTITY torbutton.context_menu.downloadUpdate "Tor ááá±á¬ááºáᬠá¡ááºááááºá¡ááœáẠá
á
áºáá±ážáá«...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "á¡">
+<!ENTITY torbutton.context_menu.cookieProtections "ááœááºáá®áž á¡áá¬á¡ááœááºáá»á¬áž...">
+<!ENTITY torbutton.context_menu.cookieProtections.key "á">
+<!ENTITY torbutton.button.tooltip "Torbutton ááᯠá¡á
ááŒá¯ááẠááŸáááºáá«">
+<!ENTITY torbutton.prefs.security_settings "Tor ááá±á¬ááºáᬠáá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž">
<!ENTITY torbutton.cookiedialog.title "ááœááºáá®áž áá¬ááœááºááŸá¯áá»á¬ážááᯠá
á®áá¶áááºá·ááœá²áááº">
<!ENTITY torbutton.cookiedialog.lockCol "á¡áá¬á¡ááœáẠáá¯ááºáá¬ážáááº">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -13,8 +17,37 @@
<!ENTITY torbutton.cookiedialog.pathCol "áááºážááŒá±á¬ááºáž">
<!ENTITY torbutton.cookiedialog.protectCookie "ááœááºáá®ážááᯠáá¬ááœááºáááº">
<!ENTITY torbutton.cookiedialog.removeCookie "ááœááºáá®ážááᯠáááºáá¯ááºáááº">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "ááœááºáá®ážááᯠáá¬ááœááºááá¬ážáá«">
-<!ENTITY torbutton.cookiedialog.removeAllBut "á¡á¬ážáá¯á¶ážááᯠáááºáá¯ááºáá«á ááá¯á·áá±á¬áº á¡áá¬á¡ááœáẠáá¯ááºáá¬ážáááº">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "ááœááºáá®ážááᯠááá¬ááœááºáá¬ážáá«">
+<!ENTITY torbutton.cookiedialog.removeAllBut "á¡á¬ážáá¯á¶ážááᯠáááºáá¯ááºáá«á ááá¯á·áá±á¬áº á¡áá¬á¡ááœáẠáá¯ááºáá¬ážáááº">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ááœááºáá®ážáá
áºáá»á¬ážááᯠáá¬ááœááºáááº">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ááœááºáá®ážáá
áºáá»á¬ážááᯠáá¬ááœááºááŒááºáž áááŒá¯áááº">
+<!ENTITY torbutton.prefs.sec_caption "áá¯á¶ááŒá¯á¶âáá±ážá¡áááºá·">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "áááºá· ááá±á¬ááºáá¬ááᯠáááºáá¬áá»á¬áž (hackers) á
á®áááºážááẠááá¯ááá¯áá¯áá¶á¡á¬ážáááºážá
á±áá±á¬ áááºá·ááá±á¬ááºáá¬á á¡áá»áá¯á·áá±á¬á¡ááºá¹áá«áááºáá»á¬ážááᯠáá¯á¶ááŒá¯á¶áá±áž ááœááºáááºáááááá¬á០ááááºáááºááá¯ááºáá«áááºá">
+<!ENTITY torbutton.prefs.sec_standard_label "áá¯á¶ááŸááº">
+<!ENTITY torbutton.prefs.sec_standard_description "Tor ááá±á¬ááºáᬠááŸááºá· áááºááá¯áẠá¡ááºá¹áá«áááºáá»á¬ážá¡á¬ážáá¯á¶ážááᯠááœááºá·áá¬ážáá«áááºá">
+<!ENTITY torbutton.prefs.sec_safer_label "ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±á¬">
+<!ENTITY torbutton.prefs.sec_safer_description " áááŒá¬áá á¡áá¹ááá¬ááºáá±ážááá¯ááºáá±á¬ áááºááá¯ááºá¡ááºá¹áá«áááºáá»á¬ážááᯠááááºáááºáá¬ážáá«áááºá ááá¯á·ááŒá
áºá á¡áá»áá¯á·áá±á¬ ááá¯ááºááá¯ááºááá¯ááºá
áœááºážáá»á¬áž áá¯á¶ážááŸá°á¶ážá
á±áááºá">
+<!ENTITY torbutton.prefs.sec_safer_list_label "ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±á¬ á¡ááŒááºá¡áááºááœáẠ-">
+<!ENTITY torbutton.prefs.sec_safest_label "á¡áá¯á¶ááŒá¯á¶áá¯á¶áž">
+<!ENTITY torbutton.prefs.sec_safest_description "áááºááŒáááºáá±á¬ ááá¯ááºáá»á¬ážááŸááºá· á¡ááŒá±áá¶áááºáá±á¬ááºááŸá¯áá»á¬ážá¡ááœáẠááá¯á¡ááºáá±á¬ áááºááºááá¯ááºáá¡ááºá¹áá«áááºáá»á¬ážááá¯áᬠááœáá·áºááŒá¯áááºá á€ááŒá±á¬ááºážáá²ááŸá¯áá»á¬ážááẠáá¯ááºáá¯á¶áá»á¬ážá áá®áá®áá¬áá»á¬áž ááŸááºá· áááá¯ááááºáá¬áá¬á
áá¬ážáá»á¬áž (scripts) ááá¯á·ááᯠááááá¯ááºá
á±áááºá">
+<!ENTITY torbutton.prefs.sec_safest_list_label "á¡áá¯á¶ááŒá¯á¶áá¯á¶áž á¡ááŒááºáááºááœáẠ-">
+<!ENTITY torbutton.prefs.sec_learn_more_label "áááºáá¶áá±á·áá¬áááº">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "HTTPS ááá¯ááºáá»á¬ážáá±á«áº ááá¯ááºáá±á¬ JavaScript ááá¯ááááºáá¬ážáááº">
+<!ENTITY torbutton.prefs.sec_js_disabled "ááá¯ááºáá»á¬ážá¡á¬ážáá¯á¶ážáá±á«áºááœáẠJavaScript ááᯠáá°áá¡ááŒááºá¡áááºá¡á ááááºáá¬ážáááº">
+<!ENTITY torbutton.prefs.sec_limit_typography "á¡áá»áá¯á·áá±á¬ á
á¬áá¯á¶ážá
ááá¯ááºáá»á¬áž ááŸááºá· áááºá¹áá»á¬áááºá¹áá±ááá»á¬ážááᯠááááºáá¬ážáááº">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "á¡áá»áá¯á·áá±á¬ á
á¬áá¯á¶ážá
ááá¯ááºáá»á¬ážá á¡áá¯ááºááœááºáá»á¬ážá áááºá¹áá»á¬áááºá¹áá±ááá»á¬áž ááŸááºá· áá¯ááºáá¯á¶áá»á¬ážááá¯á·ááᯠááááºáá¬ážáááº">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "á¡áá¶ ááŸááºá· áá®áá®ááá¯ááá¯ááºáá»á¬áž (HTML5 áá®áá®áá¬) ááŸááºá· WebGL ááá¯á·ááᯠááŸáááºáá
ááá¯ááºááẠ(click-to-play)">
+<!ENTITY torbutton.prefs.sec_custom_warning "á
áááºááŒáá¯áẠ">
+<!ENTITY torbutton.prefs.sec_overview "áááºá· áá¯á¶ááŒá¯á¶áá±ážááŸááºá· á¡áááºááŸááºááŸá¯ááá¯á·ááᯠááá¯ááºááá¯ááºá
á±ááá¯ááºáá±á¬ á¡áá»áá¯á·áá±á¬ áááºá¡ááºá¹áá«áááºáá»á¬ážááᯠááááºáá¬ážáááº">
+<!ENTITY torbutton.prefs.sec_standard_tooltip "áá¯á¶ááŒá¯á¶áá±ážá¡áááºá· - áá¯á¶ááŸááº">
+<!ENTITY torbutton.prefs.sec_safer_tooltip "áá¯á¶ááŒá¯á¶áá±ážá¡áááºá· - ááá¯ááá¯áá¯á¶ááŒá¯á¶áá±á¬">
+<!ENTITY torbutton.prefs.sec_safest_tooltip "áá¯á¶ááŒá¯á¶áá±ážá¡áááºá· - á¡áá¯á¶ááŒá¯á¶áá¯á¶áž">
+<!ENTITY torbutton.prefs.sec_custom_summary "ááẠá
áááºááŒáá¯ááºááœá±ážáá¬ážáá±á¬ ááá±á¬ááºáá¬á áá»áááºááŸáááŸá¯áá»á¬ážááẠáá¯á¶ááŸááºááá¯ááºáá±á¬ áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž ááŒá
áºáá±á«áºá
á±áá²á·áá«áááºá áá¯á¶ááŒá¯á¶áá±ážááŸááºá· áá¯áá¹ááá¯ááºáá¯á¶ááŒá¯á¶áá±áž á¡ááŒá±á¬ááºážááŒáá»ááºáá»á¬ážá¡ááœáẠáá°ááá¯á¶ááŒá¯á¶áá±ážá¡áááºá·ááá¯á· ááœá±ážáá¬ážááẠáá»áœááºá¯ááºááá¯á·á០á¡ááŒá¶ááŒá¯áá«áááºá">
<!ENTITY torbutton.prefs.sec_restore_defaults " áá°áá¡ááá¯ááºáž ááŒááºáá¬ážáááº">
+<!ENTITY torbutton.prefs.sec_advanced_security_settings "á¡áááºá·ááŒááºá· áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž...">
+<!ENTITY torbutton.circuit_display.title "Tor áááºážááŒá±á¬ááºáž">
+<!ENTITY torbutton.circuit_display.new_circuit "á€ááá¯ááºá¡ááœáẠáááºážááŒá±á¬ááºážá¡áá
áº">
+
+<!-- Onion services strings. Strings are kept here for ease of translation. -->
+<!ENTITY torbutton.onionServices.authPrompt.tooltip "Onion áááºáá±á¬ááºááŸá¯ áá¯á¶ážáá°á¡áááºááŒá¯ááẠáá±á¬ááºážááá¯á
ᬠááœááºá·áá«">
+<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "á€áá®ážáá¯ááºá¡á¬áž ááŸááºáá¬ážáá«">
diff --git a/chrome/locale/my/torbutton.properties b/chrome/locale/my/torbutton.properties
index 043cb4a0..c894ba7e 100644
--- a/chrome/locale/my/torbutton.properties
+++ b/chrome/locale/my/torbutton.properties
@@ -2,26 +2,143 @@ torbutton.panel.tooltip.disabled = Tor ááᯠááœááºá·ááẠááŸ
torbutton.panel.tooltip.enabled = Tor ááᯠááááºááẠááŸáááºáá«
torbutton.panel.label.disabled = ááááºáá¬ážáá±á¬ Tor
torbutton.panel.label.enabled = ááœááºá·áá¬ážáá±á¬ Tor
-extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = ááŒááºáá០á¡ááŒá±á¬ááºážá¡áá¬ááᯠááœááºá·áááº
-torbutton.popup.external.app = ááŒááºá á¡áá¹ááá®áá±ážááŸááºáž áá
áºáá¯ááᯠááŒá±ááŸááºážááẠááá¯á¡ááºááẠ- \n\n
-torbutton.popup.external.note = \n\nááŸááºáá»áẠ- ááŒááºá á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážááẠáá¯á¶ááŸááºá¡á¬ážááŒááºá· áá¯á¶ááŒá¯á¶áá±á¬ Tor ááá¯ááºáá«á áááºážá áááºá·ááᯠáá±á«áºááá¯ááºáááºá\n
-torbutton.popup.external.suggest = \ná¡áááºá á€ááá¯ááºááᯠá
áááºááá»áá«áá ááẠá¡á±á¬á·ááºááá¯ááºáž ááŸááá±áá»áááºá (ááá¯á·) VM áá
áºáá¯áá²ááœááº\n ááŸááá±áá»áááºááœáẠáááºážááᯠááŒááºá·ááẠááẠááááºážáááºážáá¬ážááá¯ááºááẠ(ááá¯á·) Tails LiveCD ááá¯á·ááá¯ááº\n torsocks ááá¯á·áá²á·ááá¯á·áá±á¬ Tor ááá±á¬ááºáá®ááᯠáá¯á¶ážá
áœá²ááẠá
ááºážá
á¬ážáá«á\n
-torbutton.popup.launch = á¡áá¹ááá®áá±ážááŸááºážááᯠááœááºá·áááº
-torbutton.popup.cancel = áá»ááºááááºážáááº
-torbutton.popup.dontask = ááá¯á¡áá»áááºááŸá
ááŒá®áž á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážááᯠá¡ááŒá² ááœááºá·áááº
-torbutton.popup.prompted_language = áááºá· ááá¯ááºáá±ážááá¯ááºáᬠáá¯á¶ááŒá¯á¶áá±ážááᯠááá¯ááᯠáááŸááááºá Torbutton ááẠááœááºááẠá
á¬áá»ááºááŸá¬áá»á¬ážááᯠá¡ááºá¹ááááẠáá¬áᬠáá¬ážááŸááºážááŒááºá· áá±á¬ááºážáá¶áá±ážááá¯ááºáááºá áááºážááá¯á·ááŒá¯áá¯ááºááŒááºážááẠáááºá· áá¬áá¬ááŒááºá· áááºááŸá¯ááá¯áá±á¬ ááœááºááẠá
á¬áá»ááºááŸá¬áá»á¬ážááᯠá¡ááºá¹ááááẠáá¬áá¬áááŒááºá· áá±á«áºááŒáá±ááẠááŒá
áºáááºá\n\náá¯á¶ááŒá¯á¶ááŸá¯ ááá¯ááŸááááºá¡ááœáẠá¡ááºá¹ááááẠáá¬áá¬ááŒááºá· ááœááºáááºá
á¬áá»ááºááŸá¬áá»á¬ážááᯠááẠáá±á¬ááºážáá¶ááá¯á
áá¬áž?
-torbutton.popup.no_newnym = Torbutton ááẠáááºá·á¡á¬áž á¡áá±á¬ááºá¡áá¬áž á¡áá
áºááᯠáá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ ááá±ážááá¯ááºáá«á áááºážááẠTor ááááºážáá»á¯ááºáá±áž Port áá² ááááºáá±á¬ááºááá¯ááºáá«á\n\nTor Browser Bundle ááᯠááẠáá¯á¶ážá
áœá²áá±ááá¬áž?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
-torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
-
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.circuit_display.internet = á¡ááºáá¬áááº
+torbutton.circuit_display.ip_unknown = áááááŸááá±á¬ IP
+torbutton.circuit_display.onion_site = Onion ááá¯ááº
+torbutton.circuit_display.this_browser = ဠááá±á¬ááºáá¬
+torbutton.circuit_display.relay = áááºáááºá·áááºáž
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = áááááŸááá±á¬ ááá¯ááºáá¶
+torbutton.circuit_display.guard = á
á±á¬ááºá·
+torbutton.circuit_display.guard_note = áááºá [Guard] node áááºááŒá±á¬ááºážáá²ááẠááá¯ááºáá«á
+torbutton.circuit_display.learn_more = áááºáá¶áá±á·áá¬áááº
+torbutton.circuit_display.click_to_copy = áá±á¬áºáá®áá°ážááẠááŸáááºáá«
+torbutton.circuit_display.copied = áá±á¬áºáá®áá°ážááŒá®áž!
+torbutton.content_sizer.margin_tooltip = Tor ááá±á¬ááºáá¬ááẠáááºá· áááºážááá¯ážá á¡áá»ááºááŸááºá· á¡ááŒááºá·ááᯠááááºááá°ážááŒá¬ážá¡á±á¬áẠá€á¡áá¬ážááẠáááºáá±á«ááºážáá±ážáá«áááºá ááá¯á·ááŒááºá· á¡ááŒá¬ážáá°áá»á¬ážááẠáááºá·á¡á¬áž á¡áœááºááá¯ááºážáá±á«áºááœáẠááá¯ááºááŸá¬ááœá±ááá¯ááºááŒááºáž áá»á±á¬á·áááºážá
á±áááºá
+extensions.torbutton(a)torproject.org.description = Torbutton ááẠTor á¡ááŒááºá¡áááºáá»á¬áž áá»áááºáááẠááŸááºá· á¡áœááºááá¯ááºážáá±á«áº ááá¯ááºááá¯ááºááŸá¯ááºááŸá¬ážááŸá¯áá¬ááááºá¡á¬áž ááœááºáá°áá»ááºááŒááºá
áœá¬ ááŸááºážáááºážááẠááá¯ááºáá
áºáᯠáá±ážáá«áááºá
+torbutton.popup.external.title = ááŒááºáááá¯ááºá¡áá»áá¯ážá¡á
á¬áž áá±á«ááºážáá¯ááºáá¯ááºáááºáá¬áž?
+torbutton.popup.external.app = Tor ááá±á¬ááºáá¬ááẠá€ááá¯ááºá¡á¬áž ááŒáááá¯á·áááá«á á¡ááŒá¬áž á¡áá¹ááá®áá±ážááŸááºážááŒááºá· áááºá០ááœááºá·áááºááá¯á¡ááºáá«áááºá\n\n
+torbutton.popup.external.note = á¡áá»áá¯á·ááá¯ááºá¡áá»áá¯ážá¡á
á¬ážáá»á¬ážááẠá¡áá¹ááá®áá±ážááŸááºážáá»á¬ážá¡á¬áž Tor á¡áá¯á¶ážáááŒá¯áá² á¡ááºáá¬áááºááŸááºá· áá»áááºááẠá
á±ááá¯ááºáá«áááºá\n\n
+torbutton.popup.external.suggest = áá¯á¶ááŒá¯á¶á
á±ááẠáááºááẠá¡áœááºááá¯ááºážáá±á«áºáááŸááá»ááẠááá¯á·ááá¯áẠTails ááá¯áá»áá¯áž Tor Live CD á¡áá¯á¶ážááŒá¯ááᬠáá±á«ááºážáá¯ááºááœá²áá¬ážáá±á¬ááá¯ááºáá»á¬ážááᯠááœááºá·áááºá·áá«áááºá\n
+torbutton.popup.launch = ááá¯ááºáá±á«ááºážáá¯ááºáááº
+torbutton.popup.cancel = áááºáá»ááºáááº
+torbutton.popup.dontask = ááá¯á¡áá»áááºááŸá
á ááá¯ááºáá»á¬ážááᯠá¡ááá¯á¡áá»á±á¬áẠáá±á«ááºážáá¯ááºááœá²áááº
+torbutton.popup.no_newnym = Torbutton ááẠáááºá·á¡á¬áž á¡áá±á¬ááºá¡áá¬áž á¡áá
áºááᯠáá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ ááá±ážááá¯ááºáá«á áááºážááẠTor ááááºážáá»á¯ááºáá±áž Port áá² áááºáá±á¬ááºááœááºá·áááŸááá«á\n\nTor Browser Bundle ááᯠááẠáá¯á¶ážá
áœá²áá±áá«ááá¬áž?
+torbutton.security_settings.menu.title = áá¯á¶ááŒá¯á¶áá±áž á¡ááŒááºá¡áááºáá»á¬áž
+torbutton.title.prompt_torbrowser = á¡áá±ážááŒá®ážáá±á¬ Torbutton á¡áá»ááºá¡áááº
+torbutton.popup.prompt_torbrowser = Torbutton ááẠááá¯á¡áá« á¡áá¯ááºáá¯ááºáá¯á¶ ááá°áá±á¬á·áá«á áááºá áááºážááá¯ááºááᯠááááºááá¯á·áááá±á¬á·áá«á\n\nTor ááá«áá² ááá±á¬ááºáá¬ááᯠá¡áá¯á¶ážááŒá¯áá¯ááºáž Torbutton ááᯠááá±á¬ááºáá¬á¡ááœááºáž á¡áá¯á¶ážááŒá¯ááŒááºážááẠááá¯á¶ááŒá¯á¶á áá»áœááºá¯ááºááá¯á·á០á€ááŒá±á¬ááºážáá²áá»áẠááŒá¯áá¯ááºáá²á·áá«áááºá áá»ááºááœááºááŸá¯áá»á¬áž áá»á¬ážááœááºážá á¡ááŒá¬ážáááºážáááºážááŸááºá· ááŒá¯ááŒááºááá¯á·áááá±á¬á·ááá¯á·áá«á\n\náááºááŸâ Firefox á¡á¬áž áá¯á¶ááŸááºááá¯áá¯á¶ážá
áœá²ááá¯áá»áŸáẠáááºá០Torbutton á¡á¬áž áááºáá¯ááºá
áŒá®áž Tor Browser Bundle ááᯠáá±á«ááºážáá¯ááºáá¯ááºáááºá·áá«áááºá Tor ááá±á¬ááºáᬠá áá¯áá¹ááá¯ááºáá±ážá¡ááºá¹áá«áááºáá»á¬ážááẠáá¬ááẠááá±á¬ááºáá¬ááẠááá¯áá±á¬ááºážáá«áááºá Firefox ááᯠTorbutton ááŸááºá·áá¯á¶ážáá¬áááºáááºáž ááá¯áá¬áá«áááºá\n\nTorbutton á¡á¬áž áááºáá¯ááºááẠTools > Addons > Extensions ááá¯á·ááœá¬ážá Torbutton áá±ážááŸááá±á¬ "áááºáá¯ááºáááº" ááá¯áááºá· ááá¯ááºá¡á¬ážááŸáááºáá±ážáá«á
+torbutton.popup.short_torbrowser = á¡áá±ážááŒá®ážáá±á¬ Torbutton á¡áá»ááºá¡áááº!\n\nTorbutton ááẠááá¯á¡ááŒá²ááœááºá·áá¬ážáá«áááºá\n\nTorbutton á¡á¬áž ááŸáááºá á¡áá»ááºá¡áááºáá»á¬áž áááºáá¶áá±á·áá¬áá«á
+
+torbutton.popup.confirm_plugins = Flash ááá¯áá»áá¯áž ááá¯ážááœá²áá±á¬ ááááºááẠáá±á¬á·áá² (plugins) áá»á¬ážááẠáááºá· áááá¹áá¯áá¯á¶ááŒá¯á¶áá±ážááŸááºá· á¡áááºááŸááºááŒááºážááá¯á·ááᯠááááá¯ááºááá¯ááºá
á±áá«áááºá\n\náááºážááá¯á·ááẠáááºá·ááᯠáááºáá±áá¬ááŸááºá· IP ááááºá
á¬ááá¯á·ááᯠáá±á«áºáá¯ááºááẠTor ááᯠááŒááºáá»á±á¬áºááá¯ááºáá«áááºá\n\nááá¯ážááœá²áá±á¬ ááááºááẠáá±á¬á·áá² (plugins) áá»á¬ážááᯠááœááºá·áááºááŸá¬ áá±áá»á¬áá«ááá¬áž?\n\n
+torbutton.popup.never_ask_again = áá»áœááºá¯ááºáá¶ áááºáááºá·á¡áá»áááºáá»áŸ áááºááá±ážáá«ááŸááºá·
+torbutton.popup.confirm_newnym = Tor ááá±á¬ááºáá¬ááẠáááºááá¯ážááŸááºá· áááºááºáá»á¬ážá¡á¬ážáá¯á¶ážááᯠááááºáá«áááºá áááºááá¯áẠáááºááŒááºážáá»á¬áž á¡á¬ážáá¯á¶áž áá¯á¶ážááŸá°á¶ážááœá¬ážáá«áááºá\n\náááºá· ááá¯ááºáá±áž á¡áá±á¬ááºá¡áá¬ážáá»á¬áž ááŒááºáááºáááºáááºáá»ááẠTor ááá±á¬ááºáá¬ááᯠááááºááŒá®ážááŒááºááœááºá· ááá¬áž?\n\n
+
+torbutton.maximize_warning = Tor ááá±á¬ááºáá¬ááᯠá¡ááŒá®ážáá¯á¶ážááá¯ááºá¡áá áá»á²á·ááŒááºážá¡á¬ážááŒááºá· áááºááá¯ááºáá»á¬ážááẠáááºá· á
áááºááẠá¡ááœááºá¡á
á¬ážááᯠááááŸáááá¯ááºááŒá®áž áááºá·á¡á¬áž ááá¯ááºááŸá¬ááá¯á·áááá¯ááºáá«áááºá áá»áœááºá¯ááºááá¯á·á០áááºá· Tor ááá±á¬ááºáᬠáááºážááá¯ážááᯠáá°áááºážá¡ááœááºá¡á
á¬ážááŒááºá· áá¬ážááẠá¡ááŒá¶ááŒá¯áá«áááºá
# Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=á€áááºááá¯ááºááẠ(%S) HTML5 ááá¹áá°áá¯ááºáá¯á¶áá±áá¬ááᯠáá¯ááºáá°ááẠááŒáá¯ážá
á¬ážáá±áá«áááºáâ áááºážáá±áá¬ááŒááºá· áááºá· ááœááºáá»á°áá¬ááᯠáááá»á
áœá¬áá±á«áºáá¯ááºááá¯ááºáá«áááºá\n\nTor ááá±á¬ááºáá¬á០áááºážáááºááá¯áẠHTML5 ááá¹áá°áá¯ááºáá¯á¶áá±áᬠáá¯ááºáá°ááŒááºážááᯠááœááºá·ááŒá¯ááááºáá¬áž?
+canvas.notNow=ááá¯ááá¯ááº
+canvas.notNowAccessKey=á
+canvas.allow=áá±á¬ááºááœáẠááœááºá·ááŒá¯áááº
canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=ဠááá¯ááºá¡ááœáẠáááºááá·áºá¡áá»áááºááŸá (á¡ááŒá¶ááŒá¯áááº)
canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=%S áááá¯ááá¯áẠááŒá¿áá¬
+profileReadOnly=%S á¡á¬áž áááºáááºá¡ááœááºáᬠáááºááŸááºáá¬ážáá±á¬ ááá¯ááºá
áá
áºááŒááºá· (read-only file system) áááœááºá·ááá¯ááºáá«á áá»á±ážáá°ážááŒá¯á áááºážá¡á¬áž á
ááºáážáá¯á¶ážáá® á¡ááŒá¬ážáá±áá¬ááá¯á· %S á¡á¬áž áá±á¬áºáá®áá°ážáá±ážáá«á
+profileReadOnlyMac=%S á¡á¬áž áááºáááºá¡ááœááºáᬠáááºááŸááºáá¬ážáá±á¬ ááá¯ááºá
áá
áºááŒááºá· (read-only file system) áááœááºá·ááá¯ááºáá«á áá»á±ážáá°ážááŒá¯á áááºážá¡á¬áž á
ááºáážáá¯á¶ážáá® áááºá· Desktop ááá¯á·ááá¯áẠá¡áá¹ááá®áá±ážááŸááºážááá¯ááºááœá² áá²ááá¯á· %S á¡á¬áž áá±á¬áºáá®áá°ážáá±ážáá«á
+profileAccessDenied=%S ááẠáááá¯ááá¯áẠáá¯á¶ážááœááºá·áááŸááá«á áá»á±ážáá°ážááŒá¯á áááºá· ááá¯ááºá
áá
áºááœááºá·ááŒá¯áá»ááºáá»á¬áž ááŒá±á¬ááºážáá²á ááŒááºá
ááºážááŒááºá·áá±ážáá«á
+profileMigrationFailed=áááºá· %S áááá¯ááá¯áẠááŒá±á¬ááºážáá²ááŒááºážáá¡á±á¬ááºááŒááºáá«á\ná¡ááŒááºá¡áááºá¡áá
áºáá»á¬áž áá¯á¶ážá
áœá²áá«áááºá
+
+# "Downloading update" string for the hamburger menu (see #28885).
+# This string is kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+updateDownloadingPanelUILabel=%S á¡ááºáááºá¡á¬áž áá±á«ááºážáá¯ááºááœá²áá±áá«áááº
+
+# .Onion Page Info prompt. Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=áá»áááºáááºááŸá¯á¡á¬áž áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºááŒá®áž (Onion áááºáá±á¬ááºááŸá¯á %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=áá»áááºáááºááŸá¯á¡á¬áž áá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºááŒá®áž (Onion áááºáá±á¬ááºááŸá¯)
+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
+# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
+# an error code, e.g., 0xF3.
+# Tor SOCKS error 0xF0:
+onionServices.descNotFound.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº
+onionServices.descNotFound.header=Onionsite áááœá±á·ááŸááá«
+onionServices.descNotFound=á¡ááŒá
áºááá¯ááºáá¯á¶áž á¡ááŒá±á¬ááºážáááºážááẠOnionsite ááá¯ááºážáá»ááŒááºážááŒá±á¬ááºá·ááŒá
áºáá«áááºá Onionsite á
á®áá¶áá°á¡á¬áž áááºááœááºáá±ážáá«á
+onionServices.descNotFound.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá±á¬ááºážááá¯áá¬ážáá±á¬ onion áááºáá±á¬ááºááŸá¯ áá±á«áºááŒá
á¬ááẠhashring ááœááºáááœá±á·ááŸáá áá¯á¶ážáá°á០áááºáá±á¬ááºááŸá¯á¡á¬áž áááºááŸááºážááá®ááá¯ááºáá«á
+# Tor SOCKS error 0xF1:
+onionServices.descInvalid.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº
+onionServices.descInvalid.header=Onionsite á¡á¬áž ááá®ááá¯ááºáá«
+onionServices.descInvalid=Onionsite á¡á¬áž ááá®ááá¯ááºááŒááºážááẠá¡ááœááºážááŒá
áºáá±á¬ áá»ááºááœááºááŸá¯ááŒá±á¬ááºá·ááŒá
áºáá«áááºá
+onionServices.descInvalid.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá±á¬ááºážááá¯áá¬ážáá±á¬ onion áááºáá±á¬ááºááŸá¯ áá±á«áºááŒá
á¬ááẠáááºážá
á
áºááááá« ááá¯á·ááá¯áẠáááºááŸááºá¡áááºááŒá¯ááŒááºáž áá¡á±á¬ááºááŒááºáá«á
+# Tor SOCKS error 0xF2:
+onionServices.introFailed.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº
+onionServices.introFailed.header=Onionsite ááŸááºá· áá»áááºáááºááŸá¯ááŒááºááœá¬áž
+onionServices.introFailed=á¡ááŒá
áºááá¯ááºáá¯á¶áž á¡ááŒá±á¬ááºážáááºážááẠOnionsite ááá¯ááºážáá»ááŒááºážááŒá±á¬ááºá·ááŒá
áºáá«áááºá Onionsite á
á®áá¶áá°á¡á¬áž áááºááœááºáá±ážáá«á
+onionServices.introFailed.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â ááááºáááºááŸá¯áá¡á±á¬ááºááŒááºáá«á ááá¯áááºááŸá¬ áá±á«áºááŒá
á¬ááœá±á·ááŸááá±á¬áºáááºáž áááºáá±á¬ááºááŸá¯ááẠááááºáááºááŸá¯ááŒá
áºááŒááºážá¡áá áá»áááºáááºááŸá¯ áááŸááá«á ááŒá
áºááá¯ááºááŒá±ááŸá¬ áááºáá±á¬ááºááŸá¯á០áá±á«áºááŒá
á¬á¡á¬áž ááŒá±á¬ááºážáá²áá¬ážááẠááá¯á·ááá¯áẠáááºážááẠá¡áá¯ááºááá¯ááºáá±á¬á·áá«á
+# Tor SOCKS error 0xF3:
+onionServices.rendezvousFailed.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº
+onionServices.rendezvousFailed.header=Onionsite ááŸááºá· áá»áááºáááºááá
+onionServices.rendezvousFailed=Onionsite ááẠáá¡á¬ážáá« ááá¯á·ááá¯áẠTor áá»áááºáááºááŸá¯ááẠáááºáááºááœááºážáá±áá«áááºá áá±á¬ááºááŸááŒááºá
ááºážááŒááºá·áá±ážáá«á
+onionServices.rendezvousFailed.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá¯á¶ážáá°áááºá០áááºáá±á¬ááºááŸá¯ááŸááºá· ááŒááºáááºááœá±á·áá¯á¶ááŒááºáž áá»ááºááœááºáá²á·á áá¯á¶ážáá°á០áá»áááºáááºááŸá¯á¡á¬áž áááŒá®ážá
á®ážááá¯ááºáá«á
+# Tor SOCKS error 0xF4:
+onionServices.clientAuthMissing.pageTitle=á¡áááºááŒá¯ááŒááºáž ááá¯á¡ááºáá«áááº
+onionServices.clientAuthMissing.header=Onionsite ááẠá¡áááºááŒá¯ááŒááºáž ááá¯á¡ááºáá«áááº
+onionServices.clientAuthMissing=Onionsite áá²áááºáá±á¬ááºááẠáá¯ááºáá±á¬á·áá
áºáᯠááá¯á¡ááºáá«áááºá ááá¯á·áá±á¬áºáááºáž áááºáááºá·áá¯ááºáá±á¬á·á០ááááºáá¶ááœá±á·ááŸááá«á
+onionServices.clientAuthMissing.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá¯á¶ážáá°á០áá±á¬ááºážááá¯áá¬ážáá±á¬ Onion áááºáá±á¬ááºááŸá¯á áá±á«áºááŒá
á¬á¡á¬áž áá±á«ááºážáá¯ááºááœá²áá²á·áá«áááºáâ ááá¯á·áá±á¬áºáááºáž áá¯á¶ážáá°á¡áááºááŒá¯ááẠá¡áá»ááºá¡áááºáá»á¬áž áááœá±á·ááŸáá áááºážá¡áá¬áá»á¬ážááᯠáá¯ááºááŒááºááŒááºááŒááºážáááá«á
+# Tor SOCKS error 0xF5:
+onionServices.clientAuthIncorrect.pageTitle=á¡áááºááŒá¯ááŒááºáž áá¡á±á¬ááºááŒááºáá«
+onionServices.clientAuthIncorrect.header=Onionsite á¡áááºááŒá¯ááŒááºáž áá¡á±á¬ááºááŒááºáá«
+onionServices.clientAuthIncorrect=áááºáá¶áááŸááá¬ážáá±á¬ áá®ážáá¯ááºááẠááŸá¬ážááœááºážáá±áá«ááẠááá¯á·ááá¯áẠááŒááºáááºáá¯ááºááááºážáá¶áá¬ážááá«áááºá Onionsite á
á®áá¶áá°á¡á¬áž áááºááœááºáá±ážáá«á
+onionServices.clientAuthIncorrect.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá¯á¶ážáá°á០áá±á¬ááºážááá¯áá¬ážáá±á¬ Onion áááºáá±á¬ááºááŸá¯á áá±á«áºááŒá
á¬á¡á¬áž áá±á«ááºážáá¯ááºááœá²ááá¯ááºáá²á·áá«áááºáâ ááá¯á·áá±á¬áºáááºáž áá¯á¶ážáá°á á¡áááºááŒá¯áá±á¬ á¡áá»ááºá¡áááºáá»á¬ážáá¯á¶ážá áááºážá¡áá¬áá»á¬ážááᯠáá¯ááºááŒááºááŒááºááŒááºážáááá«á ááá¯áááºááŸá¬ áááºáá±á¬ááºáá¯á¶ážááœááºá· ááŒááºáááºáá¯ááºááááºážáá¶áááŒááºáž ááŒá
áºááá¯ááºáá«áááºá
+# Tor SOCKS error 0xF6:
+onionServices.badAddress.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº
+onionServices.badAddress.header=Onionsite ááááºá
ᬠáááŸááºáááºáá«
+onionServices.badAddress=áááºáá¶áá±ážáá¬ážáá±á¬ Onionsite ááááºá
á¬ááẠáááŸááºáááºáá«áâ áá»á±ážáá°ážááŒá¯á ááŸááºáááºá
áœá¬ ááŒááºážáá¬ážáá±ážááẠá
á
áºáá±ážáá«á
+onionServices.badAddress.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áááºáá¶áá±ážáá¬ážáá±á¬ .onion ááááºá
á¬ááẠáááŸááºáááºáá«á á€ááŸá¬ážááœááºážááŸá¯ááẠá¡á±á¬ááºáá«á¡ááŒá±á¬ááºážááŒáá»ááºáá»á¬ážááŒá±á¬ááºá·ááŒá
áºáá«ááẠ- ááááºá
á¬á
á¬áá¯á¶ážááœá² áááá¯ááºáá®áá«áâ ed25519 á¡áá»á¬ážáá¯á¶ážáá®ážáá¯ááºááẠáááŸááºáááºáá« ááá¯á·áºááá¯áẠáá¯ááºááŒááºá·ááŒá±á¬ááºážáá²ááŸááºááŒááºážááẠá¡áá»á¯á¶ážááááºáá«á
+# Tor SOCKS error 0xF7:
+onionServices.introTimedOut.pageTitle=Onionsite á¡á¬ážáááºááŒááºáž ááŒá¿áá¬ááŸááá«áááº
+onionServices.introTimedOut.header=Onionsite ááŒááºáááºážáááºáá®ážááŒááºáž á¡áá»áááºáá¯ááºáá¯á¶ážááœá¬ážáá«ááŒá®
+onionServices.introTimedOut=Onionsite ááŒááºá· áá»áááºáááºááŸá¯ áá¡á±á¬ááºááŒááºáá«á áá»áááºáááºááŸá¯ááá¯ááºáž ááá±á¬ááºážáá±á¬ááŒá±á¬ááºá· ááŒá
áºááá¯ááºáá«áááºá
+onionServices.introTimedOut.longDescription=á¡áá»ááºá¡áááºáá»á¬áž - %S â áá±á¬ááºážááá¯áá¬ážáá±á¬ Onion áááºáá±á¬ááºááŸá¯ááŒááºá· áá»áááºáááºááŸá¯ ááŒááºáááºážáááºááœááºáá±áá¯ááºáž á¡áá»áááºáá¯ááºáá¯á¶ážááœá¬ážáá«ááŒá®á
+#
+# LOCALIZATION NOTE: %S will be replaced with the .onion address.
+onionServices.authPrompt.description2=%S ááẠáááºá¡áááºááŒá¯ááẠáá±á¬ááºážááá¯áá±áá«áááºá
+onionServices.authPrompt.keyPlaceholder=ဠonion áááºáá±á¬ááºááŸá¯á¡ááœáẠáááºá· áá®ážáááºá·áá®ážáá¯ááºá¡á¬áž ááá¯ááºáááºá·áá±ážáá«á
+onionServices.authPrompt.done=ááŒá®ážááœá¬ážááŒá®
+onionServices.authPrompt.doneAccessKey=d
+onionServices.authPrompt.invalidKey=á¡áá»á¯á¶ážáááºáá±á¬ áá®ážáá¯áẠááá¯ááºáááºá·áá±ážáá«â ((52 base32 á
á¬áá¯á¶ážáá»á¬áž ááá¯á·ááá¯áẠ44 base64 á
á¬áá¯á¶ážáá»á¬áž)
+onionServices.authPrompt.failedToSetKey=áááºá· áá®ážáá¯ááºááŒááºá· Tor á¡á¬áž áá»áááºáááŒááºáááºá áááá«
+onionServices.authPreferences.header=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž á¡áááºááŒá¯ááŒááºáž
+onionServices.authPreferences.overview=á¡áá»áá¯á· onion áááºáá±á¬ááºááŸá¯áá»á¬áž á¡áá¯á¶ážáááŒá¯ááẠáá®ážáá¯áẠ(á
áá¬ážááŸááºááá¯áá»áá¯áž) ááŒááºá· áááºá·á¡áá±á¬ááºá¡áá¬ážááŒááẠááá¯á¡ááºáá«áááºá
+onionServices.authPreferences.savedKeys=ááááºážáá¬ážáá±á¬ áá®ážáá¯ááºáá»á¬áž...
+onionServices.authPreferences.dialogTitle=Onion áááºáá±á¬ááºááŸá¯ áá®ážáá¯ááºáá»á¬áž
+onionServices.authPreferences.dialogIntro=á¡á±á¬ááºáá« onionsites áá»á¬ážá¡ááœáẠáá®ážáá¯ááºáá»á¬ážááẠáááºá· ááœááºáá»á°áá¬áá±á«áºááœáẠááááºážáááºážáá¬áá«áááº
+onionServices.authPreferences.onionSite=Onionsite
+onionServices.authPreferences.onionKey=áá®ážáá¯ááº
+onionServices.authPreferences.remove=áááºááŸá¬ážáááº
+onionServices.authPreferences.removeAll=á¡á¬ážáá¯á¶áž áááºááŸá¬ážáááº
+onionServices.authPreferences.failedToGetKeys=Tor á០áá®ážáá¯ááºáá»á¬áž áááá°ááá¯ááºáá«
+onionServices.authPreferences.failedToRemoveKey=áá®ážáá¯áẠáááºááŸá¬ážááááá«
+
+# Onion-Location strings.
+onionLocation.alwaysPrioritize=Onions áá»á¬ážááᯠá¡ááŒá² á¥á®ážá
á¬ážáá±ážáááº
+onionLocation.alwaysPrioritizeAccessKey=P
+onionLocation.notNow=ááá¯ááá¯ááº
+onionLocation.notNowAccessKey=P
+onionLocation.description=Tor ááœááºáááºáá±á«áºááœáẠonion áááºáá±á¬ááºááŸá¯áá»á¬ážááŒááºá· áá
áºáááºá· ááá¯ááá¯áá¯á¶ááŒá¯á¶á
áááºáá»ááá±á¬ áááºážááá¯ááºá áá¬ážááŸááºážááŸááá«áááºá Onion áááºáá±á¬ááºááŸá¯áá»á¬ážááẠáááºááá¯ááºáá¯ááºáá±áá°áá»á¬áž ááŸááºá· áá¯á¶ážáá°áá»á¬ážá¡ááœáẠá
á±á¬ááºá·ááŒááºá·ááá¯ááºáá¶ááŒááºáž ááŸááºá· áááºáá¬ááŒááºáá¶áááŒááºážááá¯á·ááᯠááŸáááºáááºážáá±ážááá¯ááºáá«áááºá
+onionLocation.tryThis=Onion áááºáá±á¬ááºááŸá¯áá»á¬áž á
ááºážáá¯á¶ážááŒááºá·áá«
+onionLocation.onionAvailable=.onion áááŸáááá¯ááº
+onionLocation.learnMore=áááºáá¶áá±á·áá¬áááº...
+onionLocation.always=á¡ááŒá²áááºáž
+onionLocation.askEverytime=á¡áá»áááºááá¯ááºážáá±ážáá«
+onionLocation.prioritizeOnionsDescription=.onion ááá¯ááºáá»á¬áž ááááŸááá»áŸáẠáááºážááá¯á·ááᯠá¥á®ážá
á¬ážáá±ážáá«á
+onionLocation.onionServicesTitle=Onion Services
diff --git a/import-translations.sh b/import-translations.sh
index 78b4b8b9..12065015 100755
--- a/import-translations.sh
+++ b/import-translations.sh
@@ -2,7 +2,7 @@
# This var comes from the TBB locale list.
# XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync
-BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt nb-NO mk ms nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW"
+BUNDLE_LOCALES="ar ca cs da de el es-AR es-ES fa fr ga-IE he hu id is it ja ka ko lt nb-NO mk ms my nl pl pt-BR ro ru sv-SE th tr vi zh-CN zh-TW"
# XXX: Basque (eu) by request in #10687.
# This is not used for official builds, but should remain so Basque XPIs can be
diff --git a/jar.mn b/jar.mn
index 3838bc9b..c8fd813f 100644
--- a/jar.mn
+++ b/jar.mn
@@ -66,6 +66,8 @@ torbutton.jar:
locale/mk/ (chrome/locale/mk/*)
% locale torbutton ms %locale/ms/
locale/ms/ (chrome/locale/ms/*)
+% locale torbutton my %locale/my/
+ locale/my/ (chrome/locale/my/*)
% locale torbutton nb-NO %locale/nb-NO/
locale/nb-NO/ (chrome/locale/nb-NO/*)
% locale torbutton nl %locale/nl/
1
0