Revert "electron19: drop package"

Rocket.Chat-Desktop still uses electron19.
electron19 still in the repo.

This reverts commit c4d86008da.
This commit is contained in:
Đoàn Trần Công Danh 2024-03-31 16:17:15 +07:00
parent b1fed15ecb
commit 116661dd4b
124 changed files with 19727 additions and 1 deletions

View File

@ -0,0 +1,92 @@
From af94ae30d03668f0f4c93852d8e2d1f88ed04c62 Mon Sep 17 00:00:00 2001
From: Skylab tests cros image roller
<skylab-test-cros-roller@chops-service-accounts.iam.gserviceaccount.com>
Date: Fri, 10 Jun 2022 00:38:54 +0000
Subject: [PATCH 01/59] [skylab_tests] Update skylab tests cros img version
This CL will update cros image version for skylab tests. CROS_BOARD_LKGM
is updated according to chromeos/CHROMEOS_LKGM; CROS_BOARD_DEV,
CROS_BOARD_BETA and CROS_BOARD_STABLE are updated according to Omaha.
If this CL caused regressions, please revert and pause the autoroller at
https://luci-scheduler.appspot.com/jobs/chrome/lacros-skylab-tests-cros-img-roller
Also please file a bug to OS>LaCrOS>Partner, and CC svenzheng@chromium.org,
yjt@google.com.
R=rubber-stamper@appspot.gserviceaccount.com
Requires-Testing: True
Change-Id: I5b29e1b2b6de832dc51758037519f76f3f8f7ebd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3698986
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: skylab-test-cros-roller@chops-service-accounts.iam.gserviceaccount.com <skylab-test-cros-roller@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1160}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
testing/buildbot/variants.pyl | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index d6a822d49671..389bb3539547 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -919,8 +919,8 @@
'CROS_ATLAS_RELEASE_BETA': {
'skylab': {
'cros_board': 'atlas',
- 'cros_chrome_version': '103.0.5060.33',
- 'cros_img': 'atlas-release/R103-14816.41.0',
+ 'cros_chrome_version': '103.0.5060.37',
+ 'cros_img': 'atlas-release/R103-14816.49.0',
},
'enabled': False,
'identifier': 'ATLAS_RELEASE_BETA',
@@ -955,8 +955,8 @@
'CROS_EVE_RELEASE_BETA': {
'skylab': {
'cros_board': 'eve',
- 'cros_chrome_version': '103.0.5060.33',
- 'cros_img': 'eve-release/R103-14816.41.0',
+ 'cros_chrome_version': '103.0.5060.37',
+ 'cros_img': 'eve-release/R103-14816.49.0',
},
'enabled': False,
'identifier': 'EVE_RELEASE_BETA',
@@ -1000,8 +1000,8 @@
'CROS_HANA_RELEASE_BETA': {
'skylab': {
'cros_board': 'hana',
- 'cros_chrome_version': '103.0.5060.33',
- 'cros_img': 'hana-release/R103-14816.41.0',
+ 'cros_chrome_version': '103.0.5060.37',
+ 'cros_img': 'hana-release/R103-14816.49.0',
},
'enabled': False,
'identifier': 'HANA_RELEASE_LKGM',
@@ -1036,8 +1036,8 @@
'CROS_JACUZZI_RELEASE_BETA': {
'skylab': {
'cros_board': 'jacuzzi',
- 'cros_chrome_version': '103.0.5060.33',
- 'cros_img': 'jacuzzi-release/R103-14816.41.0',
+ 'cros_chrome_version': '103.0.5060.37',
+ 'cros_img': 'jacuzzi-release/R103-14816.49.0',
},
'enabled': False,
'identifier': 'JACUZZI_RELEASE_BETA',
@@ -1081,8 +1081,8 @@
'CROS_OCTOPUS_RELEASE_BETA': {
'skylab': {
'cros_board': 'octopus',
- 'cros_chrome_version': '103.0.5060.33',
- 'cros_img': 'octopus-release/R103-14816.41.0',
+ 'cros_chrome_version': '103.0.5060.37',
+ 'cros_img': 'octopus-release/R103-14816.49.0',
},
'enabled': False,
'identifier': 'OCTOPUS_RELEASE_BETA',
--
2.37.0

View File

@ -0,0 +1,404 @@
From 30137148967bd1f918af493ad0fe82384924ccdf Mon Sep 17 00:00:00 2001
From: chrome-weblayer-builder
<chrome-weblayer-builder@chops-service-accounts.iam.gserviceaccount.com>
Date: Fri, 10 Jun 2022 01:23:33 +0000
Subject: [PATCH 02/59] [lacros skew tests] Refresh skew tests for M104
This CL updates the ash version ['104.0.5111.0'] for Lacros version skew testing.
If this CL caused regressions, please revert and stop the autoroller
at https://luci-scheduler.appspot.com/jobs/chrome/lacros-version-skew-roller
Also please file a bug to OS>LaCrOS>Partner, and CC svenzheng@chromium.org,
yjt@google.com.
R=rubber-stamper@appspot.gserviceaccount.com
Bug: None
Change-Id: I95e56d3c445e495ed1d9a36441249615db9af009
Requires-Testing: True
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3696160
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: chrome-weblayer-builder <chrome-weblayer-builder@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1161}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
testing/buildbot/chromium.chromiumos.json | 20 +++---
testing/buildbot/chromium.fyi.json | 80 +++++++++++------------
testing/buildbot/variants.pyl | 8 +--
3 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 82941bc7cd72..4ce3bb7c9e91 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -6018,21 +6018,21 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"dimension_sets": [
@@ -6044,7 +6044,7 @@
},
"test": "lacros_chrome_browsertests",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -6161,21 +6161,21 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"dimension_sets": [
@@ -6187,7 +6187,7 @@
},
"test": "lacros_chrome_browsertests_run_in_series",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 3d4f3c3b2c9f..f3e2e4997888 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -87176,28 +87176,28 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "lacros_chrome_browsertests",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -87294,28 +87294,28 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "lacros_chrome_browsertests_run_in_series",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -88682,20 +88682,20 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"dimension_sets": [
@@ -88708,7 +88708,7 @@
},
"test": "lacros_chrome_browsertests",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -88825,20 +88825,20 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"dimension_sets": [
@@ -88851,7 +88851,7 @@
},
"test": "lacros_chrome_browsertests_run_in_series",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -90381,20 +90381,20 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"dimension_sets": [
@@ -90407,7 +90407,7 @@
},
"test": "lacros_chrome_browsertests",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -90524,20 +90524,20 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"dimension_sets": [
@@ -90550,7 +90550,7 @@
},
"test": "lacros_chrome_browsertests_run_in_series",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -91286,27 +91286,27 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "lacros_chrome_browsertests",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
},
{
"args": [
@@ -91382,27 +91382,27 @@
},
{
"args": [
- "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome"
+ "--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
- "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5109.0",
+ "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash 104.0.5111.0",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
- "location": "lacros_version_skew_tests_v104.0.5109.0",
- "revision": "version:104.0.5109.0"
+ "location": "lacros_version_skew_tests_v104.0.5111.0",
+ "revision": "version:104.0.5111.0"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "lacros_chrome_browsertests_run_in_series",
"test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
- "variant_id": "Lacros version skew testing ash 104.0.5109.0"
+ "variant_id": "Lacros version skew testing ash 104.0.5111.0"
}
]
},
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 389bb3539547..4f39dbcf07ba 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -28,15 +28,15 @@
},
'LACROS_VERSION_SKEW_CANARY': {
'args': [
- '--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5109.0/test_ash_chrome',
+ '--ash-chrome-path-override=../../lacros_version_skew_tests_v104.0.5111.0/test_ash_chrome',
],
- 'identifier': 'Lacros version skew testing ash 104.0.5109.0',
+ 'identifier': 'Lacros version skew testing ash 104.0.5111.0',
'swarming': {
'cipd_packages': [
{
'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
- 'location': 'lacros_version_skew_tests_v104.0.5109.0',
- 'revision': 'version:104.0.5109.0',
+ 'location': 'lacros_version_skew_tests_v104.0.5111.0',
+ 'revision': 'version:104.0.5111.0',
},
],
},
--
2.37.0

View File

@ -0,0 +1,751 @@
From 3bc634919d42b33ab0b8749d0be44ae8df94eeef Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Fri, 10 Jun 2022 15:01:44 +0000
Subject: [PATCH 03/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I203671558bf72ece1dc32d28027ad7e9f9c62341
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3700111
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1162}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_fa.xtb | 10 ++---
ash/strings/ash_strings_ky.xtb | 4 +-
.../app/resources/generated_resources_ar.xtb | 16 ++++----
.../app/resources/generated_resources_ca.xtb | 2 +-
.../app/resources/generated_resources_fa.xtb | 38 +++++++++----------
.../app/resources/generated_resources_hr.xtb | 4 +-
.../app/resources/generated_resources_iw.xtb | 14 +++----
.../app/resources/generated_resources_ko.xtb | 2 +-
.../app/resources/generated_resources_mr.xtb | 2 +-
.../app/resources/generated_resources_sl.xtb | 4 +-
.../app/resources/generated_resources_th.xtb | 2 +-
.../app/resources/generated_resources_uk.xtb | 2 +-
.../app/resources/generated_resources_ur.xtb | 2 +-
chromeos/strings/chromeos_strings_ca.xtb | 2 +-
chromeos/strings/chromeos_strings_id.xtb | 2 +-
.../resources/policy_templates_pt-BR.xtb | 2 +-
components/strings/components_strings_eu.xtb | 2 +-
components/strings/components_strings_fa.xtb | 6 +--
components/strings/components_strings_te.xtb | 2 +-
.../blink_accessibility_strings_fa.xtb | 2 +-
.../strings/translations/blink_strings_fa.xtb | 4 +-
.../translations/ui_chromeos_strings_af.xtb | 2 +-
.../translations/ui_chromeos_strings_ca.xtb | 2 +-
.../translations/ui_chromeos_strings_ne.xtb | 2 +-
.../translations/ui_chromeos_strings_uk.xtb | 2 +-
.../ui_chromeos_strings_zh-TW.xtb | 2 +-
26 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/ash/strings/ash_strings_fa.xtb b/ash/strings/ash_strings_fa.xtb
index 1ae6274c4fae..297fa02a8dcc 100644
--- a/ash/strings/ash_strings_fa.xtb
+++ b/ash/strings/ash_strings_fa.xtb
@@ -329,7 +329,7 @@
<translation id="2977598380246111477">عدد بعدی</translation>
<translation id="2981684127883932071">نمایش پیشنهادها</translation>
<translation id="2992327365391326550">دکمه میکروفون دستگاه خاموش است.</translation>
-<translation id="2995447421581609334">نمایش دستگاه‌های ارسال محتوا.</translation>
+<translation id="2995447421581609334">نمایش دستگاه‌های پخش محتوا.</translation>
<translation id="2996462380875591307">‏«ذره‌بین متصل» فعال شد. برای خاموش کردن آن، Ctrl+Search+D را دوباره فشار دهید.</translation>
<translation id="3000461861112256445">صدای مونو</translation>
<translation id="3009178788565917040">خروجی</translation>
@@ -570,7 +570,7 @@
<translation id="4338109981321384717">ذره‌بین</translation>
<translation id="4351433414020964307">دستیار درحال بار کردن است...</translation>
<translation id="4356930093361201197">حالت تضاد بالا</translation>
-<translation id="4371348193907997655">تنظیمات ارسال محتوا</translation>
+<translation id="4371348193907997655">تنظیمات پخش محتوا</translation>
<translation id="4378479437904450384"><ph name="WIRELESS_PROVIDER" />، قدرت سیگنال <ph name="SIGNAL_STRENGTH" /> درصد</translation>
<translation id="4378551569595875038">در حال اتصال..</translation>
<translation id="4379531060876907730">این‌ها ابزارهای قلم شما هستند</translation>
@@ -616,7 +616,7 @@
<translation id="4578196883126898996">میکروفون شما خاموش است، دکمه میکروفون دستگاهتان را روشن کنید.</translation>
<translation id="4578906031062871102">منوی تنظیمات باز شد</translation>
<translation id="4581047786858252841">میکروفون روشن است</translation>
-<translation id="4585337515783392668">توقف ارسال محتوا به گیرنده ناشناس</translation>
+<translation id="4585337515783392668">توقف پخش محتوا به گیرنده ناشناس</translation>
<translation id="4586483766170476230">توقف دوربین خودگرفت</translation>
<translation id="4587299710837179226">میکروفون خاموش است</translation>
<translation id="4596144739579517758">زمینه تیره خاموش است</translation>
@@ -911,7 +911,7 @@
<translation id="65320610082834431">اموجی‌ها</translation>
<translation id="6537924328260219877">قدرت سیگنال <ph name="SIGNAL_STRENGTH" />، باتری تلفن <ph name="BATTERY_STATUS" /></translation>
<translation id="6539852571005954999">بارگیری <ph name="FILENAME" /> درحال اسکن</translation>
-<translation id="6542521951477560771">ارسال محتوا به <ph name="RECEIVER_NAME" /></translation>
+<translation id="6542521951477560771">پخش محتوا به <ph name="RECEIVER_NAME" /></translation>
<translation id="655633303491376835"><ph name="APP_NAME" />
نصب جدید</translation>
<translation id="6559976592393364813">سؤال از سرپرست</translation>
@@ -1344,7 +1344,7 @@
<translation id="9178475906033259337">نمایش ۱ نتیجه برای <ph name="QUERY" /></translation>
<translation id="9179259655489829027">این ویژگی امکان می‌دهد بدون نیاز به گذرواژه، به هر کاربری که به سیستم واردشده به‌سرعت دسترسی داشته باشید. تنها برای حساب‌های مورد اعتمادتان از این ویژگی استفاده کنید.</translation>
<translation id="9183456764293710005">ذره‌بین تمام‌صفحه</translation>
-<translation id="9193626018745640770">درحال ارسال محتوا به گیرنده ناشناس</translation>
+<translation id="9193626018745640770">درحال پخش محتوا به گیرنده ناشناس</translation>
<translation id="9194617393863864469">ورود به سیستم حسابی دیگر...</translation>
<translation id="9198992156681343238">وضوح <ph name="DISPLAY_NAME" /> به <ph name="RESOLUTION" /> تغییر کرد. برای حفظ تغییرات، روی تأیید کلیک کنید. تنظیمات قبلی <ph name="TIMEOUT_SECONDS" /> دیگر بازیابی خواهد شد.</translation>
<translation id="9201044636667689546"><ph name="NAME" /> را به این Chromebook متصل کنید</translation>
diff --git a/ash/strings/ash_strings_ky.xtb b/ash/strings/ash_strings_ky.xtb
index f64658ebacfe..3816b25eca33 100644
--- a/ash/strings/ash_strings_ky.xtb
+++ b/ash/strings/ash_strings_ky.xtb
@@ -85,7 +85,7 @@
<translation id="1341651618736211726">Кошумча</translation>
<translation id="1346748346194534595">Оң</translation>
<translation id="1351937230027495976">Менюну жыйыштыруу</translation>
-<translation id="1364382257761975320">Chromebook'тун кулпусун ачуу үчүн манжаңыздын изин колдонуңуз</translation>
+<translation id="1364382257761975320">Chromebook'тун кулпусун манжаңыздын изи менен ачыңыз</translation>
<translation id="1364618750746929654">Транскрипция түзүлгөн жок</translation>
<translation id="1372545819342940910">Иш тактаны кийинкиге сактоо</translation>
<translation id="1383597849754832576">Кеп файлдары жүктөлүп алынган жок. Кийинчерээк кайталаңыз.</translation>
@@ -240,7 +240,7 @@
<translation id="2369165858548251131">Кытайча "Салам"</translation>
<translation id="2390318262976603432">Тил жөндөөлөрү</translation>
<translation id="240006516586367791">Медианы башкаруу элементтери</translation>
-<translation id="2402411679569069051">Chromebook'тун кулпусун ачуу үчүн манжаңыздын изин колдонуңуз же телефонуңуздун кулпусун ачыңыз</translation>
+<translation id="2402411679569069051">Chromebook'тун кулпусун манжаңыздын изи менен ачыңыз же телефонуңуздун кулпусун ачыңыз</translation>
<translation id="2405664212338326887">Туташкан жок</translation>
<translation id="2408955596600435184">PIN кодуңузду киргизиңиз</translation>
<translation id="2412593942846481727">Жаңы версия бар</translation>
diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb
index 0f3b8a2fce9d..62cc88d48a2e 100644
--- a/chrome/app/resources/generated_resources_ar.xtb
+++ b/chrome/app/resources/generated_resources_ar.xtb
@@ -1131,7 +1131,7 @@
<translation id="2082187087049518845">إضافة علامة التبويب إلى مجموعة جديدة</translation>
<translation id="2082510809738716738">اختيار لون المظهر</translation>
<translation id="208586643495776849">يُرجى إعادة المحاولة</translation>
-<translation id="208634871997892083">‏الشبكة الافتراضية الخاصة (VPN) قيد التشغيل دائمًا</translation>
+<translation id="208634871997892083">‏شبكة افتراضية خاصة (VPN) قيد التشغيل دائمًا</translation>
<translation id="2087822576218954668">الطباعة: <ph name="PRINT_NAME" /></translation>
<translation id="2088092308059522196">لن يُتاح التسجيل إلا بعد تثبيت نظام التشغيل <ph name="DEVICE_OS" />.</translation>
<translation id="208928984520943006">للوصول إلى الشاشة الرئيسية في أي وقت، مرّر سريعًا بإصبعك من أسفل الشاشة إلى أعلاها.</translation>
@@ -1169,7 +1169,7 @@
<translation id="2105809836724866556">تم إخفاء <ph name="MODULE_TITLE" />.</translation>
<translation id="2108349519800154983">{COUNT,plural, =1{رقم هاتف واحد}zero{# رقم هاتف}two{رقما هاتف}few{# أرقام هاتف}many{# رقم هاتف}other{# رقم هاتف}}</translation>
<translation id="211144231511833662">محو الأنواع</translation>
-<translation id="2111670510994270194">إضافة علامة تبويب جديدة يمينًا</translation>
+<translation id="2111670510994270194">إضافة علامة تبويب جديدة على اليمين</translation>
<translation id="2112554630428445878">مرحبًا، <ph name="USERNAME" /></translation>
<translation id="21133533946938348">تثبيت علامة التبويب</translation>
<translation id="2113479184312716848">فتح &amp;ملف...</translation>
@@ -1545,7 +1545,7 @@
<translation id="244231003699905658">العنوان غير صالح يُرجى التحقّق من العنوان وإعادة المحاولة.</translation>
<translation id="2442916515643169563">ظل النص</translation>
<translation id="2443487764245141020">قد تحتاج المواقع الإلكترونية أيضًا إلى التعرُّف على جهازك باستخدام أحد المعرّفات.</translation>
-<translation id="244475495405467108">إغلاق علامات التبويب على اليمين</translation>
+<translation id="244475495405467108">إغلاق علامات التبويب على اليسار</translation>
<translation id="2445081178310039857">دليل الجذر للإضافة مطلوب.</translation>
<translation id="2445484935443597917">إنشاء ملف شخصي جديد</translation>
<translation id="244641233057214044">ذو صلة بعملية البحث</translation>
@@ -2301,7 +2301,7 @@
<translation id="3164329792803560526">مشاركة علامة التبويب هذه مع <ph name="APP_NAME" /></translation>
<translation id="3165390001037658081">قد يحظر بعض مشغلي شبكات الجوّال هذه الميزة.</translation>
<translation id="3170072451822350649">يمكنك أيضًا تخطي تسجيل الدخول و<ph name="LINK_START" />التصفح كضيف<ph name="LINK_END" />.</translation>
-<translation id="31774765611822736">إضافة علامة تبويب جديدة على اليمين</translation>
+<translation id="31774765611822736">إضافة علامة تبويب جديدة على اليسار</translation>
<translation id="3177909033752230686">لغة الصفحة:</translation>
<translation id="3179982752812949580">خط النص</translation>
<translation id="3181954750937456830">التصفُّح الآمن (يحميك ويحمي جهازك من المواقع الإلكترونية الضارة)</translation>
@@ -3164,7 +3164,7 @@
<translation id="4021279097213088397"></translation>
<translation id="402184264550408568">‏بروتوكول (TCP)</translation>
<translation id="4021909830315618592">نسخ تفاصيل الإصدار</translation>
-<translation id="4021941025609472374">إغلاق علامات التبويب على اليمين</translation>
+<translation id="4021941025609472374">إغلاق علامات التبويب على اليسار</translation>
<translation id="4022426551683927403">إ&amp;ضافة إلى القاموس</translation>
<translation id="4023146161712577481">جارٍ تحديد تكوين الجهاز.</translation>
<translation id="4025039777635956441">كتم صوت الموقع الإلكتروني المحدد</translation>
@@ -3868,7 +3868,7 @@
<translation id="4742970037960872810">إزالة التمييز</translation>
<translation id="4743260470722568160"><ph name="BEGIN_LINK" />التعرّف على كيفية تحديث التطبيقات<ph name="END_LINK" /></translation>
<translation id="4744981231093950366">{NUM_TABS,plural, =1{إعادة صوت موقع إلكتروني واحد}zero{إعادة صوت المواقع الإلكترونية}two{إعادة صوت موقعيِّ الويب}few{إعادة صوت المواقع الإلكترونية}many{إعادة صوت المواقع الإلكترونية}other{إعادة صوت المواقع الإلكترونية}}</translation>
-<translation id="474609389162964566">‏الوصول إلى "مساعد Google" من خلال قول الكلمة المفتاح Ok Google</translation>
+<translation id="474609389162964566">‏الوصول إلى "مساعد Google" من خلال قول Ok Google</translation>
<translation id="4746351372139058112">الرسائل</translation>
<translation id="4748783296226936791">‏تتّصل المواقع الإلكترونية عادةً بأجهزة HID لتتيح الميزات التي تستخدم لوحات المفاتيح غير العادية ووحدات التحكّم في الألعاب وغيرها من الأجهزة.</translation>
<translation id="4750185073185658673">‏عليك الانتقال إلى هاتفك لمراجعة بعض الأذونات الإضافية. تأكَّد من تفعيل البلوتوث وWi-Fi على هاتفك.</translation>
@@ -4972,7 +4972,7 @@
<translation id="5870155679953074650">الأخطاء الجسيمة</translation>
<translation id="5875534259258494936">تم إنهاء مشاركة الشاشة</translation>
<translation id="5876576639916258720">يتم الآن التنفيذ...</translation>
-<translation id="5876851302954717356">إضافة علامة تبويب جديدة يمينًا</translation>
+<translation id="5876851302954717356">إضافة علامة تبويب جديدة على اليمين</translation>
<translation id="5877064549588274448">تم تغيير القناة. يمكنك إعادة تشغيل الجهاز لتدخل التغييرات حيز التنفيذ.</translation>
<translation id="5877584842898320529">الطابعة المُختارة غير متاحة أو لم يتم تثبيتها بشكلٍ صحيح. <ph name="BR" /> يُرجى التحقُّق من الطابعة أو تجربة اختيار طابعة أخرى.</translation>
<translation id="5882919346125742463">الشبكات المعروفة</translation>
@@ -6717,7 +6717,7 @@
<translation id="7622966771025050155">التبديل إلى علامة التبويب التي يتم تسجيلها</translation>
<translation id="7624337243375417909">‏مفتاح caps lock متوقف</translation>
<translation id="7625568159987162309">عرض الأذونات والبيانات المُخزَّنة على المواقع</translation>
-<translation id="7625823789272218216">إضافة علامة تبويب جديدة على اليمين</translation>
+<translation id="7625823789272218216">إضافة علامة تبويب جديدة على اليسار</translation>
<translation id="7626032353295482388">‏مرحبًا بك في Chrome</translation>
<translation id="7628201176665550262">معدّل إعادة التحميل</translation>
<translation id="7629827748548208700">علامة التبويب: <ph name="TAB_NAME" /></translation>
diff --git a/chrome/app/resources/generated_resources_ca.xtb b/chrome/app/resources/generated_resources_ca.xtb
index 34e962d18fe8..cc790fea63b6 100644
--- a/chrome/app/resources/generated_resources_ca.xtb
+++ b/chrome/app/resources/generated_resources_ca.xtb
@@ -7084,7 +7084,7 @@ Prem un interruptor o una tecla assignats per suprimir una assignació.</transla
<translation id="7961015016161918242">Mai</translation>
<translation id="7963001036288347286">Acceleració del ratolí tàctil</translation>
<translation id="7963608432878156675">Altres dispositius poden veure aquest nom per a les connexions Bluetooth i a la xarxa</translation>
-<translation id="7963826112438303517">L'Assistent utilitza aquestes gravacions i les sol·licituds de veu per crear i actualitzar el teu model de veu, que només es desa als dispositius en què has activat Voice Match. Consulta l'activitat de veu o torna a entrenar el model a Configuració de l'Assistent.</translation>
+<translation id="7963826112438303517">L'Assistent utilitza aquestes gravacions i les sol·licituds de veu per crear i actualitzar el teu model de veu, que només es desa als dispositius en què has activat Voice Match. Consulta l'activitat de veu o torna a entrenar el model a la configuració de l'Assistent.</translation>
<translation id="7966241909927244760">C&amp;opia l'adreça de la imatge</translation>
<translation id="7966571622054096916">{COUNT,plural, =1{1 element a la llista d'adreces d'interès}other{{COUNT} elements a la llista d'adreces d'interès}}</translation>
<translation id="7968072247663421402">Opcions de proveïdors</translation>
diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb
index 3efc0d74cd22..05d479b3f7ee 100644
--- a/chrome/app/resources/generated_resources_fa.xtb
+++ b/chrome/app/resources/generated_resources_fa.xtb
@@ -79,7 +79,7 @@
<ph name="BEGIN_PARAGRAPH4" />اگر تنظیم «فعالیت وب و برنامه» تکمیلی برای «حساب Google» فرزندتان روشن باشد، ممکن است داده‌های فرزندتان در «حساب Google» او ذخیره شود. در families.google.com، درباره این تنظیمات و نحوه تغییر آن‌ها بیشتر بدانید.<ph name="END_PARAGRAPH4" />
<ph name="BEGIN_PARAGRAPH4" />اگر مالک دستگاه «ارسال داده‌های استفاده و عیب‌یابی» را روشن کند، ممکن است گزارش‌های خرابی نیز برای Google بارگذاری شود.<ph name="END_PARAGRAPH3" /></translation>
<translation id="1076176485976385390">پیمایش کردن صفحه‌ها با نشانگر نوشتار</translation>
-<translation id="1076382954055048850">نمایش جلسه‌های دیگر ارسال محتوا</translation>
+<translation id="1076382954055048850">نمایش جلسه‌های دیگر پخش محتوا</translation>
<translation id="1076698951459398590">فعال کردن زمینه</translation>
<translation id="1076766328672150609">فرزندتان می‌تواند برای باز کردن قفل دستگاه از پین استفاده کند.</translation>
<translation id="1076818208934827215">Microsoft Internet Explorer</translation>
@@ -176,7 +176,7 @@
<translation id="1163931534039071049">&amp;نمای منبع قاب</translation>
<translation id="1164891049599601209">در سایت فریب‌دهنده وارد شده است</translation>
<translation id="1165039591588034296">خطا</translation>
-<translation id="1166212789817575481">بستن برگه‌ها به چپ</translation>
+<translation id="1166212789817575481">بستن برگه‌های سمت راست</translation>
<translation id="1166583374608765787">مرور به‌روزرسانی نام</translation>
<translation id="1166596238782048887"><ph name="TAB_TITLE" /> به میزکار <ph name="DESK_TITLE" /> تعلق دارد</translation>
<translation id="1168020859489941584">باز کردن با <ph name="TIME_REMAINING" />...</translation>
@@ -1175,7 +1175,7 @@
<translation id="2105809836724866556"><ph name="MODULE_TITLE" /> پنهان شده است</translation>
<translation id="2108349519800154983">{COUNT,plural, =1{شماره تلفن}one{# شماره تلفن}other{# شماره تلفن}}</translation>
<translation id="211144231511833662">پاک کردن نوع</translation>
-<translation id="2111670510994270194">برگه جدید در راست</translation>
+<translation id="2111670510994270194">برگه جدید در سمت راست</translation>
<translation id="2112554630428445878">خوش آمدید، <ph name="USERNAME" /></translation>
<translation id="21133533946938348">کوچک کردن برگه</translation>
<translation id="2113479184312716848">باز کردن &amp;فایل...</translation>
@@ -1337,7 +1337,7 @@
<translation id="2263189956353037928">خروج از سیستم و ورود دوباره به آن</translation>
<translation id="2263371730707937087">نرخ بازآوری صفحه</translation>
<translation id="2263679799334060788">‏بازخورد شما به ما کمک می‌کند Google Cast را بهبود ببخشیم و بابت ارائه آن از شما سپاس‌گزاریم.
- برای دریافت راهنمایی درباره عیب‌یابی مشکلات ارسال محتوا، لطفاً به
+ برای دریافت راهنمایی درباره عیب‌یابی مشکلات پخش محتوا، لطفاً به
<ph name="BEGIN_LINK" />
مرکز راهنمایی<ph name="END_LINK" /> مراجعه کنید.</translation>
<translation id="22665427234727190">وقتی سایتی می‌خواهد به دستگاه‌های مجهز به بلوتوث دسترسی پیدا کند سؤال شود (توصیه می‌شود)</translation>
@@ -2196,7 +2196,7 @@
<translation id="3046910703532196514">صفحهٔ وب، کامل</translation>
<translation id="304747341537320566">موتورهای گفتار</translation>
<translation id="3048336643003835855">‏دستگاه‌های HID از فروشنده <ph name="VENDOR_ID" /></translation>
-<translation id="3048917188684939573">گزارش‌های ارسال محتوا و دستگاه‌ها</translation>
+<translation id="3048917188684939573">گزارش‌های پخش محتوا و دستگاه‌ها</translation>
<translation id="3051250416341590778">اندازه نمایش</translation>
<translation id="3053013834507634016">کاربرد کلید گواهی</translation>
<translation id="3053273573829329829">فعال کردن پین کاربر</translation>
@@ -2309,7 +2309,7 @@
<translation id="3164329792803560526">درحال هم‌رسانی این برگه با <ph name="APP_NAME" /></translation>
<translation id="3165390001037658081">برخی شرکت‌های مخابراتی ممکن است این قابلیت را مسدود کنند.</translation>
<translation id="3170072451822350649">همچنین می‌توانید از ورود به سیستم صرف‌نظر کرده، <ph name="LINK_START" />به عنوان مهمان مرور کنید<ph name="LINK_END" />.</translation>
-<translation id="31774765611822736">برگه جدید در چپ</translation>
+<translation id="31774765611822736">برگه جدید در سمت چپ</translation>
<translation id="3177909033752230686">زبان صفحه:</translation>
<translation id="3179982752812949580">قلم نوشتار</translation>
<translation id="3181954750937456830">مرور ایمن (از شما و دستگاهتان درمقابل سایت‌های خطرناک محافظت می‌کند)</translation>
@@ -2503,7 +2503,7 @@
<translation id="3393582007140394275">محتوای صفحه ارسال نشد.</translation>
<translation id="3394850431319394743">سایت‌هایی که مجاز هستند از شناسه‌ها برای پخش محتوای محافظت‌شده استفاده کنند</translation>
<translation id="3396744558790608201">‏برای جستجوی هر بخشی از سایت و دریافت اطلاعات بیشتر درباره محتوای بصری که هنگام مرور و خرید در وب می‌بینید، کلیک راست کنید و «جستجوی تصاویر با «لنز Google»» را انتخاب کنید.</translation>
-<translation id="3396800784455899911">‏با کلیک کردن روی دکمه «پذیرفتن و ادامه»، با پردازش مربوط به این سرویس‌های Google که در بالا توضیح داده شد موافقت می‌کنید.</translation>
+<translation id="3396800784455899911">‏با کلیک کردن روی دکمه «پذیرفتن و ادامه دادن»، با پردازش مربوط به این سرویس‌های Google که در بالا توضیح داده شد موافقت می‌کنید.</translation>
<translation id="339722927132407568">ثابت می‌ماند</translation>
<translation id="3399432415385675819">اعلان‌ها غیرفعال خواهند شد</translation>
<translation id="3400390787768057815"><ph name="WIDTH" /> × <ph name="HEIGHT" /> (<ph name="REFRESH_RATE" /> هرتز) - درهم‌بافته</translation>
@@ -3480,7 +3480,7 @@
<translation id="4348766275249686434">جمع‌آوری خطاها</translation>
<translation id="4349828822184870497">مفید</translation>
<translation id="4350230709416545141">دسترسی <ph name="HOST" /> به مکان شما همیشه مسدود شود</translation>
-<translation id="4350782034419308508">Hey Google</translation>
+<translation id="4350782034419308508">Ok Google</translation>
<translation id="4351770750390404505"><ph name="BEGIN_PARAGRAPH1" />برای ارائه بهترین تجربه، <ph name="DEVICE_OS" /> داده‌های سخت‌افزار مربوط دستگاه‌ها را جمع‌آوری می‌کند و آن‌ها را با Google هم‌رسانی می‌کند تا مشخص شود چه به‌روزرسانی‌هایی باید ارائه شود. درصورت تمایل، می‌توانید به Google اجازه دهید از این داده‌ها برای اهداف دیگری مانند پشتیبانی و بهبود بخشیدن به سرویس و تجربه <ph name="DEVICE_OS" /> استفاده کند.<ph name="END_PARAGRAPH1" />
<ph name="BEGIN_PARAGRAPH2" />می‌توانید در این دستگاه به سیستم وارد شوید و به بخش CHROMEOSFLEX_HARDWARE_INFO در chrome://system بروید تا این موارد را ببینید: داده‌های ارسال‌شده به Google برای فیلتر کردن به‌روزرسانی‌ها و همچنین هر نمونه دیگری از انتخاب هم‌رسانی داده با Google.<ph name="END_PARAGRAPH2" />
<ph name="BEGIN_PARAGRAPH3" />برای دریافت جزئیات بیشتر درباره داده‌هایی که <ph name="DEVICE_OS" /> ممکن است با Google هم‌رسانی کند و نحوه استفاده از این داده‌ها، از g.co/flex/HWDataCollection بازدید کنید.<ph name="END_PARAGRAPH3" /></translation>
@@ -3494,7 +3494,7 @@
<translation id="4361142739114356624">کلید خصوصی برای این گواهی کارخواه موجود نیست یا نامعتبر است</translation>
<translation id="4361745360460842907">باز کردن به‌عنوان برگه</translation>
<translation id="4362675504017386626"><ph name="ACCOUNT_EMAIL" /> حساب پیش‌فرض در <ph name="DEVICE_TYPE" /> شما است</translation>
-<translation id="4363771538994847871">هیچ مقصدی برای ارسال محتوا پیدا نشد. نیاز به راهنمایی دارید؟</translation>
+<translation id="4363771538994847871">هیچ مقصدی برای پخش محتوا پیدا نشد. نیاز به راهنمایی دارید؟</translation>
<translation id="4364327530094270451">خربزه</translation>
<translation id="4364567974334641491"><ph name="APP_NAME" /> در حال اشتراک‌گذاری یک پنجره است.</translation>
<translation id="4364830672918311045">نمایش اعلان‌ها</translation>
@@ -3529,7 +3529,7 @@
<translation id="4400367121200150367">سایت‌هایی که هرگز گذرواژه را ذخیره نمی‌کنند در اینجا نشان داده نخواهند شد</translation>
<translation id="4400632832271803360">برای تغییر عملکرد کلیدهای ردیف بالا، کلید «راه‌انداز» را نگه‌دارید</translation>
<translation id="4400963414856942668">برای نشانک‌گذاری یک برگه، می‌توانید روی ستاره کلیک کنید</translation>
-<translation id="4401912261345737180">برای ارسال محتوا، بااستفاده از کد متصل شوید</translation>
+<translation id="4401912261345737180">برای پخش محتوا، بااستفاده از کد متصل شوید</translation>
<translation id="4402755511846832236">از اینکه سایت‌ها بدانند چه زمانی به‌صورت فعال از این دستگاه استفاده می‌کنید جلوگیری می‌شود</translation>
<translation id="4403266582403435904">‏هرزمان خواستید به‌آسانی داده‌هایتان را بازیابی کنید یا دستگاه‌هایتان را عوض کنید. داده‌های پشتیبان در Google بارگذاری می‌شوند و با گذرواژه «حساب Google» فرزندتان رمزگذاری می‌شوند.</translation>
<translation id="4403775189117163360">پوشه دیگری را انتخاب کنید</translation>
@@ -4671,7 +4671,7 @@
<translation id="5554403733534868102">پس از این، نیازی نیست برای به‌روزرسانی‌ها صبر کنید</translation>
<translation id="5554489410841842733">این نماد وقتی قابل رؤیت است که برنامهٔ افزودنی بتواند برای صفحه فعلی کار کند.</translation>
<translation id="5554720593229208774">ارائه دهنده مجوز ایمیل</translation>
-<translation id="5555363196923735206">چرخش دوربین</translation>
+<translation id="5555363196923735206">چرخاندن دوربین</translation>
<translation id="5555525474779371165">انتخاب ویژگی حفاظتی «مرور ایمن»</translation>
<translation id="5556459405103347317">تازه‌سازی</translation>
<translation id="5558125320634132440">این سایت مسدود شده است زیرا احتمالاً حاوی محتوای بزرگ‌سالان است</translation>
@@ -4983,7 +4983,7 @@
<translation id="5870155679953074650">خطاهای سخت‌افزاری</translation>
<translation id="5875534259258494936">هم‌رسانی صفحه به‌پایان رسید</translation>
<translation id="5876576639916258720">درحال اجرا…</translation>
-<translation id="5876851302954717356">برگه جدید در راست</translation>
+<translation id="5876851302954717356">برگه جدید در سمت راست</translation>
<translation id="5877064549588274448">کانال تغییر کرد. برای اعمال تغییرات دستگاه خود را مجدداً راه‌اندازی کنید.</translation>
<translation id="5877584842898320529">چاپگر انتخابی موجود نیست یا به‌درستی نصب نشده است. <ph name="BR" /> چاپگر خود را بررسی کنید یا چاپگر دیگری را انتخاب کنید.</translation>
<translation id="5882919346125742463">شبکه‌های شناخته‌شده</translation>
@@ -5155,7 +5155,7 @@
<ph name="BEGIN_PARAGRAPH4" />اگر تنظیم «فعالیت وب و برنامه» تکمیلی برای «حساب Google» فرزندتان روشن باشد، ممکن است داده‌های فرزندتان در این حساب ذخیره شود. در families.google.com، درباره این تنظیمات و نحوه تغییر آن‌ها بیشتر بدانید.<ph name="END_PARAGRAPH4" /></translation>
<translation id="6051811090255711417">سازمان شما این فایل را به‌دلیل عدم رعایت خط‌مشی امنیتی مسدود کرد</translation>
<translation id="6052284303005792909">•</translation>
-<translation id="6052488962264772833">برای شروع ارسال محتوا، کد دسترسی را تایپ کنید</translation>
+<translation id="6052488962264772833">برای شروع پخش محتوا، کد دسترسی را تایپ کنید</translation>
<translation id="6052976518993719690">‏اعتبار گواهی SSL</translation>
<translation id="6053401458108962351">&amp;حذف داده‌های مرور...</translation>
<translation id="6054284857788651331">گروه برگه اخیراً بسته‌شده</translation>
@@ -5799,7 +5799,7 @@
<translation id="6683087162435654533">بازیابی همه برگه‌ها</translation>
<translation id="6684827949542560880">درحال بارگیری آخرین به‌روزرسانی</translation>
<translation id="668599234725812620">‏باز کردن Google Play</translation>
-<translation id="6686490380836145850">بستن برگه‌ها به چپ</translation>
+<translation id="6686490380836145850">بستن برگه‌های سمت راست</translation>
<translation id="6686665106869989887">برگه به راست منتقل شد</translation>
<translation id="6686817083349815241">ذخیره گذرواژه‌تان</translation>
<translation id="6687079240787935001">پنهان کردن <ph name="MODULE_TITLE" /></translation>
@@ -6459,7 +6459,7 @@
<translation id="7362387053578559123">سایت‌ها می‌توانند برای اتصال به دستگاه‌های بلوتوث درخواست دهند</translation>
<translation id="7363349185727752629">راهنمای گزینه‌های حریم‌خصوصی</translation>
<translation id="7364591875953874521">دسترسی درخواست شده</translation>
-<translation id="7364745943115323529">ارسال محتوا…</translation>
+<translation id="7364745943115323529">پخش محتوا…</translation>
<translation id="7364796246159120393">انتخاب فایل</translation>
<translation id="7365076891350562061">اندازه نمایشگر</translation>
<translation id="7366316827772164604">درحال اسکن کردن برای یافتن دستگاه‌های اطراف…</translation>
@@ -6512,7 +6512,7 @@
<translation id="7409735910987429903">سایت‌ها شاید برای نمایش آگهی از بالاپر استفاده کنند، یا بااستفاده از هدایت‌ها شما را به وب‌سایت‌هایی هدایت کنند که شاید نخواهید بازدید کنید</translation>
<translation id="7409854300652085600">نشانک‌ها وارد شد.</translation>
<translation id="7410344089573941623">بپرسید که آیا <ph name="HOST" /> می‌خواهد به دوربین و میکرفون شما دسترسی داشته باشد</translation>
-<translation id="7410852728357935715">ارسال محتوا به دستگاه</translation>
+<translation id="7410852728357935715">پخش محتوا به دستگاه</translation>
<translation id="741204030948306876">بله، موافقم</translation>
<translation id="7412226954991670867">‏حافظه GPU</translation>
<translation id="7414464185801331860">۱۸ برابر</translation>
@@ -6727,7 +6727,7 @@
<translation id="7622966771025050155">رفتن به برگه ضبط‌شده</translation>
<translation id="7624337243375417909">caps lock غیرفعال</translation>
<translation id="7625568159987162309">مشاهده مجوزها و داده‌های ذخیره‌شده در همه سایت‌ها</translation>
-<translation id="7625823789272218216">برگه جدید در چپ</translation>
+<translation id="7625823789272218216">برگه جدید در سمت چپ</translation>
<translation id="7626032353295482388">‏به Chrome خوش آمدید</translation>
<translation id="7628201176665550262">نرخ بازآوری</translation>
<translation id="7629827748548208700">برگه: <ph name="TAB_NAME" /></translation>
@@ -8015,7 +8015,7 @@
<translation id="8872506776304248286">باز کردن در برنامه</translation>
<translation id="8872777911145321141">وقتی سایتی می‌خواهد از دستگاه‌ها و داده‌های واقعیت مجازی استفاده کند سؤال شود (توصیه می‌شود)</translation>
<translation id="8874184842967597500">متصل نیست</translation>
-<translation id="8874341931345877644">ارسال محتوا به دستگاه:</translation>
+<translation id="8874341931345877644">پخش محتوا به دستگاه:</translation>
<translation id="8875520811099717934">‏ارتقا دادن Linux</translation>
<translation id="8875736897340638404">انتخاب وضعیت نمایان بودن</translation>
<translation id="8876307312329369159">این تنظیم در جلسه نمایشی قابل‌تغییر نیست.</translation>
@@ -8391,7 +8391,7 @@
<translation id="957960681186851048">این سایت تلاش کرده است چند فایل را به‌طور خودکار بارگیری کند</translation>
<translation id="960987915827980018">حدود ۱ ساعت باقی مانده است</translation>
<translation id="962802172452141067">درخت پوشه نشانک</translation>
-<translation id="964286338916298286">‏سرپرست IT شما Chrome Goodies را برای دستگاهتان غیرفعال کرده است.</translation>
+<translation id="964286338916298286">‏سرپرست فناوری اطلاعات شما Chrome Goodies را برای دستگاهتان غیرفعال کرده است.</translation>
<translation id="964439421054175458">{NUM_APLLICATIONS,plural, =1{برنامه}one{برنامه}other{برنامه}}</translation>
<translation id="964790508619473209">تنظیم صفحه‌نمایش</translation>
<translation id="965211523698323809">ارسال و دریافت پیامک از <ph name="DEVICE_TYPE" /> شما. <ph name="LINK_BEGIN" />بیشتر بدانید<ph name="LINK_END" /></translation>
diff --git a/chrome/app/resources/generated_resources_hr.xtb b/chrome/app/resources/generated_resources_hr.xtb
index b11e723c46f7..36c265474811 100644
--- a/chrome/app/resources/generated_resources_hr.xtb
+++ b/chrome/app/resources/generated_resources_hr.xtb
@@ -3869,7 +3869,7 @@ i Ctrl + Alt + Smanjivanje svjetline da biste smanjili prikaz.</translation>
<translation id="4742970037960872810">Ukloni isticanje</translation>
<translation id="4743260470722568160"><ph name="BEGIN_LINK" />Saznajte kako ažurirati aplikacije<ph name="END_LINK" /></translation>
<translation id="4744981231093950366">{NUM_TABS,plural, =1{Uključi zvuk na web-lokaciji}one{Uključi zvuk na web-lokacijama}few{Uključi zvuk na web-lokacijama}other{Uključi zvuk na web-lokacijama}}</translation>
-<translation id="474609389162964566">Pristupajte Asistentu tako što ćete reći "Hey Google"</translation>
+<translation id="474609389162964566">Pristupite Asistentu tako da kažete Ok Google</translation>
<translation id="4746351372139058112">Poruke</translation>
<translation id="4748783296226936791">Web-lokacije se obično povezuju s HID uređajima radi značajki koje koriste neuobičajene tipkovnice, upravljače za igre i druge uređaje</translation>
<translation id="4750185073185658673">Pregled daljnjih nekoliko dopuštenja nastavite na telefonu. Provjerite jesu li na telefonu uključeni Bluetooth i Wi-Fi.</translation>
@@ -6491,7 +6491,7 @@ Toj radnji možete dodijeliti više prekidača.</translation>
<translation id="7404065585741198296">Telefonom povezanim USB kabelom</translation>
<translation id="7405938989981604410">{NUM_HOURS,plural, =1{Sigurnosna provjera izvršena je prije sat vremena}one{Sigurnosna provjera izvršena je prije {NUM_HOURS} sata}few{Sigurnosna provjera izvršena je prije {NUM_HOURS} sata}other{Sigurnosna provjera izvršena je prije {NUM_HOURS} sati}}</translation>
<translation id="740624631517654988">Skočni prozor blokiran</translation>
-<translation id="7407430846095439694">Uvezi i uveži</translation>
+<translation id="7407430846095439694">Uvezi i poveži</translation>
<translation id="7407504355934009739">Većina korisnika blokira obavijesti s te web-lokacije</translation>
<translation id="740810853557944681">Dodajte poslužitelj za ispis</translation>
<translation id="7409549334477097887">Posebno velik</translation>
diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb
index 3fa3578d6d0f..68a5ad9bb773 100644
--- a/chrome/app/resources/generated_resources_iw.xtb
+++ b/chrome/app/resources/generated_resources_iw.xtb
@@ -176,7 +176,7 @@
<translation id="1163931534039071049">&amp;הצגת מקור המסגרת</translation>
<translation id="1164891049599601209">הוזנה באתר מטעה</translation>
<translation id="1165039591588034296">שגיאה</translation>
-<translation id="1166212789817575481">סגירת הכרטיסיות משמאל</translation>
+<translation id="1166212789817575481">סגירת הכרטיסיות מימין</translation>
<translation id="1166583374608765787">בדיקת עדכון השם</translation>
<translation id="1166596238782048887">הכרטיסייה <ph name="TAB_TITLE" /> שייכת לשולחן העבודה הווירטואלי <ph name="DESK_TITLE" /></translation>
<translation id="1168020859489941584">הפתיחה תתבצע בעוד <ph name="TIME_REMAINING" />...</translation>
@@ -1177,7 +1177,7 @@
<translation id="2105809836724866556">ההסתרה של <ph name="MODULE_TITLE" /> בוצעה</translation>
<translation id="2108349519800154983">{COUNT,plural, =1{מספר טלפון}two{# מספרי טלפון}many{# מספרי טלפון}other{# מספרי טלפון}}</translation>
<translation id="211144231511833662">ניקוי הסוגים</translation>
-<translation id="2111670510994270194">כרטיסייה חדשה מצד שמאל</translation>
+<translation id="2111670510994270194">כרטיסייה חדשה מצד ימין</translation>
<translation id="2112554630428445878">שלום, <ph name="USERNAME" /></translation>
<translation id="21133533946938348">הצמדת כרטיסייה</translation>
<translation id="2113479184312716848">פתיחת &amp;קובץ...</translation>
@@ -1556,7 +1556,7 @@
<translation id="244231003699905658">כתובת לא חוקית. יש לבדוק את הכתובת ולנסות שוב.</translation>
<translation id="2442916515643169563">צללית טקסט</translation>
<translation id="2443487764245141020">ייתכן שגם באתרים יהיה צורך לזהות את המכשיר שלך באמצעות מזהה</translation>
-<translation id="244475495405467108">סגירת הכרטיסיות מימין</translation>
+<translation id="244475495405467108">סגירת הכרטיסיות משמאל</translation>
<translation id="2445081178310039857">ספריית הבסיס של ההרחבה נחוצה.</translation>
<translation id="2445484935443597917">יצירת פרופיל חדש</translation>
<translation id="244641233057214044">קשור לחיפוש שלך</translation>
@@ -3177,7 +3177,7 @@
<translation id="4021279097213088397"></translation>
<translation id="402184264550408568">(TCP)</translation>
<translation id="4021909830315618592">‏העתקת פרטי build</translation>
-<translation id="4021941025609472374">סגירת הכרטיסיות מימין</translation>
+<translation id="4021941025609472374">סגירת הכרטיסיות משמאל</translation>
<translation id="4022426551683927403">&amp;הוספה למילון</translation>
<translation id="4023146161712577481">קביעת התצורה של המכשיר.</translation>
<translation id="4025039777635956441">השתקת האתרים שנבחרו</translation>
@@ -4986,7 +4986,7 @@
<translation id="5870155679953074650">שגיאות חמורות</translation>
<translation id="5875534259258494936">שיתוף המסך הסתיים</translation>
<translation id="5876576639916258720">התכונה פעילה…</translation>
-<translation id="5876851302954717356">כרטיסייה חדשה מצד שמאל</translation>
+<translation id="5876851302954717356">כרטיסייה חדשה מצד ימין</translation>
<translation id="5877064549588274448">הערוץ שונה. יש להפעיל מחדש את המכשיר להחלת השינויים.</translation>
<translation id="5877584842898320529">המדפסת שבחרת אינה זמינה או שאינה מותקנת כראוי. <ph name="BR" /> יש לבדוק את המדפסת או לנסות לבחור מדפסת אחרת.</translation>
<translation id="5882919346125742463">רשתות מוכרות</translation>
@@ -5802,7 +5802,7 @@
<translation id="6683087162435654533">ש&amp;חזור כל הכרטיסיות</translation>
<translation id="6684827949542560880">המערכת מורידה את העדכון האחרון</translation>
<translation id="668599234725812620">‏פתיחת Google Play</translation>
-<translation id="6686490380836145850">סגירת הכרטיסיות משמאל</translation>
+<translation id="6686490380836145850">סגירת הכרטיסיות מימין</translation>
<translation id="6686665106869989887">הכרטיסייה הועברה שמאלה</translation>
<translation id="6686817083349815241">שמירת הסיסמה שלך</translation>
<translation id="6687079240787935001">הסתרה של <ph name="MODULE_TITLE" /></translation>
@@ -6730,7 +6730,7 @@
<translation id="7622966771025050155">לכרטיסייה המוקלטת</translation>
<translation id="7624337243375417909">caps lock מושבת</translation>
<translation id="7625568159987162309">הצגת הרשאות ונתונים המאוחסנים באתרים שונים</translation>
-<translation id="7625823789272218216">כרטיסייה חדשה מצד ימין</translation>
+<translation id="7625823789272218216">כרטיסייה חדשה מצד שמאל</translation>
<translation id="7626032353295482388">‏ברוך בואך אל Chrome</translation>
<translation id="7628201176665550262">קצב רענון</translation>
<translation id="7629827748548208700">כרטיסייה: <ph name="TAB_NAME" /></translation>
diff --git a/chrome/app/resources/generated_resources_ko.xtb b/chrome/app/resources/generated_resources_ko.xtb
index c7af8a98f874..6e986a095589 100644
--- a/chrome/app/resources/generated_resources_ko.xtb
+++ b/chrome/app/resources/generated_resources_ko.xtb
@@ -6053,7 +6053,7 @@ https://support.google.com/chromebook/?p=tpm</translation>
<translation id="6923633482430812883">공유를 마운트하는 중 오류가 발생했습니다. 연결하려는 파일 서버가 SMBv2 이상을 지원하는지 확인하세요.</translation>
<translation id="6925127338315966709">브라우저에 관리되는 프로필을 추가하려고 합니다. 관리자가 프로필을 제어하고 프로필 데이터에 액세스할 수 있습니다. 북마크, 방문 기록, 비밀번호 및 기타 설정이 계정에 동기화되고 이를 관리자가 관리할 수 있습니다.</translation>
<translation id="6929126689972602640">학교 계정에서는 자녀 보호 기능이 지원되지 않습니다. 집에서 학교 과제를 위해 Google 클래스룸 및 다른 웹사이트에 액세스할 수 있는 학교 계정을 추가하려면 먼저 자녀의 개인 계정으로 로그인하세요. 설정에서 학교 계정을 나중에 추가할 수 있습니다.</translation>
-<translation id="6929760895658557216">Ok Google</translation>
+<translation id="6929760895658557216">Hey Google</translation>
<translation id="6930036377490597025">외장 보안 키 또는 내장 센서</translation>
<translation id="6930161297841867798">{NUM_EXTENSIONS,plural, =1{확장 프로그램 1개 거부됨}other{확장 프로그램 #개 거부됨}}</translation>
<translation id="6931690462168617033">클릭 강도</translation>
diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb
index 6878a20fa76b..765298e60f1b 100644
--- a/chrome/app/resources/generated_resources_mr.xtb
+++ b/chrome/app/resources/generated_resources_mr.xtb
@@ -3480,7 +3480,7 @@
<translation id="4348766275249686434">एरर संकलित करा</translation>
<translation id="4349828822184870497">उपयुक्त</translation>
<translation id="4350230709416545141">तुमचे स्थान अ‍ॅक्सेस करण्यापासून <ph name="HOST" /> ला नेहमी ब्लॉक करा</translation>
-<translation id="4350782034419308508">Hey Google</translation>
+<translation id="4350782034419308508">Ok Google</translation>
<translation id="4351770750390404505"><ph name="BEGIN_PARAGRAPH1" />सर्वोत्तम अनुभव पुरवण्यासाठी, <ph name="DEVICE_OS" /> हे डिव्हाइसबद्दल हार्डवेअर डेटा गोळा करते आणि कोणती अपडेट डिलिव्हर केली पाहिजे हे निर्धारित करण्यासाठी तो Google सोबत शेअर करते. याव्यतिरिक्त, तुम्ही <ph name="DEVICE_OS" /> मधील अनुभव आणि सेवा यांच्याशी संबंधित सपोर्ट आणि सुधारणा यांसारख्या अतिरिक्त उद्देशांसाठी Google ला हा डेटा वापरण्याची अनुमती देऊ शकता.<ph name="END_PARAGRAPH1" />
<ph name="BEGIN_PARAGRAPH2" />फिल्टर करण्याचे पर्याय अपडेट करण्यासाठी Google ला पाठवलेला डेटा तसेच असे कोणतेही प्रसंग ज्यात तुम्ही Google सोबत डेटा शेअर करण्याचे निवडले होते हे पाहण्याकरिता तुम्ही या डिव्हाइसवर लॉग इन करू शकता आणि chrome://system मधील CHROMEOSFLEX_HARDWARE_INFO विभागाला भेट देऊ शकता.<ph name="END_PARAGRAPH2" />
<ph name="BEGIN_PARAGRAPH3" /><ph name="DEVICE_OS" /> हे Google सोबत कदाचित शेअर करेल असा डेटा आणि तो कसा वापरला जातो याविषयीच्या अधिक तपशिलांसाठी g.co/flex/HWDataCollection ला भेट द्या.<ph name="END_PARAGRAPH3" /></translation>
diff --git a/chrome/app/resources/generated_resources_sl.xtb b/chrome/app/resources/generated_resources_sl.xtb
index f033654a6177..025f3dee2671 100644
--- a/chrome/app/resources/generated_resources_sl.xtb
+++ b/chrome/app/resources/generated_resources_sl.xtb
@@ -3486,7 +3486,7 @@ Domena <ph name="DOMAIN" /> zahteva, da je pametna kartica vstavljena.</translat
<translation id="4348766275249686434">Zbiranje napak</translation>
<translation id="4349828822184870497">Uporabno</translation>
<translation id="4350230709416545141">Gostitelju <ph name="HOST" /> vedno prepreči dostop do lokacije</translation>
-<translation id="4350782034419308508">Hey Google</translation>
+<translation id="4350782034419308508">OK Google</translation>
<translation id="4351770750390404505"><ph name="BEGIN_PARAGRAPH1" />Zaradi omogočanja najboljše izkušnje operacijski sistem <ph name="DEVICE_OS" /> zbira podatke o strojni opremi naprav in jih deli z Googlom zaradi določanja, katere posodobitve naj vam zagotovi. Izbirno lahko dovolite Googlu, da te podatke uporablja za dodatne namene, kot so podpora in izboljšanje izkušnje sistema <ph name="DEVICE_OS" /> ter njegovih storitev.<ph name="END_PARAGRAPH1" />
<ph name="BEGIN_PARAGRAPH2" />Prijavite se lahko v to napravo in obiščete razdelek CHROMEOSFLEX_HARDWARE_INFO na chrome://system, kjer si ogledate podatke, poslane Googlu zaradi filtriranja posodobitev, in druge primere, v katerih ste izbrali deljenje podatkov z Googlom.<ph name="END_PARAGRAPH2" />
<ph name="BEGIN_PARAGRAPH3" />Če želite več podrobnosti o podatkih, ki jih <ph name="DEVICE_OS" /> morda deli z Googlom in kako se ti uporabljajo, obiščite g.co/flex/HWDataCollection.<ph name="END_PARAGRAPH3" /></translation>
@@ -6818,7 +6818,7 @@ Domena <ph name="DOMAIN" /> zahteva, da je pametna kartica vstavljena.</translat
<translation id="7690853182226561458">Dodaj &amp;mapo...</translation>
<translation id="7691073721729883399">Funkcije »cryptohome« za aplikacijo za kiosk ni bilo mogoče vpeti.</translation>
<translation id="7691077781194517083">Tega varnostnega ključa ni mogoče ponastaviti. Napaka <ph name="ERROR_CODE" />.</translation>
-<translation id="7691163173018300413">»Hey Google«</translation>
+<translation id="7691163173018300413">»OK Google«</translation>
<translation id="7691698019618282776">Nadgradnja Crostinija</translation>
<translation id="7694246789328885917">Orodje označevalnika</translation>
<translation id="7696063401938172191">V telefonu »<ph name="PHONE_NAME" />«:</translation>
diff --git a/chrome/app/resources/generated_resources_th.xtb b/chrome/app/resources/generated_resources_th.xtb
index a0ba01a3bed6..5122e2a35fcc 100644
--- a/chrome/app/resources/generated_resources_th.xtb
+++ b/chrome/app/resources/generated_resources_th.xtb
@@ -1128,7 +1128,7 @@
<translation id="2082187087049518845">จัดกลุ่มแท็บ</translation>
<translation id="2082510809738716738">เลือกสีธีม</translation>
<translation id="208586643495776849">โปรดลองอีกครั้ง</translation>
-<translation id="208634871997892083">VPN แบบเปิดตลอดเวลา</translation>
+<translation id="208634871997892083">การเชื่อมต่อ VPN ตลอดเวลา</translation>
<translation id="2087822576218954668">พิมพ์: <ph name="PRINT_NAME" /></translation>
<translation id="2088092308059522196">รองรับการลงทะเบียนหลังจากที่คุณติดตั้ง <ph name="DEVICE_OS" /> แล้วเท่านั้น</translation>
<translation id="208928984520943006">เลื่อนขึ้นจากด้านล่างเพื่อไปยังหน้าจอหลักได้ทุกเมื่อ</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb
index a43c7436accf..192af20891bc 100644
--- a/chrome/app/resources/generated_resources_uk.xtb
+++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -1077,7 +1077,7 @@
<translation id="2016473077102413275">Функції, яким потрібні зображення, не працюватимуть</translation>
<translation id="2016574333161572915">Тепер можете налаштувати обладнання для Google Meet</translation>
<translation id="2017334798163366053">Вимкнути збір даних про ефективність</translation>
-<translation id="2018352199541442911">На жаль, зараз пристрій зовнішньої пам’яті не підтримується.</translation>
+<translation id="2018352199541442911">На жаль, ваш зовнішній носій наразі не підтримується.</translation>
<translation id="2018615379714355980">ПК підключено до дротової мережі, а Chromecast до Wi-Fi</translation>
<translation id="2019718679933488176">&amp;Відкрити аудіо в новій вкладці</translation>
<translation id="2020183425253392403">Показати налаштування мережевої адреси</translation>
diff --git a/chrome/app/resources/generated_resources_ur.xtb b/chrome/app/resources/generated_resources_ur.xtb
index af977346c790..1a10baaec419 100644
--- a/chrome/app/resources/generated_resources_ur.xtb
+++ b/chrome/app/resources/generated_resources_ur.xtb
@@ -174,7 +174,7 @@
<translation id="1163931534039071049">&amp;فریم کا ماخذ دیکھیں</translation>
<translation id="1164891049599601209">فریب والی سائٹ پر درج کیا گیا</translation>
<translation id="1165039591588034296">خرابی</translation>
-<translation id="1166212789817575481">دائیں جانب ٹیبز بند کریں</translation>
+<translation id="1166212789817575481">دائیں جانب والے ٹیبز بند کریں</translation>
<translation id="1166583374608765787">نام میں ہوئی اپ ڈیٹ کا جائزہ لیں</translation>
<translation id="1166596238782048887"><ph name="TAB_TITLE" /> <ph name="DESK_TITLE" /> ڈیسک سے تعلق رکھتی ہے</translation>
<translation id="1168020859489941584"><ph name="TIME_REMAINING" /> میں کھولا جا رہا ہے…</translation>
diff --git a/chromeos/strings/chromeos_strings_ca.xtb b/chromeos/strings/chromeos_strings_ca.xtb
index 7133df744585..ef0650d31ccc 100644
--- a/chromeos/strings/chromeos_strings_ca.xtb
+++ b/chromeos/strings/chromeos_strings_ca.xtb
@@ -490,7 +490,7 @@ Toca el micròfon per demanar-me qualsevol cosa.</translation>
<translation id="6388847657025262518">L'alimentador de documents de l'escàner està encallat. Comprova l'alimentador i torna-ho a provar.</translation>
<translation id="6410257289063177456">Fitxers d'imatge </translation>
<translation id="641081527798843608">Coincidència d'assumpte</translation>
-<translation id="6423239382391657905">VPN oberta</translation>
+<translation id="6423239382391657905">OpenVPN</translation>
<translation id="6439505561246192797">Feble (<ph name="SIGNAL_STRENGTH" />)</translation>
<translation id="6447630859861661624">Ves a la configuració del compte</translation>
<translation id="6456394469623773452">Bona</translation>
diff --git a/chromeos/strings/chromeos_strings_id.xtb b/chromeos/strings/chromeos_strings_id.xtb
index 00017fd849ed..b0040b2a4895 100644
--- a/chromeos/strings/chromeos_strings_id.xtb
+++ b/chromeos/strings/chromeos_strings_id.xtb
@@ -681,7 +681,7 @@ Ketuk mikrofon untuk bertanya apa saja.</translation>
<translation id="8655295600908251630">Saluran</translation>
<translation id="8660881923941176839">pound</translation>
<translation id="8662671328352114214">Bergabung dengan jaringan <ph name="TYPE" /></translation>
-<translation id="8675354002693747642">Kunci yang dibagikan sebelumnya</translation>
+<translation id="8675354002693747642">Pre-shared key</translation>
<translation id="8677859815076891398">Tidak ada album. Buat album di <ph name="LINK_BEGIN" />Google Foto<ph name="LINK_END" />.</translation>
<translation id="8709616837707653427"><ph name="DESC_TEXT" /> Gunakan tombol Panah kiri atau kanan untuk mengelola fitur ini.</translation>
<translation id="8712637175834984815">Mengerti</translation>
diff --git a/components/policy/resources/policy_templates_pt-BR.xtb b/components/policy/resources/policy_templates_pt-BR.xtb
index 3103c084819c..854417e118b1 100644
--- a/components/policy/resources/policy_templates_pt-BR.xtb
+++ b/components/policy/resources/policy_templates_pt-BR.xtb
@@ -4060,7 +4060,7 @@ Se esta política for definida como "Falsa", o <ph name="PRODUCT_NAME" /> não u
Se ela for definida como falsa, o <ph name="PRODUCT_NAME" /> não poderá mostrar informações do produto como conteúdo em guia cheia.
- Esta política controla a apresentação das informações promocionais em uma guia inteira. Isso inclui conteúdo como as páginas de boas-vindas que ajudam os usuários a fazer login em <ph name="PRODUCT_NAME" />, definir <ph name="PRODUCT_NAME" /> como navegador padrão ou descobrir os recursos do produto.</translation>
+ Esta política controla a apresentação das informações promocionais em uma guia inteira. Isso inclui conteúdo como as páginas de recepção que ajudam os usuários a fazer login em <ph name="PRODUCT_NAME" />, definir <ph name="PRODUCT_NAME" /> como navegador padrão ou descobrir os recursos do produto.</translation>
<translation id="544654037134815017">Esta política controla a visibilidade de cards na página Nova guia. Os cards exibem pontos de entrada para inicializar jornadas de usuário comuns com base no comportamento de navegação do usuário.
Se a política for definida como "Ativada", a página Nova guia exibirá os cards caso haja conteúdo disponível.
diff --git a/components/strings/components_strings_eu.xtb b/components/strings/components_strings_eu.xtb
index b3273f52b458..69f099c37cea 100644
--- a/components/strings/components_strings_eu.xtb
+++ b/components/strings/components_strings_eu.xtb
@@ -712,7 +712,7 @@ Bestela, pribatutasun-ezarpenek blokeatu egingo dute baimen hori. Baimen honekin
<translation id="2903493209154104877">Helbideak</translation>
<translation id="290376772003165898">Ez al da <ph name="LANGUAGE" /> orriko hizkuntza?</translation>
<translation id="2909946352844186028">Aldaketa bat hauteman da sarean.</translation>
-<translation id="2911973620368911614">Laneko kontabilitateaz arduratzen den erabiltzailearen IDa</translation>
+<translation id="2911973620368911614">Laneko kontabilitateaz arduratzen den erabiltzaile IDa</translation>
<translation id="2914160345369867329">Eskuarki, <ph name="SITE" /> webguneak enkriptatzea erabiltzen du informazioa babesteko. Chrome <ph name="SITE" /> webgunera konektatzen saiatu denean, webguneak kredentzial desegokiak eta ezohikoak bidali ditu. Erasotzaile bat <ph name="SITE" /> webgunearen plantak egiten ari delako gerta daiteke hori, edo wifi-sarean saioa hasteko pantailak konexioa eten duelako. Zure informazioa seguru dago, datuak trukatu aurretik eten baitu Chrome-k konexioa.</translation>
<translation id="2915068235268646559">Hutsegitearen ordua: <ph name="CRASH_TIME" /></translation>
<translation id="2915496182262110498">Margotzea</translation>
diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb
index 3277824004b3..e9d671b9971b 100644
--- a/components/strings/components_strings_fa.xtb
+++ b/components/strings/components_strings_fa.xtb
@@ -2062,7 +2062,7 @@
<translation id="6689249931105087298">نسبی با فشرده‌سازی نقطه سیاه</translation>
<translation id="6689271823431384964">‏چون به سیستم وارد شده‌اید، Chrome پیشنهاد می‌کند کارت‌ها را در حساب Google ذخیره کنید. در تنظیمات می‌توانید این رفتار را تغییر دهید. نام دارنده کارت از حساب شما گرفته شده است.</translation>
<translation id="6694681292321232194"><ph name="FIND_MY_PHONE_FOCUSED_FRIENDLY_MATCH_TEXT" />، برای پیدا کردن دستگاهتان در «حساب Google»، کلید «جهش» و سپس «ورود» را فشار دهید</translation>
-<translation id="6696588630955820014">دکمه «هم‌رسانی این برگه»؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، ارسال محتوا، و موارد دیگر، کلید «ورود» را فشار دهید</translation>
+<translation id="6696588630955820014">دکمه «هم‌رسانی این برگه»؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، پخش محتوا، و موارد دیگر، کلید «ورود» را فشار دهید</translation>
<translation id="6698381487523150993">ایجاد شده:</translation>
<translation id="6702919718839027939">ارائه کردن</translation>
<translation id="6709133671862442373">اخبار</translation>
@@ -2312,7 +2312,7 @@
<translation id="7392089738299859607">به‌روزرسانی نشانی</translation>
<translation id="7399802613464275309">بررسی ایمنی</translation>
<translation id="7400418766976504921">نشانی وب</translation>
-<translation id="7403392780200267761">هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، ارسال محتوا، و موارد دیگر</translation>
+<translation id="7403392780200267761">هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، پخش محتوا، و موارد دیگر</translation>
<translation id="7403591733719184120">دستگاه <ph name="DEVICE_NAME" /> تحت مدیریت است</translation>
<translation id="7407424307057130981">&lt;p&gt;اگر در رایانه Windows نرم‌افزار Superfish داشته باشید، این خطا را می‌بینید.&lt;/p&gt;
&lt;p&gt;برای غیرفعال کردن موقت این نرم‌افزار و دسترسی به وب، این مراحل را دنبال کنید. لازم است امتیازهای سرپرست را داشته باشید.&lt;/p&gt;
@@ -2883,7 +2883,7 @@
<translation id="9020200922353704812">نشانی صورت‌حساب کارت لازم است</translation>
<translation id="9020542370529661692">این صفحه به <ph name="TARGET_LANGUAGE" /> ترجمه شده است</translation>
<translation id="9020742383383852663">A8</translation>
-<translation id="9021429684248523859"><ph name="SHARE_THIS_PAGE_FOCUSED_FRIENDLY_MATCH_TEXT" />؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، ارسال محتوا، و موارد دیگر، کلید «جهش» و سپس «ورود» را فشار دهید</translation>
+<translation id="9021429684248523859"><ph name="SHARE_THIS_PAGE_FOCUSED_FRIENDLY_MATCH_TEXT" />؛ برای هم‌رسانی این برگه ازطریق هم‌رسانی پیوند، ایجاد رمزینه پاسخ‌سریع، پخش محتوا، و موارد دیگر، کلید «جهش» و سپس «ورود» را فشار دهید</translation>
<translation id="9025348182339809926">(نامعتبر)</translation>
<translation id="9030265603405983977">تک‌رنگ</translation>
<translation id="9035022520814077154">خطای امنیتی</translation>
diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb
index c9abd68b6f99..a7175812f17b 100644
--- a/components/strings/components_strings_te.xtb
+++ b/components/strings/components_strings_te.xtb
@@ -613,7 +613,7 @@
<translation id="257674075312929031">గ్రూప్‌గా చేయి</translation>
<translation id="2576880857912732701">'సెక్యూరిటీ సెట్టింగ్‌లను మేనేజ్ చేయండి' బటన్, Chrome సెట్టింగ్‌లలో మీ సురక్షిత బ్రౌజింగ్‌ను, అలాగే మరిన్నింటిని మేనేజ్ చేయడానికి 'Enter'ను నొక్కండి</translation>
<translation id="2586657967955657006">క్లిప్‌బోర్డ్</translation>
-<translation id="2587730715158995865">ప్రచురణకర్త <ph name="ARTICLE_PUBLISHER" />. దీన్ని మరియు మరో <ph name="OTHER_ARTICLE_COUNT" /> ఇతర కథనాలను చదవండి.</translation>
+<translation id="2587730715158995865">పబ్లిషర్‌ <ph name="ARTICLE_PUBLISHER" />. దీన్ని మరియు మరో <ph name="OTHER_ARTICLE_COUNT" /> ఇతర కథనాలను చదవండి.</translation>
<translation id="2587841377698384444">డైరెక్టరీ API ID:</translation>
<translation id="2594318783181750337">వేగవంతమైన వెబ్ వీక్షణ:</translation>
<translation id="2595719060046994702">ఈ పరికరం మరియు ఖాతా రెండూ కూడా కంపెనీ లేదా ఇతర సంస్థ నిర్వహణలో లేవు.</translation>
diff --git a/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb b/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb
index 1a0b12ff66e8..298e9c74a670 100644
--- a/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb
+++ b/third_party/blink/public/strings/translations/blink_accessibility_strings_fa.xtb
@@ -33,7 +33,7 @@
<translation id="3904695548697879411">‏نماد «Twitter»</translation>
<translation id="405782047075994056">نماد «جهت‌نمای چپ»، می‌تواند به‌معنای «برگشتن» باشد</translation>
<translation id="4302299849305494927">نماد «بلندگو»، می‌تواند به‌معنای «میزان صدا» باشد</translation>
-<translation id="4363712632243441817">نماد «ارسال محتوا»، می‌تواند به‌معنای ارسال محتوای ویدیویی به صفحه‌نمایش ازراه‌دور باشد</translation>
+<translation id="4363712632243441817">نماد «پخش محتوا»، می‌تواند به‌معنای ارسال محتوای ویدیویی به صفحه‌نمایش ازراه‌دور باشد</translation>
<translation id="4384249794467006333">این تصویر برچسب ندارد. برای دریافت شرح تصویر، منوی «گزینه‌های بیشتر» را در بالا سمت چپ باز کنید.</translation>
<translation id="4436211924730548766">نماد «پیکان سمت چپ»</translation>
<translation id="4444765639179266822">ظاهراً <ph name="OCR_TEXT" /> را نشان می‌دهد</translation>
diff --git a/third_party/blink/public/strings/translations/blink_strings_fa.xtb b/third_party/blink/public/strings/translations/blink_strings_fa.xtb
index 2c7dd213e6b1..668501099274 100644
--- a/third_party/blink/public/strings/translations/blink_strings_fa.xtb
+++ b/third_party/blink/public/strings/translations/blink_strings_fa.xtb
@@ -102,7 +102,7 @@
<translation id="5787939484346677755">گسترده شد، گزینه‌های تکمیل خودکار دردسترس است.</translation>
<translation id="5860033963881614850">خاموش</translation>
<translation id="588258955323874662">تمام صفحه</translation>
-<translation id="5888666972993069672">درحال ارسال محتوا به <ph name="DEVICE_FRIENDLY_NAME" /></translation>
+<translation id="5888666972993069672">درحال پخش محتوا به <ph name="DEVICE_FRIENDLY_NAME" /></translation>
<translation id="5916664084637901428">روشن</translation>
<translation id="5939518447894949180">بازنشانی</translation>
<translation id="5966707198760109579">هفته</translation>
@@ -168,7 +168,7 @@
<translation id="8637593834423658414">۱٫۷۵</translation>
<translation id="8668988909814782445">شکست خط</translation>
<translation id="8750798805984357768">لطفاً یکی از این گزینه‌ها را انتخاب کنید.</translation>
-<translation id="8845239796550121995">درحال ارسال محتوا به تلویزیون</translation>
+<translation id="8845239796550121995">درحال پخش محتوا به تلویزیون</translation>
<translation id="8875657656876809964">خطا در بازپخش ویدئو</translation>
<translation id="8889402386540077796">رنگ‌مایه</translation>
<translation id="8901569739625249689"><ph name="QUANTITY" /> کیلوبایت</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_af.xtb b/ui/chromeos/translations/ui_chromeos_strings_af.xtb
index 0458265f9530..97a675ca5b4d 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_af.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_af.xtb
@@ -121,7 +121,7 @@
<translation id="1995337122023280937">Gaan na lêerligging toe</translation>
<translation id="2001796770603320721">Bestuur in Drive</translation>
<translation id="2009067268969781306">Alle data wat op 'n skyf geberg is, sal uitgevee word wanneer dit geformateer word. Hierdie handeling kan nie ontdoen word nie.</translation>
-<translation id="2025955442973426285">Tigrinya</translation>
+<translation id="2025955442973426285">Tigrinja</translation>
<translation id="2028997212275086731">RAR-argief</translation>
<translation id="2036414735548252477">Saamgeperste LZMA-teerargief</translation>
<translation id="2037845485764049925">Russies</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_ca.xtb b/ui/chromeos/translations/ui_chromeos_strings_ca.xtb
index 1208d85315aa..1c6ab25c8ede 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_ca.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_ca.xtb
@@ -908,7 +908,7 @@
<translation id="8609695766746872526">Islandès</translation>
<translation id="863903787380594467">El PIN no és correcte. Et queden <ph name="RETRIES" /> intents.</translation>
<translation id="8639391553632924850"><ph name="INPUT_LABEL" /> - Port</translation>
-<translation id="8656768832129462377">No els comprovis</translation>
+<translation id="8656768832129462377">No comprovis</translation>
<translation id="8688591111840995413">Contrasenya incorrecta</translation>
<translation id="8698464937041809063">Dibuix de Google</translation>
<translation id="8712637175834984815">Entesos</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_ne.xtb b/ui/chromeos/translations/ui_chromeos_strings_ne.xtb
index fe499ab6dcd0..07e94eed7c1f 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_ne.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_ne.xtb
@@ -478,7 +478,7 @@
<translation id="5081517858322016911"><ph name="TOTAL_FILE_SIZE" /> फाइलहरू मेटाइने छन्</translation>
<translation id="508423945471810158"><ph name="FOLDER_NAME" /> मा <ph name="NUMBER_OF_ITEMS" /> वटा वस्तु सारिँदै छन्</translation>
<translation id="509429900233858213">त्रुटि भयो।</translation>
-<translation id="5098629044894065541">हिब्रु</translation>
+<translation id="5098629044894065541">हिब्रू</translation>
<translation id="5109254780565519649">कुनै त्रुटि भयो। केही वस्तुहरू रिस्टोर नभएका हुन सक्छन्।</translation>
<translation id="5110329002213341433">अङ्ग्रेजी (क्यानाडा)</translation>
<translation id="5123433949759960244">बास्केटबल</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_uk.xtb b/ui/chromeos/translations/ui_chromeos_strings_uk.xtb
index ae2e1f090652..42fbe4472af3 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_uk.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_uk.xtb
@@ -359,7 +359,7 @@
<translation id="4159731583141908892">Файл "<ph name="FILE_NAME" />" переміщено.</translation>
<translation id="4186579485882418952">Увімкнути режим офлайн</translation>
<translation id="4193154014135846272">Документ Google</translation>
-<translation id="4197674956721858839">Вибір файлів для архівування</translation>
+<translation id="4197674956721858839">Додати в архів .zip</translation>
<translation id="4202378258276439759">Іспанська (Латинська Америка)</translation>
<translation id="4202977638116331303">Грузинська</translation>
<translation id="421017592316736757">Щоб отримати доступ до цього файлу, потрібно перебувати в режимі онлайн.</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb b/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb
index bebd64d8f9ea..cfb57e3d9928 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_zh-TW.xtb
@@ -385,7 +385,7 @@
<translation id="4380245540200674032">第 <ph name="NETWORK_INDEX" /> 個網路 (共 <ph name="NETWORK_COUNT" /> 個)<ph name="NETWORK_NAME" /><ph name="NETWORK_PROVIDER_NAME" /><ph name="CONNECTION_STATUS" />,訊號強度 <ph name="SIGNAL_STRENGTH" />%,由系統管理員管理,詳細資料</translation>
<translation id="4387004326333427325">遠端已拒絕驗證憑證</translation>
<translation id="4394214039309501350">外部連結</translation>
-<translation id="4401287888955153199">擷取全部</translation>
+<translation id="4401287888955153199">解壓縮全部</translation>
<translation id="4410695710508688828">擷取作業失敗:<ph name="ERROR_MESSAGE" /></translation>
<translation id="4418686080762064601">為檔案建立捷徑</translation>
<translation id="4425149324548788773">我的雲端硬碟</translation>
--
2.37.0

View File

@ -0,0 +1,43 @@
From 8416ba6a9b0e6d607655580b55c684cde6a435ee Mon Sep 17 00:00:00 2001
From: Ian Helmke <helmke@google.com>
Date: Fri, 10 Jun 2022 16:36:43 +0000
Subject: [PATCH 04/59] M-102: lacros - fix extension controlled pref observers
Currently creating an observer for an extension controlled pref causes
ash to crash. This is a prerequisite to the full implementation of
extension-controlled pref observers in lacros.
(cherry picked from commit c3fe354aeee8432539fe42ddb4b3ac3e71736cd4)
Bug: 1218145, 1334985
Change-Id: Iad18872f3614a4125c5623226a69c9848554512b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3690828
Reviewed-by: Erik Chen <erikchen@chromium.org>
Commit-Queue: Ian Helmke <helmke@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1011757}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3695789
Commit-Queue: Erik Chen <erikchen@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#1163}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/browser/ash/crosapi/prefs_ash.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/browser/ash/crosapi/prefs_ash.cc b/chrome/browser/ash/crosapi/prefs_ash.cc
index 5ddec3bda554..a9ade8d99ac1 100644
--- a/chrome/browser/ash/crosapi/prefs_ash.cc
+++ b/chrome/browser/ash/crosapi/prefs_ash.cc
@@ -302,7 +302,8 @@ absl::optional<PrefsAsh::State> PrefsAsh::GetState(mojom::PrefPath path) {
return absl::nullopt;
}
std::string pref_name = GetExtensionPrefNameForPref(path);
- return State{profile_prefs_registrar_->prefs(), nullptr, true, pref_name};
+ return State{profile_prefs_registrar_->prefs(),
+ profile_prefs_registrar_.get(), true, pref_name};
}
default:
LOG(WARNING) << "Unknown pref path: " << path;
--
2.37.0

View File

@ -0,0 +1,28 @@
From c1183bc113b0e24cb2d66b924b246b00e975b671 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sat, 11 Jun 2022 01:00:49 +0000
Subject: [PATCH 05/59] Incrementing VERSION to 102.0.5005.126
Change-Id: Id7f380472d528daafaed371354a37a49d998c7b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3700892
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1164}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 6c2850a7ebf2..4db5628c5de0 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=125
+PATCH=126
--
2.37.0

View File

@ -0,0 +1,110 @@
From 072cee8911fc04072b9867585ad49ced2c922851 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Sat, 11 Jun 2022 14:19:04 +0000
Subject: [PATCH 06/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: Ib9c403509905557d2e7ffc90cbb19af7166d1e0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3701213
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1165}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/generated_resources_nl.xtb | 10 +++++-----
chrome/app/resources/google_chrome_strings_tr.xtb | 2 +-
ios/chrome/app/strings/resources/ios_strings_bs.xtb | 2 +-
ui/chromeos/translations/ui_chromeos_strings_hr.xtb | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb
index b457647f2406..b3c649849179 100644
--- a/chrome/app/resources/generated_resources_nl.xtb
+++ b/chrome/app/resources/generated_resources_nl.xtb
@@ -347,7 +347,7 @@
<translation id="134589511016534552">Mediatabbladen worden ook getoond in het gedeelte Geopende tabbladen</translation>
<translation id="1346630054604077329">Bevestigen en opnieuw opstarten</translation>
<translation id="1346748346194534595">Rechts</translation>
-<translation id="1347256498747320987">Updates en apps installeren. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden. <ph name="BEGIN_LINK1" />Meer informatie<ph name="END_LINK1" /></translation>
+<translation id="1347256498747320987">Updates en apps installeren. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden. <ph name="BEGIN_LINK1" />Meer informatie<ph name="END_LINK1" /></translation>
<translation id="1347512539447549782">Linux-opslag</translation>
<translation id="1347975661240122359">De update wordt gestart wanneer de batterij voor <ph name="BATTERY_LEVEL" />% vol is.</translation>
<translation id="1353275871123211385">Als je opties voor ouderlijk toezicht, zoals app-goedkeuring en schermtijdlimieten, wilt gebruiken, moet je kind een Google-account hebben dat wordt beheerd door een ouder. Je kunt later een schoolaccount toevoegen voor tools zoals Google Classroom.</translation>
@@ -853,7 +853,7 @@ Rechten die je al hebt gegeven aan apps, kunnen van toepassing zijn op dit accou
<translation id="1807246157184219062">Licht</translation>
<translation id="1809483812148634490">Apps die je hebt gedownload via Google Play worden van deze Chromebook verwijderd.
<ph name="LINE_BREAKS1" />
- De content die je hebt gekocht, zoals films, tv-programma's, muziek, boeken of andere in-app-aankopen, worden mogelijk ook verwijderd.
+ De content die je hebt gekocht, zoals films, tv-programma's, muziek, boeken of andere in-app aankopen, worden mogelijk ook verwijderd.
<ph name="LINE_BREAKS2" />
Dit is niet van invloed op apps of content op andere apparaten.</translation>
<translation id="1809734401532861917">Mijn bookmarks, geschiedenis, wachtwoorden en andere instellingen toevoegen aan <ph name="USER_EMAIL_ADDRESS" /></translation>
@@ -4516,7 +4516,7 @@ Je kunt meerdere schakelaars toewijzen aan deze actie.</translation>
<translation id="5425863515030416387">Gemakkelijk inloggen bij apparaten</translation>
<translation id="5427278936122846523">Altijd vertalen</translation>
<translation id="5427459444770871191">Rechtsom &amp;draaien</translation>
-<translation id="542750953150239272">Als je doorgaat, ga je ermee akkoord dat dit apparaat ook automatisch updates of apps van Google, je provider of de fabrikant van je apparaat kan downloaden en installeren, en dat hiervoor mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden.</translation>
+<translation id="542750953150239272">Als je doorgaat, ga je ermee akkoord dat dit apparaat ook automatisch updates of apps van Google, je provider of de fabrikant van je apparaat kan downloaden en installeren, en dat hiervoor mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden.</translation>
<translation id="5428850089342283580"><ph name="ACCNAME_APP" /> (Update is beschikbaar)</translation>
<translation id="5429373054983029602">Zoeken op je scherm met <ph name="VISUAL_SEARCH_PROVIDER" /></translation>
<translation id="542948651837270806">Er moet een update voor de Trusted Platform Module-firmware worden geïnstalleerd. Zie <ph name="TPM_FIRMWARE_UPDATE_LINK" /></translation>
@@ -4562,7 +4562,7 @@ Je kunt meerdere schakelaars toewijzen aan deze actie.</translation>
<translation id="5471768120198416576">Hallo. Ik ben je stem voor tekst-naar-spraak.</translation>
<translation id="5472627187093107397">Wachtwoorden voor deze site opslaan</translation>
<translation id="5473075389972733037">IBM</translation>
-<translation id="5473099001878321374">Als je verdergaat, ga je ermee akkoord dat dit apparaat ook automatische updates en apps van Google, de provider van je kind en de fabrikant van dit apparaat kan downloaden en installeren, waarbij mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden.</translation>
+<translation id="5473099001878321374">Als je verdergaat, ga je ermee akkoord dat dit apparaat ook automatische updates en apps van Google, de provider van je kind en de fabrikant van dit apparaat kan downloaden en installeren, waarbij mogelijk mobiele data worden gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden.</translation>
<translation id="5473156705047072749">{NUM_CHARACTERS,plural, =1{De pincode moet ten minste 1 teken bevatten}other{De pincode moet ten minste # tekens bevatten}}</translation>
<translation id="5474859849784484111"><ph name="MANAGER" /> vereist dat je nu verbinding maakt met wifi en een update downloadt. Je kunt de update ook downloaden via een verbinding met datalimiet (er kunnen kosten van toepassing zijn).</translation>
<translation id="5481273127572794904">Geen toestemming om automatisch meerdere bestanden te downloaden</translation>
@@ -4930,7 +4930,7 @@ Je kunt meerdere schakelaars toewijzen aan deze actie.</translation>
<translation id="5843706793424741864">Fahrenheit</translation>
<translation id="5844574845205796324">Nieuwe content voorstellen om te bekijken</translation>
<translation id="5846200638699387931">Syntaxisfout in relatie: <ph name="ERROR_LINE" /></translation>
-<translation id="5846807460505171493">Installeer updates en apps. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app-aankopen aanbieden.</translation>
+<translation id="5846807460505171493">Installeer updates en apps. Als je doorgaat, ga je ermee akkoord dat je apparaat ook automatisch updates en apps van Google, je provider en de fabrikant kan downloaden en installeren. Hiervoor worden mogelijk mobiele data gebruikt. Sommige van deze apps kunnen in-app aankopen aanbieden.</translation>
<translation id="5849212445710944278">Al toegevoegd</translation>
<translation id="5851868085455377790">Uitgever</translation>
<translation id="5852112051279473187">Oeps! Er is iets misgegaan bij de aanmelding van dit apparaat. Probeer het opnieuw of neem contact op met een medewerker van het supportteam.</translation>
diff --git a/chrome/app/resources/google_chrome_strings_tr.xtb b/chrome/app/resources/google_chrome_strings_tr.xtb
index 045e90543fd8..c635cf85eec7 100644
--- a/chrome/app/resources/google_chrome_strings_tr.xtb
+++ b/chrome/app/resources/google_chrome_strings_tr.xtb
@@ -9,7 +9,7 @@
<translation id="110877069173485804">Bu sizin Chrome'unuz</translation>
<translation id="1125124144982679672">Chrome'u kim kullanıyor?</translation>
<translation id="1142745911746664600">Chrome güncellenemiyor</translation>
-<translation id="1152920704813762236">&amp;ChromeOS hakkında</translation>
+<translation id="1152920704813762236">ChromeOS hakkında</translation>
<translation id="1154147086299354128">&amp;Chrome'da aç</translation>
<translation id="1178374936842835197">Bu sayfada bulunmayan bir ayar varsa <ph name="LINK_BEGIN" />ChromeOS Flex ayarlarınıza
<ph name="LINK_END" /> bakın</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_bs.xtb b/ios/chrome/app/strings/resources/ios_strings_bs.xtb
index 783065579808..77d80f45e1c9 100644
--- a/ios/chrome/app/strings/resources/ios_strings_bs.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_bs.xtb
@@ -504,7 +504,7 @@ Da biste promijenili tu postavku, <ph name="BEGIN_LINK" />poništite sinkronizac
<translation id="5360976571138293719">Više postavki koje se odnose na privatnost, sigurnost i prikupljanje podataka možete pronaći u <ph name="BEGIN_LINK" />Googleovim uslugama<ph name="END_LINK" />.</translation>
<translation id="5386314158584363703">Web lokacije koje pratite ćete pronaći ovdje</translation>
<translation id="5388358297987318779">Otvori sliku</translation>
-<translation id="5407969256130905701">Odbaci izmjene</translation>
+<translation id="5407969256130905701">Odbaci promjene</translation>
<translation id="5416022985862681400">Posljednjih 7 dana</translation>
<translation id="543338862236136125">Uredite lozinku</translation>
<translation id="5433691172869980887">Kopirano je korisničko ime</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_hr.xtb b/ui/chromeos/translations/ui_chromeos_strings_hr.xtb
index acfe5612f35e..703533a8b033 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_hr.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_hr.xtb
@@ -312,7 +312,7 @@
<translation id="3685122418104378273">Sinkronizacija Google diska onemogućena je prema zadanim postavkama kada se upotrebljavaju mobilni podaci.</translation>
<translation id="3689865792480713551">Otkažite <ph name="ACTIVITY_DESCRIPTION" />.</translation>
<translation id="3690128548376345212">Mreža <ph name="NETWORK_INDEX" /> od <ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, nije aktivirana, <ph name="CONNECTION_STATUS" />, jačina signala <ph name="SIGNAL_STRENGTH" />%, pojedinosti</translation>
-<translation id="3691184985318546178">sinhaleški</translation>
+<translation id="3691184985318546178">singalski</translation>
<translation id="3726463242007121105">Nije moguće otvoriti ovaj uređaj jer nije podržan njegov datotečni sustav.</translation>
<translation id="3727148787322499904">Promjena te postavke utjecat će na sve dijeljene mreže</translation>
<translation id="3737576078404241332">Ukloni s bočne trake</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From f50593a7b3b30b172cd11bf2b1696b9897f68fe2 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sun, 12 Jun 2022 01:00:41 +0000
Subject: [PATCH 07/59] Incrementing VERSION to 102.0.5005.127
Change-Id: Icd5ee669cd0a2a6305e3be9f6129a0e900db4de4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3701673
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1166}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 4db5628c5de0..f8c59ccd1144 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=126
+PATCH=127
--
2.37.0

View File

@ -0,0 +1,28 @@
From 4fcbdecc1f7334a52b90f6a9bf8f8c9b6cf6bc51 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Mon, 13 Jun 2022 01:00:40 +0000
Subject: [PATCH 08/59] Incrementing VERSION to 102.0.5005.128
Change-Id: I22d833006358ea4bd8ef7dc3c9d58d5c308eedfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3697583
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1167}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index f8c59ccd1144..88774f2ace3f 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=127
+PATCH=128
--
2.37.0

View File

@ -0,0 +1,73 @@
From cfe6727d5e34b66c6db9889c4bb6f732795d3558 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Mon, 13 Jun 2022 14:27:20 +0000
Subject: [PATCH 09/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: Idb67aeab99bc0544b5f908b1e82d2e62155f6a18
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702757
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1168}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/generated_resources_da.xtb | 2 +-
.../strings/translations/android_chrome_strings_eu.xtb | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/app/resources/generated_resources_da.xtb b/chrome/app/resources/generated_resources_da.xtb
index a60a0ae6c617..5e3aaa5db75a 100644
--- a/chrome/app/resources/generated_resources_da.xtb
+++ b/chrome/app/resources/generated_resources_da.xtb
@@ -3387,7 +3387,7 @@ Vil du starte <ph name="CONTROL_PANEL_APPLET_NAME" />?</translation>
<translation id="424963718355121712">Apps, der styrer et website, kan kun downloades fra det pågældende website</translation>
<translation id="4250229828105606438">Screenshot</translation>
<translation id="4250680216510889253">Nej</translation>
-<translation id="4251377547188244181">Tilmelding af terminal- og signeringsenhed</translation>
+<translation id="4251377547188244181">Tilmelding af enhed til terminal- og signeringstilstand</translation>
<translation id="4252035718262427477">Webside, enkelt fil (Web Bundle)</translation>
<translation id="4252899949534773101">Bluetooth er deaktiveret</translation>
<translation id="4252996741873942488"><ph name="WINDOW_TITLE" /> faneindholdet deles</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
index 64845ecef4a1..86cf1fdbe9fb 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
@@ -162,7 +162,7 @@ Arakatze-historia ezabatzen duzunean (osorik nahiz webgune zehatz bat), neurketa
<translation id="189358972401248634">Beste hizkuntzak</translation>
<translation id="1894023287452300670">Egin prezioaren jarraipena hemen</translation>
<translation id="1900260903084164610">Aurrera egiten baduzu, onartu egingo dituzu <ph name="BEGIN_TOS_LINK" />Zerbitzu-baldintzak<ph name="END_TOS_LINK" />.</translation>
-<translation id="1910950723001426294">Partekatzeko aukeren zerrenda itxita dago.</translation>
+<translation id="1910950723001426294">Partekatze-aukeren zerrenda itxita dago.</translation>
<translation id="1918175104945982129">Ahozko bilaketa egite aldera Laguntzailea zerbitzuari baimena emateko erabiltzaile-interfazea altuera erdian irekita dago</translation>
<translation id="1919130412786645364">Baimendu Chrome-n saioa hastea</translation>
<translation id="1922362554271624559">Iradokitako hizkuntzak</translation>
@@ -237,7 +237,7 @@ Sakatu bilatu nahi duzun hitza. Bilaketa mugatzeko, eduki testua sakatuta eta ha
<translation id="2278052315791335171">Pasahitza ezabatzen baduzu ere, ez da ezabatuko <ph name="SITE" /> webguneko kontua</translation>
<translation id="2279146068164892489"><ph name="APPNAME" /> aplikazioa ireki nahi duzu?</translation>
<translation id="2286841657746966508">Fakturazio-helbidea</translation>
-<translation id="228704530595896923">Partekatzeko aukeren zerrenda.</translation>
+<translation id="228704530595896923">Partekatze-aukeren zerrenda.</translation>
<translation id="230115972905494466">Ez da aurkitu gailu bateragarririk</translation>
<translation id="230155349749732438">Ezarpen hau erabiltzeko, <ph name="BEGIN_LINK" />Hobetu bilaketak eta arakatze-jarduerak<ph name="END_LINK" /> eginbideak aktibatuta egon behar du</translation>
<translation id="2318045970523081853">Sakatu hau dei bat egiteko</translation>
@@ -567,7 +567,7 @@ Eduki sakatuta bilatu nahi duzun hitza. Bilaketa mugatzeko, hautatu hitz gehiago
<translation id="4135200667068010335">Fitxa partekatzeko hautatutako gailuen zerrenda itxita dago.</translation>
<translation id="4137746084635924146">Gailuak une honetan darabilen hizkuntza</translation>
<translation id="4141536112466364990">Ikasi Chrome erabiltzen</translation>
-<translation id="4162867837470729563">Ireki da partekatzeko aukeren zerrenda altuera osoan.</translation>
+<translation id="4162867837470729563">Partekatze-aukeren zerrenda altuera osoan irekita dago.</translation>
<translation id="4165986682804962316">Webgunearen ezarpenak</translation>
<translation id="4170011742729630528">Zerbitzua ez dago erabilgarri. Saiatu berriro geroago.</translation>
<translation id="4181841719683918333">Hizkuntzak</translation>
@@ -986,7 +986,7 @@ Fidagarritasun-tokenek sareko pribatutasuna hobetzen dute eta ezin dira erabili
<translation id="6459045781120991510">Inkestak</translation>
<translation id="6461962085415701688">Ezin da ireki fitxategia</translation>
<translation id="6464977750820128603">Chrome-n irekitako webguneak ikus ditzakezu, eta haiek erabiltzeko tenporizadoreak ezarri.\n\nGoogle-k informazioa jasotzen du tenporizadoreak ezarri dizkiezun webguneei buruz eta haietan zenbat denbora eman duzun kalkulatzen du. Ongizate digitala programa hobetzeko erabiltzen da informazio hori.</translation>
-<translation id="6473086018775716761">Partekatzeko aukeren zerrenda altuera erdian irekita dago.</translation>
+<translation id="6473086018775716761">Partekatze-aukeren zerrenda altuera erdian irekita dago.</translation>
<translation id="6475951671322991020">Deskargatu bideoa</translation>
<translation id="6477928892249167417">Webgune hauek garrantzitsuak dira zuretzat:</translation>
<translation id="6482749332252372425">Ezin izan da deskargatu <ph name="FILE_NAME" />, memoria beteta dagoelako.</translation>
--
2.37.0

View File

@ -0,0 +1,54 @@
From f397daf7cd26e3ecc105dd9af34e65e38fce6457 Mon Sep 17 00:00:00 2001
From: Garrett Beaty <gbeaty@chromium.org>
Date: Mon, 13 Jun 2022 18:46:56 +0000
Subject: [PATCH 10/59] [M102][infra] Enforce that thin testers have TEST
execution mode.
Currently, the thin_tester function simply passes through the builder
spec via kwargs. If a builder spec is set with the COMPILE_AND_TEST
execution mode (the default), it gets passed through and the builder
config will be generated incorrectly. This change adds a check for the
execution mode to ensure that that it is correctly set.
(cherry picked from commit 85e12dbbf8c46b63d3a558b3bc822ee63892904f)
Change-Id: Id772dad71e3b79df104b6c7e44c063e2f0d14efc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703060
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1013571}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703484
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1169}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
infra/config/lib/ci.star | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/infra/config/lib/ci.star b/infra/config/lib/ci.star
index 557b741b2342..edc064ddc5be 100644
--- a/infra/config/lib/ci.star
+++ b/infra/config/lib/ci.star
@@ -15,6 +15,7 @@ to set the default value. Can also be accessed through `ci.defaults`.
load("./args.star", "args")
load("./branches.star", "branches")
+load("./builder_config.star", "builder_config")
load("./builders.star", "builders", "os", "os_category")
load("//project.star", "settings")
@@ -261,6 +262,9 @@ def thin_tester(
Returns:
The `luci.builder` keyset.
"""
+ builder_spec = kwargs.get("builder_spec")
+ if builder_spec and builder_spec.execution_mode != builder_config.execution_mode.TEST:
+ fail("thin testers with builder specs must have TEST execution mode")
cores = defaults.get_value("thin_tester_cores", cores)
kwargs.setdefault("goma_backend", None)
kwargs.setdefault("reclient_instance", None)
--
2.37.0

View File

@ -0,0 +1,28 @@
From 147b50af1e8a10424912455e819d8e3427003cc4 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Tue, 14 Jun 2022 01:00:40 +0000
Subject: [PATCH 11/59] Incrementing VERSION to 102.0.5005.129
Change-Id: Iefa095c3eb454cb07caf23bc988ffa80eb320cf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703321
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1170}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 88774f2ace3f..a538c4b46baf 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=128
+PATCH=129
--
2.37.0

View File

@ -0,0 +1,83 @@
From ab2aa6886c4333de42bcceaf226bde6d195b0944 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Tue, 14 Jun 2022 14:24:26 +0000
Subject: [PATCH 12/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I1811d9f375854b01cab83c7d08ad3f6f1f50aeb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702974
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1171}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/generated_resources_nl.xtb | 4 ++--
chrome/app/resources/google_chrome_strings_zh-CN.xtb | 2 +-
.../strings/translations/android_chrome_strings_nl.xtb | 2 +-
ios/chrome/app/strings/resources/ios_strings_nl.xtb | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb
index b3c649849179..51d184860f6b 100644
--- a/chrome/app/resources/generated_resources_nl.xtb
+++ b/chrome/app/resources/generated_resources_nl.xtb
@@ -2885,7 +2885,7 @@ Foutcode: <ph name="ERROR_CODE" />.</translation>
<translation id="3772046291955677288">Ik heb de <ph name="BEGIN_LINK1" />Servicevoorwaarden van Google<ph name="END_LINK1" /> en de <ph name="BEGIN_LINK2" />Aanvullende servicevoorwaarden van Chrome en Chrome OS<ph name="END_LINK2" /> gelezen en ga ermee akkoord.</translation>
<translation id="3774166835015494435">Recente foto's en meldingen</translation>
<translation id="3775432569830822555">SSL-servercertificaat</translation>
-<translation id="3775705724665058594">Verzenden naar je apparaten</translation>
+<translation id="3775705724665058594">Naar je apparaten sturen</translation>
<translation id="3776508619697147021">Sites kunnen vragen of ze automatisch meerdere bestanden mogen downloaden</translation>
<translation id="3776796446459804932">Deze extensie schendt het beleid voor de Chrome Web Store.</translation>
<translation id="3777483481409781352">Kan mobiel apparaat niet activeren</translation>
@@ -7375,7 +7375,7 @@ Bewaar je sleutelbestand op een veilige plaats. Je hebt het bestand nodig om nie
<translation id="8248381369318572865">Toegang krijgen tot je microfoon en je spraak analyseren</translation>
<translation id="8248887045858762645">Chrome-tip</translation>
<translation id="8249048954461686687">OEM-map</translation>
-<translation id="8249615410597138718">Verzenden naar je apparaten</translation>
+<translation id="8249615410597138718">Naar je apparaten sturen</translation>
<translation id="8249672078237421304">Aanbieden om pagina's te vertalen die in een voor jou onbekende taal zijn</translation>
<translation id="8250210000648910632">Geen opslagruimte</translation>
<translation id="8251441930213048644">Nu vernieuwen</translation>
diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb
index 504051df27f8..c0b508274377 100644
--- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb
+++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb
@@ -9,7 +9,7 @@
<translation id="110877069173485804">这是您的专属Chrome</translation>
<translation id="1125124144982679672">谁在使用 Chrome</translation>
<translation id="1142745911746664600">无法更新 Chrome</translation>
-<translation id="1152920704813762236">关于 Chrome 操作系统</translation>
+<translation id="1152920704813762236">关于 ChromeOS</translation>
<translation id="1154147086299354128">在 Chrome 中打开(&amp;O)</translation>
<translation id="1178374936842835197">如果此页面中未显示某项设置,请在 <ph name="LINK_BEGIN" />ChromeOS Flex 设置<ph name="LINK_END" />中查找</translation>
<translation id="1182414570724401860">Chrome 建议您不要下载或打开此文件</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
index c252a3f5d69f..fd4290716186 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
@@ -510,7 +510,7 @@ Tik op een woord en houd dit vast om te zoeken. Selecteer meer of minder woorden
<translation id="3771290962915251154">Deze instelling staat uit omdat ouderlijk toezicht is aangezet</translation>
<translation id="3771694256347217732">Servicevoorwaarden van Google</translation>
<translation id="3773856050682458546">Basisgegevens en informatie over de websites die je bezoekt en de apps die je gebruikt</translation>
-<translation id="3775705724665058594">Verzenden naar je apparaten</translation>
+<translation id="3775705724665058594">Naar je apparaten sturen</translation>
<translation id="3778956594442850293">Toegevoegd aan startscherm</translation>
<translation id="3791957072666773229">{TAB_COUNT,plural, =1{1 tabblad}other{# tabbladen}}</translation>
<translation id="3803784507854318295">Autoplay beheren</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_nl.xtb b/ios/chrome/app/strings/resources/ios_strings_nl.xtb
index 3d33d1b441cc..be8132d576fe 100644
--- a/ios/chrome/app/strings/resources/ios_strings_nl.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_nl.xtb
@@ -352,7 +352,7 @@ Volg de onderstaande stappen:</translation>
<translation id="3995521777587992544">Voortgangsbalk voor laden van pagina, <ph name="EMAIL" /> geladen.</translation>
<translation id="4002066346123236978">Titel</translation>
<translation id="4004204301268239848">Wachtwoorden worden in je Google-account opgeslagen, zodat je deze op elk apparaat kunt gebruiken.</translation>
-<translation id="4006921758705478413">Verzenden naar je apparaten</translation>
+<translation id="4006921758705478413">Naar je apparaten sturen</translation>
<translation id="4018310736049373830">Activiteit beheren</translation>
<translation id="4038354071007134711">Geen app op dit apparaat kan het bestand openen.</translation>
<translation id="4042870976416480368">Zoeken op pagina</translation>
--
2.37.0

View File

@ -0,0 +1,108 @@
From 1cb6163bd0fe1a956aad2beee9351dbd2b0f0d28 Mon Sep 17 00:00:00 2001
From: Garrett Beaty <gbeaty@chromium.org>
Date: Tue, 14 Jun 2022 18:57:44 +0000
Subject: [PATCH 13/59] [M102][infra] Fix future lint warnings.
The upcoming version of lucicfg has updated buildifier library
that has more lint checks (in particular stricter 'unused-variable'
and 'return-value' checks). To avoid breaking validation of
Chromium configs, this CL fixes them in advance.
(cherry picked from commit bbf8109aaa463dcd34a1196bd170999fed50a1a3)
Change-Id: I0eb2406b30c93cbf9efba188887884ace520aa0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703880
Auto-Submit: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1014084}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3705899
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1172}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
infra/config/lib/args.star | 2 ++
infra/config/lib/consoles.star | 11 ++++-------
infra/config/outages/outages.star | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/infra/config/lib/args.star b/infra/config/lib/args.star
index 2f3bbb42a57f..a5947a9485c2 100644
--- a/infra/config/lib/args.star
+++ b/infra/config/lib/args.star
@@ -96,6 +96,8 @@ def defaults(extends = None, **vars):
return listify(value)
return listify(default, value)
+ fail("unknown merge value: {}".format(merge))
+
def get_value_from_kwargs(name, kwargs, merge = None):
return get_value(name, kwargs.get(name, DEFAULT), merge = merge)
diff --git a/infra/config/lib/consoles.star b/infra/config/lib/consoles.star
index 3eed963fa62d..d07a73baf77d 100644
--- a/infra/config/lib/consoles.star
+++ b/infra/config/lib/consoles.star
@@ -40,7 +40,7 @@ defaults = args.defaults(
_CONSOLE_VIEW_ORDERING = nodes.create_unscoped_node_type("console_view_ordering")
_OVERVIEW_CONSOLE_ORDERING = nodes.create_unscoped_node_type("overview_console_ordering")
-def _console_view_ordering_impl(ctx, *, console_name, ordering):
+def _console_view_ordering_impl(_ctx, *, console_name, ordering):
key = _CONSOLE_VIEW_ORDERING.add(console_name, props = {
"ordering": ordering,
})
@@ -49,7 +49,7 @@ def _console_view_ordering_impl(ctx, *, console_name, ordering):
_console_view_ordering = lucicfg.rule(impl = _console_view_ordering_impl)
-def _overview_console_view_ordering_impl(ctx, *, console_name, top_level_ordering):
+def _overview_console_view_ordering_impl(_ctx, *, console_name, top_level_ordering):
key = _OVERVIEW_CONSOLE_ORDERING.add(console_name, props = {
"top_level_ordering": top_level_ordering,
})
@@ -266,7 +266,7 @@ def console_view(*, name, branch_selector = branches.MAIN, ordering = None, **kw
ordering = ordering or {},
)
-def overview_console_view(*, name, top_level_ordering, branch_selector = branches.MAIN, **kwargs):
+def overview_console_view(*, name, top_level_ordering, **kwargs):
"""Create an overview console view.
An overview console view is a console view that contains a subset of
@@ -285,9 +285,6 @@ def overview_console_view(*, name, top_level_ordering, branch_selector = branche
name does not appear in the list will be sorted lexicographically
by the console name and appear after entries whose console does
appear in the list.
- branch_selector - A branch selector value controlling whether the
- console view definition is executed. See branches.star for
- more information.
kwargs - Additional keyword arguments to forward on to
`luci.console_view`. The header and repo arguments support
module-level defaults.
@@ -351,7 +348,7 @@ def _get_list_view_key_fn(console_name):
return None
return lambda b: b.name
-def _sorted_list_view_impl(ctx, *, console_name):
+def _sorted_list_view_impl(_ctx, *, console_name):
key = _sorted_list_view_graph_key(console_name)
graph.add_node(key)
graph.add_edge(keys.project(), key)
diff --git a/infra/config/outages/outages.star b/infra/config/outages/outages.star
index 16736121c21e..6ada1be72649 100644
--- a/infra/config/outages/outages.star
+++ b/infra/config/outages/outages.star
@@ -33,7 +33,7 @@ def _disable_cq_experiments(ctx):
for b in c.verifiers.tryjob.builders:
if not b.experiment_percentage:
continue
- project, bucket, builder = b.name.split("/", 2)
+ project, bucket, _ = b.name.split("/", 2)
if project == "chromium" and bucket == "try":
b.includable_only = True
b.experiment_percentage = 0
--
2.37.0

View File

@ -0,0 +1,357 @@
From f427936d32dbe1e9c27c0bcf54eff6818bddb906 Mon Sep 17 00:00:00 2001
From: Daniel Cheng <dcheng@chromium.org>
Date: Tue, 14 Jun 2022 19:11:17 +0000
Subject: [PATCH 14/59] [M102] Ensure raw_ptr<T> and T* are treated identically
in //base callback.
There are safety checks associated with raw pointers (e.g. ensuring
receiver pointers are not raw pointers). Make sure these checks are
applied whether the input type is T* or raw_ptr<T>.
- Implement base::IsPointer<T> and base::RemovePointer<T>, which are
similar to std::is_pointer<T> and std::remove_pointer<T>, except they
also consider raw_ptr<T> a raw pointer type.
- Fix failures from the strengthened asserts: WebAppInstallFinalizer
does not need a callback at all, while the privacy sandbox dialog
tests can safely use base::Unretained().
- Add test cases to cover this in the //base callback nocompile test
suite.
- Fix the existing nocompile tests, which did not escape `||` and
inadvertently matched any error text.
(cherry picked from commit 00c072a2c7f24921af3bbf8441abb34ecb0551a6)
Bug: 1335458
Change-Id: I470e3d5bc35ed52bf125136db738a868ef90b7e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3700700
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1013266}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703779
Cr-Commit-Position: refs/branch-heads/5005@{#1173}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
base/bind_internal.h | 17 +++++-----
base/bind_unittest.cc | 28 +++++++++++++++++
base/bind_unittest.nc | 31 +++++++++++++++++--
base/memory/raw_ptr.h | 31 +++++++++++++++++++
.../raw_scoped_refptr_mismatch_checker.h | 5 +--
...privacy_sandbox_dialog_handler_unittest.cc | 26 +++++++++-------
.../web_app_install_finalizer.cc | 15 ++++-----
7 files changed, 121 insertions(+), 32 deletions(-)
diff --git a/base/bind_internal.h b/base/bind_internal.h
index 60607efadb30..1b06e54b65a4 100644
--- a/base/bind_internal.h
+++ b/base/bind_internal.h
@@ -859,8 +859,8 @@ bool QueryCancellationTraits(const BindStateBase* base,
template <typename Functor, typename Receiver, typename... Unused>
std::enable_if_t<
!(MakeFunctorTraits<Functor>::is_method &&
- std::is_pointer_v<std::decay_t<Receiver>> &&
- IsRefCountedType<std::remove_pointer_t<std::decay_t<Receiver>>>::value)>
+ IsPointerV<std::decay_t<Receiver>> &&
+ IsRefCountedType<RemovePointerT<std::decay_t<Receiver>>>::value)>
BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) {}
template <typename Functor>
@@ -870,8 +870,8 @@ void BanUnconstructedRefCountedReceiver() {}
template <typename Functor, typename Receiver, typename... Unused>
std::enable_if_t<
MakeFunctorTraits<Functor>::is_method &&
- std::is_pointer_v<std::decay_t<Receiver>> &&
- IsRefCountedType<std::remove_pointer_t<std::decay_t<Receiver>>>::value>
+ IsPointerV<std::decay_t<Receiver>> &&
+ IsRefCountedType<RemovePointerT<std::decay_t<Receiver>>>::value>
BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) {
DCHECK(receiver);
@@ -1006,19 +1006,20 @@ struct MakeBindStateTypeImpl<true, Functor, Receiver, BoundArgs...> {
static_assert(!std::is_array_v<std::remove_reference_t<Receiver>>,
"First bound argument to a method cannot be an array.");
static_assert(
- !std::is_pointer_v<DecayedReceiver> ||
- IsRefCountedType<std::remove_pointer_t<DecayedReceiver>>::value,
+ !IsPointerV<DecayedReceiver> ||
+ IsRefCountedType<RemovePointerT<DecayedReceiver>>::value,
"Receivers may not be raw pointers. If using a raw pointer here is safe"
" and has no lifetime concerns, use base::Unretained() and document why"
" it's safe.");
+
static_assert(!HasRefCountedTypeAsRawPtr<std::decay_t<BoundArgs>...>::value,
"A parameter is a refcounted type and needs scoped_refptr.");
public:
using Type = BindState<
std::decay_t<Functor>,
- std::conditional_t<std::is_pointer_v<DecayedReceiver>,
- scoped_refptr<std::remove_pointer_t<DecayedReceiver>>,
+ std::conditional_t<IsPointerV<DecayedReceiver>,
+ scoped_refptr<RemovePointerT<DecayedReceiver>>,
DecayedReceiver>,
MakeStorageType<BoundArgs>...>;
};
diff --git a/base/bind_unittest.cc b/base/bind_unittest.cc
index a5f681fe53b9..6844b6796d9f 100644
--- a/base/bind_unittest.cc
+++ b/base/bind_unittest.cc
@@ -1169,6 +1169,28 @@ TYPED_TEST(BindVariantsTest, UniquePtrReceiver) {
TypeParam::Bind(&NoRef::VoidMethod0, std::move(no_ref)).Run();
}
+TYPED_TEST(BindVariantsTest, ImplicitRefPtrReceiver) {
+ StrictMock<HasRef> has_ref;
+ EXPECT_CALL(has_ref, AddRef()).Times(1);
+ EXPECT_CALL(has_ref, Release()).Times(1);
+ EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillRepeatedly(Return(true));
+
+ HasRef* ptr = &has_ref;
+ auto ptr_cb = TypeParam::Bind(&HasRef::HasAtLeastOneRef, ptr);
+ EXPECT_EQ(1, std::move(ptr_cb).Run());
+}
+
+TYPED_TEST(BindVariantsTest, RawPtrReceiver) {
+ StrictMock<HasRef> has_ref;
+ EXPECT_CALL(has_ref, AddRef()).Times(1);
+ EXPECT_CALL(has_ref, Release()).Times(1);
+ EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillRepeatedly(Return(true));
+
+ raw_ptr<HasRef> rawptr(&has_ref);
+ auto rawptr_cb = TypeParam::Bind(&HasRef::HasAtLeastOneRef, rawptr);
+ EXPECT_EQ(1, std::move(rawptr_cb).Run());
+}
+
// Tests for Passed() wrapper support:
// - Passed() can be constructed from a pointer to scoper.
// - Passed() can be constructed from a scoper rvalue.
@@ -1751,6 +1773,12 @@ TEST(BindDeathTest, BanFirstOwnerOfRefCountedType) {
EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillOnce(Return(false));
base::BindOnce(&HasRef::VoidMethod0, &has_ref);
});
+
+ EXPECT_DCHECK_DEATH({
+ raw_ptr<HasRef> rawptr(&has_ref);
+ EXPECT_CALL(has_ref, HasAtLeastOneRef()).WillOnce(Return(false));
+ base::BindOnce(&HasRef::VoidMethod0, rawptr);
+ });
}
} // namespace
diff --git a/base/bind_unittest.nc b/base/bind_unittest.nc
index 20b0e0ba2cee..29807298ca3c 100644
--- a/base/bind_unittest.nc
+++ b/base/bind_unittest.nc
@@ -93,7 +93,7 @@ void WontCompile() {
method_to_const_cb.Run();
}
-#elif defined(NCTEST_METHOD_BIND_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!std::is_pointer_v<base::NoRef *> || IsRefCountedType<base::NoRef, void>::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained() and document why it's safe.\""]
+#elif defined(NCTEST_METHOD_BIND_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV<base::NoRef \*> \|\| IsRefCountedType<base::NoRef, void>::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""]
// Method bound to non-refcounted object.
@@ -106,7 +106,7 @@ void WontCompile() {
no_ref_cb.Run();
}
-#elif defined(NCTEST_CONST_METHOD_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!std::is_pointer_v<base::NoRef *> || IsRefCountedType<base::NoRef, void>::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained() and document why it's safe.\""]
+#elif defined(NCTEST_CONST_METHOD_BIND_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV<base::NoRef \*> \|\| IsRefCountedType<base::NoRef, void>::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""]
// Const Method bound to non-refcounted object.
//
@@ -118,6 +118,33 @@ void WontCompile() {
no_ref_const_cb.Run();
}
+#elif defined(NCTEST_METHOD_BIND_RAW_PTR_RECEIVER_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV<base::raw_ptr<base::NoRef, [^>]+>> \|\| IsRefCountedType<base::NoRef, void>::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""]
+
+
+// Method bound to non-refcounted object.
+//
+// We require refcounts unless you have Unretained().
+void WontCompile() {
+ NoRef no_ref;
+ raw_ptr<NoRef> rawptr(&no_ref);
+ RepeatingCallback<void()> no_ref_cb =
+ BindRepeating(&NoRef::VoidMethod0, rawptr);
+ no_ref_cb.Run();
+}
+
+#elif defined(NCTEST_CONST_METHOD_BIND_RAW_PTR_RECEIVER_NEEDS_REFCOUNTED_OBJECT) // [r"fatal error: static_assert failed due to requirement '!IsPointerV<base::raw_ptr<base::NoRef, [^>]+>> \|\| IsRefCountedType<base::NoRef, void>::value' \"Receivers may not be raw pointers. If using a raw pointer here is safe and has no lifetime concerns, use base::Unretained\(\) and document why it's safe.\""]
+
+// Const Method bound to non-refcounted object.
+//
+// We require refcounts unless you have Unretained().
+void WontCompile() {
+ NoRef no_ref;
+ raw_ptr<NoRef> rawptr(&no_ref);
+ RepeatingCallback<void()> no_ref_const_cb =
+ BindRepeating(&NoRef::VoidConstMethod0, rawptr);
+ no_ref_const_cb.Run();
+}
+
#elif defined(NCTEST_CONST_POINTER) // [r"static_assert failed.+?BindArgument<0>::ForwardedAs<.+?>::ToParamWithType<.+?>::kCanBeForwardedToBoundFunctor.+?Type mismatch between bound argument and bound functor's parameter\."]
// Const argument used with non-const pointer parameter of same type.
//
diff --git a/base/memory/raw_ptr.h b/base/memory/raw_ptr.h
index 4d978e979863..639713cd6199 100644
--- a/base/memory/raw_ptr.h
+++ b/base/memory/raw_ptr.h
@@ -1051,6 +1051,37 @@ ALWAYS_INLINE bool operator>=(const raw_ptr<U, I>& lhs,
return lhs.GetForComparison() >= rhs.GetForComparison();
}
+// Template helpers for working with T* or raw_ptr<T>.
+template <typename T>
+struct IsPointer : std::false_type {};
+
+template <typename T>
+struct IsPointer<T*> : std::true_type {};
+
+template <typename T, typename I>
+struct IsPointer<raw_ptr<T, I>> : std::true_type {};
+
+template <typename T>
+inline constexpr bool IsPointerV = IsPointer<T>::value;
+
+template <typename T>
+struct RemovePointer {
+ using type = T;
+};
+
+template <typename T>
+struct RemovePointer<T*> {
+ using type = T;
+};
+
+template <typename T, typename I>
+struct RemovePointer<raw_ptr<T, I>> {
+ using type = T;
+};
+
+template <typename T>
+using RemovePointerT = typename RemovePointer<T>::type;
+
} // namespace base
using base::raw_ptr;
diff --git a/base/memory/raw_scoped_refptr_mismatch_checker.h b/base/memory/raw_scoped_refptr_mismatch_checker.h
index 9e50458ec98b..7afae066fa3e 100644
--- a/base/memory/raw_scoped_refptr_mismatch_checker.h
+++ b/base/memory/raw_scoped_refptr_mismatch_checker.h
@@ -7,6 +7,7 @@
#include <type_traits>
+#include "base/memory/raw_ptr.h"
#include "base/template_util.h"
// It is dangerous to post a task with a T* argument where T is a subtype of
@@ -35,8 +36,8 @@ struct IsRefCountedType<T,
// pointer type and are convertible to a RefCounted(Base|ThreadSafeBase) type.
template <typename T>
struct NeedsScopedRefptrButGetsRawPtr
- : conjunction<std::is_pointer<T>,
- IsRefCountedType<std::remove_pointer_t<T>>> {
+ : conjunction<base::IsPointer<T>,
+ IsRefCountedType<base::RemovePointerT<T>>> {
static_assert(!std::is_reference<T>::value,
"NeedsScopedRefptrButGetsRawPtr requires non-reference type.");
};
diff --git a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc
index d812d82a08c3..ee22b02bdbed 100644
--- a/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc
+++ b/chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_dialog_handler_unittest.cc
@@ -93,9 +93,7 @@ class PrivacySandboxDialogHandlerTest : public testing::Test {
content::TestWebUI* web_ui() { return web_ui_.get(); }
PrivacySandboxDialogHandler* handler() { return handler_.get(); }
TestingProfile* profile() { return &profile_; }
- raw_ptr<MockPrivacySandboxDialogView> dialog_mock() {
- return dialog_mock_.get();
- }
+ MockPrivacySandboxDialogView* dialog_mock() { return dialog_mock_.get(); }
MockPrivacySandboxService* mock_privacy_sandbox_service() {
return mock_privacy_sandbox_service_;
}
@@ -120,15 +118,18 @@ class PrivacySandboxConsentDialogHandlerTest
: public PrivacySandboxDialogHandlerTest {
protected:
std::unique_ptr<PrivacySandboxDialogHandler> CreateHandler() override {
+ // base::Unretained is safe because the created handler does not outlive the
+ // mock.
return std::make_unique<PrivacySandboxDialogHandler>(
- base::BindOnce(&MockPrivacySandboxDialogView::Close, dialog_mock()),
+ base::BindOnce(&MockPrivacySandboxDialogView::Close,
+ base::Unretained(dialog_mock())),
base::BindOnce(&MockPrivacySandboxDialogView::ResizeNativeView,
- dialog_mock()),
+ base::Unretained(dialog_mock())),
base::BindOnce(&MockPrivacySandboxDialogView::ShowNativeView,
- dialog_mock()),
+ base::Unretained(dialog_mock())),
base::BindOnce(
&MockPrivacySandboxDialogView::OpenPrivacySandboxSettings,
- dialog_mock()),
+ base::Unretained(dialog_mock())),
PrivacySandboxService::DialogType::kConsent);
}
};
@@ -247,15 +248,18 @@ class PrivacySandboxNoticeDialogHandlerTest
: public PrivacySandboxDialogHandlerTest {
protected:
std::unique_ptr<PrivacySandboxDialogHandler> CreateHandler() override {
+ // base::Unretained is safe because the created handler does not outlive the
+ // mock.
return std::make_unique<PrivacySandboxDialogHandler>(
- base::BindOnce(&MockPrivacySandboxDialogView::Close, dialog_mock()),
+ base::BindOnce(&MockPrivacySandboxDialogView::Close,
+ base::Unretained(dialog_mock())),
base::BindOnce(&MockPrivacySandboxDialogView::ResizeNativeView,
- dialog_mock()),
+ base::Unretained(dialog_mock())),
base::BindOnce(&MockPrivacySandboxDialogView::ShowNativeView,
- dialog_mock()),
+ base::Unretained(dialog_mock())),
base::BindOnce(
&MockPrivacySandboxDialogView::OpenPrivacySandboxSettings,
- dialog_mock()),
+ base::Unretained(dialog_mock())),
PrivacySandboxService::DialogType::kNotice);
}
};
diff --git a/chrome/browser/web_applications/web_app_install_finalizer.cc b/chrome/browser/web_applications/web_app_install_finalizer.cc
index 2b85d7645980..cf57d375d0d3 100644
--- a/chrome/browser/web_applications/web_app_install_finalizer.cc
+++ b/chrome/browser/web_applications/web_app_install_finalizer.cc
@@ -505,10 +505,6 @@ void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData(
web_app_info.shortcuts_menu_icon_bitmaps;
IconsMap other_icon_bitmaps = web_app_info.other_icon_bitmaps;
- auto write_icons_callback = base::BindOnce(
- &WebAppIconManager::WriteData, icon_manager_, app_id,
- std::move(icon_bitmaps), std::move(shortcuts_menu_icon_bitmaps),
- std::move(other_icon_bitmaps));
auto write_translations_callback = base::BindOnce(
&WebAppInstallFinalizer::WriteTranslations,
weak_ptr_factory_.GetWeakPtr(), app_id, std::move(web_app_info));
@@ -516,11 +512,12 @@ void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData(
base::BindOnce(&WebAppInstallFinalizer::CommitToSyncBridge,
weak_ptr_factory_.GetWeakPtr(), std::move(web_app));
- std::move(write_icons_callback)
- .Run(base::BindOnce(
- std::move(write_translations_callback),
- base::BindOnce(std::move(commit_to_sync_bridge_callback),
- std::move(commit_callback))));
+ icon_manager_->WriteData(
+ app_id, std::move(icon_bitmaps), std::move(shortcuts_menu_icon_bitmaps),
+ std::move(other_icon_bitmaps),
+ base::BindOnce(std::move(write_translations_callback),
+ base::BindOnce(std::move(commit_to_sync_bridge_callback),
+ std::move(commit_callback))));
}
void WebAppInstallFinalizer::WriteTranslations(
--
2.37.0

View File

@ -0,0 +1,28 @@
From 9821e4a21a7d69f0c0cb97718e879a2f3c89f46a Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Wed, 15 Jun 2022 01:00:25 +0000
Subject: [PATCH 15/59] Incrementing VERSION to 102.0.5005.130
Change-Id: I68fc3b8c4b0963091997a833f8d2a0b82110db5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702546
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1174}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index a538c4b46baf..2a835d053cb4 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=129
+PATCH=130
--
2.37.0

View File

@ -0,0 +1,889 @@
From 1a4d97d59d24ed5583007288ea30138e7be680fa Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Wed, 15 Jun 2022 14:56:42 +0000
Subject: [PATCH 16/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: Ic65df5e8ca6d69e7f009fee9037f2579681704ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707693
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1175}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../app/resources/generated_resources_bs.xtb | 2 +-
.../resources/generated_resources_en-GB.xtb | 132 +++++++++---------
.../resources/generated_resources_es-419.xtb | 4 +-
.../app/resources/generated_resources_gl.xtb | 2 +-
.../android_chrome_strings_eu.xtb | 2 +-
.../strings/components_strings_en-GB.xtb | 32 ++---
.../resources/ios_chromium_strings_en-GB.xtb | 2 +-
.../ios_google_chrome_strings_en-GB.xtb | 2 +-
.../strings/resources/ios_strings_en-GB.xtb | 10 +-
9 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb
index c07a6e47b0b6..7234e04492b8 100644
--- a/chrome/app/resources/generated_resources_bs.xtb
+++ b/chrome/app/resources/generated_resources_bs.xtb
@@ -7607,7 +7607,7 @@ Fajl ključa: <ph name="KEY_FILE" />
<translation id="846374874681391779">Traka preuzetih fajlova</translation>
<translation id="8463955938112983119">Dodatak <ph name="PLUGIN_NAME" /> je onemogućen.</translation>
<translation id="8464132254133862871">Ovaj korisnički račun ne ispunjava uslove za ovu uslugu.</translation>
-<translation id="8464735509712879725">Za prostorije sa slabim svjetlom. Također optimizirano za vijek trajanja baterije.</translation>
+<translation id="8464735509712879725">Za prostorije sa slabim svjetlom. Također optimizirano prema vijeku trajanja baterije.</translation>
<translation id="8465252176946159372">Nije važeće</translation>
<translation id="8465444703385715657">Za pokretanje dodatka <ph name="PLUGIN_NAME" /> je potrebno vaše odobrenje</translation>
<translation id="8466417995783206254">Ova kartica reproducira videozapis u načinu rada slike u slici.</translation>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb
index ebdba205fed4..750571d685d8 100644
--- a/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -51,7 +51,7 @@
<translation id="1049795001945932310">&amp;Language settings</translation>
<translation id="1050693411695664090">Poor</translation>
<translation id="1054048317165655285">Complete setup on your phone</translation>
-<translation id="1054153489933238809">Open original image in new tab</translation>
+<translation id="1054153489933238809">Open Original &amp;Image in New Tab</translation>
<translation id="1055274863771110134">{NUM_WEEKS,plural, =1{Update <ph name="DEVICE_TYPE" /> within 1 week}other{Update <ph name="DEVICE_TYPE" /> within {NUM_WEEKS} weeks}}</translation>
<translation id="1056898198331236512">Warning</translation>
<translation id="1058262162121953039">PUK</translation>
@@ -85,7 +85,7 @@
<translation id="1076818208934827215">Microsoft Internet Explorer</translation>
<translation id="1076882167394279216">Couldnt download spell check dictionary for <ph name="LANGUAGE" />. Try again.</translation>
<translation id="1079766198702302550">Always block camera access</translation>
-<translation id="1081956462909987459">{NUM_TABS,plural, =1{<ph name="GROUP_TITLE" /> 1 tab}other{<ph name="GROUP_TITLE" /> # tabs}}</translation>
+<translation id="1081956462909987459">{NUM_TABS,plural, =1{<ph name="GROUP_TITLE" /> 1 Tab}other{<ph name="GROUP_TITLE" /> # Tabs}}</translation>
<translation id="1082214733466244292">Your administrator has blocked some functionality for this device</translation>
<translation id="1082398631555931481"><ph name="THIRD_PARTY_TOOL_NAME" /> wants to restore your Chrome settings to their original defaults. This will reset your homepage, new tab page and search engine, disable your extensions and unpin all tabs. It will also clear other temporary and cached data, such as cookies, content and site data.</translation>
<translation id="1084096383128641877">Removing this password will not delete your account on <ph name="DOMAIN" />. Change your password or delete your account on <ph name="DOMAIN_LINK" /> to keep it safe from others.</translation>
@@ -95,7 +95,7 @@
<translation id="1087965115100412394">Don't allow sites to connect to MIDI devices</translation>
<translation id="1088654056000736875">Chrome is removing harmful software from your computer…</translation>
<translation id="1088659085457112967">Enter Reader Mode</translation>
-<translation id="1090126737595388931">No background apps running</translation>
+<translation id="1090126737595388931">No Background Apps Running</translation>
<translation id="1090541560108055381">Before pairing, make sure that this code is the same on both devices</translation>
<translation id="1091767800771861448">Press ESCAPE to skip (Non-official builds only).</translation>
<translation id="1093457606523402488">Visible Networks:</translation>
@@ -176,7 +176,7 @@
<translation id="1163931534039071049">&amp;View frame source</translation>
<translation id="1164891049599601209">Entered on deceptive site</translation>
<translation id="1165039591588034296">Error</translation>
-<translation id="1166212789817575481">Close tabs to the right</translation>
+<translation id="1166212789817575481">Close Tabs to the Right</translation>
<translation id="1166583374608765787">Review name update</translation>
<translation id="1166596238782048887"><ph name="TAB_TITLE" /> belongs to desk <ph name="DESK_TITLE" /></translation>
<translation id="1168020859489941584">Opening in <ph name="TIME_REMAINING" />...</translation>
@@ -388,7 +388,7 @@
<translation id="1388253969141979417">Allowed to use your microphone</translation>
<translation id="1388728792929436380"><ph name="DEVICE_TYPE" /> will restart when updates are complete.</translation>
<translation id="139013308650923562">Allowed to use fonts installed on your device</translation>
-<translation id="1390548061267426325">Open as a standard tab</translation>
+<translation id="1390548061267426325">Open as a Standard Tab</translation>
<translation id="1390907927270446471"><ph name="PROFILE_USERNAME" /> is not authorised to print to <ph name="PRINTER_NAME" />. Please contact your administrator.</translation>
<translation id="1393283411312835250">Sun and clouds</translation>
<translation id="1395730723686586365">Updater started</translation>
@@ -481,7 +481,7 @@ Permissions that you've already given to apps may apply to this account. You can
<translation id="1465827627707997754">Pizza slice</translation>
<translation id="1467432559032391204">Left</translation>
<translation id="1468571364034902819">Can't use this profile</translation>
-<translation id="1470084204649225129">{NUM_TABS,plural, =1{Add tab to new group}other{Add tabs to new group}}</translation>
+<translation id="1470084204649225129">{NUM_TABS,plural, =1{Add Tab to New Group}other{Add Tabs to New Group}}</translation>
<translation id="1470350905258700113">Use this device</translation>
<translation id="1470946456740188591">To turn caret browsing on or off, use the shortcut Ctrl+Search+7</translation>
<translation id="1472675084647422956">Show more</translation>
@@ -534,7 +534,7 @@ Permissions that you've already given to apps may apply to this account. You can
<translation id="1523279371236772909">Viewed in the past month</translation>
<translation id="1523978563989812243">Text-to-speech engines</translation>
<translation id="1524430321211440688">Keyboard</translation>
-<translation id="1524563461097350801">No, thanks</translation>
+<translation id="1524563461097350801">No, Thanks</translation>
<translation id="1525740877599838384">Use only Wi-Fi to determine location</translation>
<translation id="152629053603783244">Restart Linux</translation>
<translation id="1526335046150927198">Enable touchpad scroll acceleration</translation>
@@ -602,7 +602,7 @@ Permissions that you've already given to apps may apply to this account. You can
<translation id="1587275751631642843">&amp;JavaScript console</translation>
<translation id="1587907146729660231">Touch the power button with your finger</translation>
<translation id="1588438908519853928">Normal</translation>
-<translation id="1588870296199743671">Open link with...</translation>
+<translation id="1588870296199743671">Open Link With...</translation>
<translation id="1588919647604819635">Right-click card</translation>
<translation id="1589055389569595240">Show spelling and grammar</translation>
<translation id="1591679663873027990">Give Parallels Desktop permission to access USB devices. Parallels Desktop won't remember a USB device after it's removed.</translation>
@@ -720,7 +720,7 @@ Permissions that you've already given to apps may apply to this account. You can
<translation id="1680849702532889074">An error occurred during installation of your Linux application.</translation>
<translation id="16815041330799488">Do not allow sites to see text and images copied to the clipboard</translation>
<translation id="1682548588986054654">New Incognito Window</translation>
-<translation id="1682867089915960590">Turn on caret browsing?</translation>
+<translation id="1682867089915960590">Turn on Caret Browsing?</translation>
<translation id="1684279041537802716">Accent colour</translation>
<translation id="168511795252678620">Recent photos and messaging apps</translation>
<translation id="1686550358074589746">Enable glide typing</translation>
@@ -889,7 +889,7 @@ Permissions that you've already given to apps may apply to this account. You can
<translation id="1826516787628120939">Checking</translation>
<translation id="1827738518074806965">Art gallery</translation>
<translation id="1828378091493947763">This plug-in is not supported on this device</translation>
-<translation id="1828879788654007962">{COUNT,plural, =0{&amp;Open all}=1{&amp;Open bookmark}other{&amp;Open all ({COUNT})}}</translation>
+<translation id="1828879788654007962">{COUNT,plural, =0{&amp;Open All}=1{&amp;Open Bookmark}other{&amp;Open All ({COUNT})}}</translation>
<translation id="1828901632669367785">Print Using System Dialogue...</translation>
<translation id="1829129547161959350">Penguin</translation>
<translation id="1829192082282182671">Zoom &amp;Out</translation>
@@ -1251,7 +1251,7 @@ You can manage this accounts settings by installing the Family Link app on yo
<translation id="2169062631698640254">Sign in anyway</translation>
<translation id="2173302385160625112">Check your Internet connection</translation>
<translation id="2173801458090845390">Add requisition ID to this device</translation>
-<translation id="2175384018164129879">&amp;Manage search engines and Site Search</translation>
+<translation id="2175384018164129879">&amp;Manage Search Engines and Site Search</translation>
<translation id="2175607476662778685">Quick launch bar</translation>
<translation id="217576141146192373">Unable to add printer. Please check your printer's configuration and try again.</translation>
<translation id="2175927920773552910">QR code</translation>
@@ -1462,7 +1462,7 @@ You can manage this accounts settings by installing the Family Link app on yo
<translation id="2340239562261172947"><ph name="FILE_NAME" /> can't be downloaded securely</translation>
<translation id="2342180549977909852">Your child can use a number (PIN) instead of a password to unlock this device. To set a PIN later, go to Settings.</translation>
<translation id="2342740338116612727">Bookmarks added</translation>
-<translation id="2343747224442182863">Focus this tab</translation>
+<translation id="2343747224442182863">Focus This Tab</translation>
<translation id="2344032937402519675">Couldnt connect with the server. Check your network connection and try again. If you're still having trouble, try restarting your Chromebook.</translation>
<translation id="2345723121311404059">1 page to <ph name="PRINTER_NAME" /></translation>
<translation id="23463457491630512">For example, if you visit a site to buy shoes for a marathon, the site might define your interest as running marathons. Later, if you visit a different site to register for a race, that site can show you an ad for running shoes based on your interests.</translation>
@@ -1759,7 +1759,7 @@ You can manage this accounts settings by installing the Family Link app on yo
<translation id="2635094637295383009">Twitter</translation>
<translation id="2635276683026132559">Signing</translation>
<translation id="2636625531157955190">Chrome cannot access the image.</translation>
-<translation id="2637313651144986786">Search tabs…</translation>
+<translation id="2637313651144986786">Search Tabs…</translation>
<translation id="2637400434494156704">Incorrect PIN. You have one attempt remaining.</translation>
<translation id="2638286699381354126">Update...</translation>
<translation id="2638662041295312666">Sign-in image</translation>
@@ -2005,7 +2005,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="2864601841139725659">Set your profile picture</translation>
<translation id="2865919525181940183">Screenshot of programs that are currently on the screen</translation>
<translation id="286674810810214575">Checking power sources…</translation>
-<translation id="2867768963760577682">Open as pinned tab</translation>
+<translation id="2867768963760577682">Open as Pinned Tab</translation>
<translation id="2868746137289129307">This extension is outdated and disabled by enterprise policy. It might become enabled automatically when a newer version is available.</translation>
<translation id="2870560284913253234">Site</translation>
<translation id="2870909136778269686">Updating...</translation>
@@ -2023,7 +2023,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="2878782256107578644">Scan in progress. Open now?</translation>
<translation id="2878889940310164513">Add mobile…</translation>
<translation id="288042212351694283">Access your Universal 2nd Factor devices</translation>
-<translation id="2881076733170862447">When you click the extension</translation>
+<translation id="2881076733170862447">When You Click the Extension</translation>
<translation id="2882943222317434580"><ph name="IDS_SHORT_PRODUCT_NAME" /> will restart and reset momentarily</translation>
<translation id="2885378588091291677">Task Manager</translation>
<translation id="2885729872133513017">A problem occurred when decoding server response.</translation>
@@ -2284,7 +2284,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3139925690611372679">Default yellow avatar</translation>
<translation id="3141318088920353606">Listening...</translation>
<translation id="3141917231319778873">The given request is not supported to: "<ph name="DEVICE_NAME" />".</translation>
-<translation id="3142562627629111859">New group</translation>
+<translation id="3142562627629111859">New Group</translation>
<translation id="3143515551205905069">Cancel sync</translation>
<translation id="3143754809889689516">Play from the beginning</translation>
<translation id="3144647712221361880">Open link as</translation>
@@ -2313,7 +2313,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3165390001037658081">Some operators might block this feature.</translation>
<translation id="3170072451822350649">You may also skip signing in and <ph name="LINK_START" />browse as Guest<ph name="LINK_END" />.</translation>
<translation id="31774765611822736">New tab to the left</translation>
-<translation id="3177909033752230686">Page language:</translation>
+<translation id="3177909033752230686">Page Language:</translation>
<translation id="3179982752812949580">Text font</translation>
<translation id="3181954750937456830">Safe Browsing (protects you and your device from dangerous sites)</translation>
<translation id="3182749001423093222">Spell check</translation>
@@ -2811,7 +2811,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3688507211863392146">Write to files and folders that you open in the application</translation>
<translation id="3688526734140524629">Change channel</translation>
<translation id="3688578402379768763">Up-to-date</translation>
-<translation id="3688794912214798596">Change languages…</translation>
+<translation id="3688794912214798596">Change Languages…</translation>
<translation id="3690369331356918524">Warns you if passwords are exposed in a data breach</translation>
<translation id="3691231116639905343">Keyboard apps</translation>
<translation id="369135240373237088">Sign in again with a school account</translation>
@@ -2836,7 +2836,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3708684582558000260">Don't allow closed sites to finish sending or receiving data</translation>
<translation id="3709244229496787112">The browser was shut down before the download completed.</translation>
<translation id="371174301504454251">To protect your privacy, we auto-delete sites from the list that are older than four weeks. A site that you visit again might appear on the list again. Or you can remove a site if you dont want that site to ever define interests for you.</translation>
-<translation id="3711931198657368127">Paste and go to <ph name="URL" /></translation>
+<translation id="3711931198657368127">Paste and Go to <ph name="URL" /></translation>
<translation id="3711945201266135623">Found <ph name="NUM_PRINTERS" /> printers from the print server</translation>
<translation id="3712050472459130149">Account update required</translation>
<translation id="3712897371525859903">Save page &amp;as...</translation>
@@ -2994,14 +2994,14 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3854967233147778866">Offer to translate websites in other languages</translation>
<translation id="3854976556788175030">Output tray is full</translation>
<translation id="3855441664322950881">Pack extension</translation>
-<translation id="3855676282923585394">Import bookmarks and settings...</translation>
+<translation id="3855676282923585394">Import Bookmarks and Settings...</translation>
<translation id="3856096718352044181">Please verify that this is a valid provider or try again later</translation>
<translation id="3856800405688283469">Select Time Zone</translation>
<translation id="3857807444929313943">Lift, then touch again</translation>
<translation id="3858860766373142691">Name</translation>
<translation id="3861638017150647085">Username '<ph name="USERNAME" />' is not available</translation>
<translation id="3861977424605124250">Show on startup</translation>
-<translation id="386239283124269513">&amp;Restore group</translation>
+<translation id="386239283124269513">&amp;Restore Group</translation>
<translation id="3865414814144988605">Resolution</translation>
<translation id="3866249974567520381">Description</translation>
<translation id="3867134342671430205">Drag or use arrow keys to move a display</translation>
@@ -3038,7 +3038,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3894123633473837029">Include recent Assistant history via Sherlog. This may include your identity, location and debug info. <ph name="BEGIN_LINK" />Learn more<ph name="END_LINK" /></translation>
<translation id="3894427358181296146">Add folder</translation>
<translation id="3894770151966614831">Move to Google Account?</translation>
-<translation id="3895076768659607631">&amp;Manage search engines…</translation>
+<translation id="3895076768659607631">&amp;Manage Search Engines…</translation>
<translation id="3895090224522145010">Kerberos username</translation>
<translation id="389521680295183045">Sites can ask to know when you're actively using your device</translation>
<translation id="3897298432557662720">{COUNT,plural, =1{an image}other{# images}}</translation>
@@ -3052,7 +3052,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="3905761538810670789">Repair app</translation>
<translation id="3908393983276948098"><ph name="PLUGIN_NAME" /> is out of date</translation>
<translation id="3908501907586732282">Enable extension</translation>
-<translation id="3909701002594999354">Show all controls</translation>
+<translation id="3909701002594999354">Show All &amp;Controls</translation>
<translation id="3909791450649380159">Cu&amp;t</translation>
<translation id="39103738135459590">Activation code</translation>
<translation id="3911824782900911339">New Tab page</translation>
@@ -3392,7 +3392,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4252996741873942488"><ph name="WINDOW_TITLE" /> Tab content shared</translation>
<translation id="4253168017788158739">Note</translation>
<translation id="4253183225471855471">No network found. Please insert your SIM and reboot your device before trying again.</translation>
-<translation id="4254813446494774748">Translation language:</translation>
+<translation id="4254813446494774748">Translation Language:</translation>
<translation id="425573743389990240">Battery Discharge Rate in Watts (Negative value means battery is charging)</translation>
<translation id="4256316378292851214">Sa&amp;ve Video As...</translation>
<translation id="4258348331913189841">File System</translation>
@@ -3460,7 +3460,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4316850752623536204">Developer Website</translation>
<translation id="4317820549299924617">Verification was not successful</translation>
<translation id="4320177379694898372">No internet connection</translation>
-<translation id="4322394346347055525">Close other tabs</translation>
+<translation id="4322394346347055525">Close Other Tabs</translation>
<translation id="4324577459193912240">File incomplete</translation>
<translation id="4325237902968425115">Uninstalling <ph name="LINUX_APP_NAME" />…</translation>
<translation id="4330191372652740264">Ice water</translation>
@@ -3686,7 +3686,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4546308221697447294">Browse fast with Google Chrome</translation>
<translation id="4546345569117159016">Right button</translation>
<translation id="4546692474302123343">Google Assistant voice input</translation>
-<translation id="4547659257713117923">No tabs from other devices</translation>
+<translation id="4547659257713117923">No Tabs From Other Devices</translation>
<translation id="4547672827276975204">Set automatically</translation>
<translation id="4549791035683739768">Your security key has no fingerprints stored</translation>
<translation id="4550926046134589611">Some supported links will still open in <ph name="APP_NAME" />.</translation>
@@ -3738,7 +3738,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4596295440756783523">You have certificates on file that identify these servers</translation>
<translation id="4598556348158889687">Storage management</translation>
<translation id="4598776695426288251">Wi-Fi available via multiple devices</translation>
-<translation id="4601426376352205922">Mark as unread</translation>
+<translation id="4601426376352205922">Mark as Unread</translation>
<translation id="4602466770786743961">Always allow <ph name="HOST" /> to access your camera and microphone</translation>
<translation id="4606551464649945562">Do not allow sites to create a 3D map of your surroundings or track camera position</translation>
<translation id="4608500690299898628">&amp;Find...</translation>
@@ -3815,7 +3815,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4667027203988048332">What data is used:</translation>
<translation id="46733273239502219">Offline data in installed apps will also be cleared</translation>
<translation id="4673442866648850031">Open stylus tools when the stylus is removed</translation>
-<translation id="4675065861091108046">You previously chose to allow all extensions on <ph name="ORIGIN" /></translation>
+<translation id="4675065861091108046">You Previously Chose To Allow All Extensions On <ph name="ORIGIN" /></translation>
<translation id="4675828034887792601">Create shortcuts for searching sites and manage your search engine</translation>
<translation id="4676595058027112862">Phone Hub, learn more</translation>
<translation id="4677772697204437347">GPU memory</translation>
@@ -4013,7 +4013,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4880827082731008257">Search history</translation>
<translation id="4881685975363383806">Don't remind me next time</translation>
<translation id="4881695831933465202">Open</translation>
-<translation id="488211015466188466">Follow site</translation>
+<translation id="488211015466188466">Follow Site</translation>
<translation id="4882312758060467256">Has access to this site</translation>
<translation id="4882919381756638075">Sites usually use your microphone for communication features like video chatting</translation>
<translation id="4883436287898674711">All <ph name="WEBSITE_1" /> sites</translation>
@@ -4064,7 +4064,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="4927753642311223124">Nothing to see here, move along.</translation>
<translation id="4929386379796360314">Print destinations</translation>
<translation id="4930447554870711875">Developers</translation>
-<translation id="4930714375720679147">Turn on</translation>
+<translation id="4930714375720679147">Turn On</translation>
<translation id="4932733599132424254">Date</translation>
<translation id="4933484234309072027">embedded on <ph name="URL" /></translation>
<translation id="4936042273057045735">Notification syncing is not supported for phones in a work profile</translation>
@@ -4171,7 +4171,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="5051836348807686060">Spellcheck isnt supported for the languages that you have selected</translation>
<translation id="5052499409147950210">Edit site</translation>
<translation id="505347685865235222">Unnamed group <ph name="GROUP_CONTENT_STRING" /></translation>
-<translation id="5053962746715621840">Search image with Google Lens</translation>
+<translation id="5053962746715621840">Search Image with Google Lens</translation>
<translation id="5054374119096692193">See all card options in <ph name="BEGIN_LINK" />Customise Chrome<ph name="END_LINK" /></translation>
<translation id="5056950756634735043">Connecting to the container</translation>
<translation id="5057110919553308744">When you click the extension</translation>
@@ -4511,7 +4511,7 @@ and Ctrl+Alt+Brightness down to zoom out.</translation>
<translation id="5397794290049113714">You</translation>
<translation id="5398497406011404839">Hidden bookmarks</translation>
<translation id="5398572795982417028">Out of bounds page reference, limit is <ph name="MAXIMUM_PAGE" /></translation>
-<translation id="5401426944298678474">Unfollow site</translation>
+<translation id="5401426944298678474">Unfollow Site</translation>
<translation id="5402815541704507626">Download update using mobile data</translation>
<translation id="540296380408672091">Always block cookies on <ph name="HOST" /></translation>
<translation id="5404740137318486384">Press a switch or keyboard key to assign it to '<ph name="ACTION" />'.
@@ -4534,7 +4534,7 @@ You can assign multiple switches to this action.</translation>
<translation id="5425042808445046667">Continue downloading</translation>
<translation id="5425863515030416387">Sign in easily across devices</translation>
<translation id="5427278936122846523">Always Translate</translation>
-<translation id="5427459444770871191">Rotate &amp;clockwise</translation>
+<translation id="5427459444770871191">Rotate &amp;Clockwise</translation>
<translation id="542750953150239272">By continuing, you agree that this device may also automatically download and install updates and apps from Google, your operator and your device's manufacturer, possibly using mobile data. Some of these apps may offer in-app purchases.</translation>
<translation id="5428850089342283580"><ph name="ACCNAME_APP" /> (Update is available)</translation>
<translation id="5429373054983029602">Search your screen with <ph name="VISUAL_SEARCH_PROVIDER" /></translation>
@@ -4592,7 +4592,7 @@ You can assign multiple switches to this action.</translation>
<translation id="5485102783864353244">Add app</translation>
<translation id="5485754497697573575">Restore All Tabs</translation>
<translation id="5486261815000869482">Confirm password</translation>
-<translation id="5486561344817861625">Simulate browser restart</translation>
+<translation id="5486561344817861625">Simulate Browser Restart</translation>
<translation id="5487460042548760727">Rename profile to <ph name="PROFILE_NAME" /></translation>
<translation id="5487521232677179737">Clear data</translation>
<translation id="5488093641312826914">'<ph name="COPIED_ITEM_NAME" />' copied</translation>
@@ -4999,7 +4999,7 @@ You can assign multiple switches to this action.</translation>
<translation id="5891688036610113830">Preferred Wi-Fi networks</translation>
<translation id="5895138241574237353">Restart</translation>
<translation id="5895335062901455404">Your saved preferences and activity will be ready on any Chrome OS Flex device when you sign in with your Google Account. You can choose what to sync in Settings.</translation>
-<translation id="5896436821193322561">Don't allow</translation>
+<translation id="5896436821193322561">Don't Allow</translation>
<translation id="5900302528761731119">Google Profile photo</translation>
<translation id="590036993063074298">Mirroring quality details</translation>
<translation id="5901069264981746702">Your fingerprint data is stored securely and never leaves your <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Learn more<ph name="LINK_END" /></translation>
@@ -5009,7 +5009,7 @@ You can assign multiple switches to this action.</translation>
<translation id="5904614460720589786">Couldn't set up <ph name="APP_NAME" /> because of a configuration problem. Please contact your administrator. Error code: <ph name="ERROR_CODE" />.</translation>
<translation id="5906655207909574370">Nearly up to date! Restart your device to finish updating.</translation>
<translation id="5906732635754427568">Data associated with this app will be removed from this device.</translation>
-<translation id="5908474332780919512">Start app when you sign in</translation>
+<translation id="5908474332780919512">Start App When You Sign In</translation>
<translation id="5908695239556627796">Mouse scroll speed</translation>
<translation id="5909379458939060601">Delete this profile and browsing data?</translation>
<translation id="5910363049092958439">Sa&amp;ve Image As...</translation>
@@ -5304,7 +5304,7 @@ You can assign multiple switches to this action.</translation>
<translation id="6198102561359457428">Sign out then sign in again...</translation>
<translation id="6198252989419008588">Change PIN</translation>
<translation id="6200047250927636406">Discard file</translation>
-<translation id="6200151268994853226">Manage extension</translation>
+<translation id="6200151268994853226">Manage Extension</translation>
<translation id="6201608810045805374">Remove this account?</translation>
<translation id="6202304368170870640">You can use your PIN to sign in to or unlock your device.</translation>
<translation id="6206311232642889873">Cop&amp;y Image</translation>
@@ -5316,7 +5316,7 @@ You can assign multiple switches to this action.</translation>
<translation id="6209838773933913227">Component updating</translation>
<translation id="6209908325007204267">Your device includes a Chrome Enterprise Upgrade, but your username is not associated with an enterprise account. Please create an enterprise account by visiting g.co/ChromeEnterpriseAccount on a secondary device.</translation>
<translation id="6210282067670792090">In the address bar, use this keyboard shortcut with shortcuts for search engines and site search</translation>
-<translation id="621172521139737651">{COUNT,plural, =0{Open all in &amp;new tab group}=1{Open in &amp;new tab group}other{Open all ({COUNT}) in &amp;new tab group}}</translation>
+<translation id="621172521139737651">{COUNT,plural, =0{Open All in &amp;New Tab Group}=1{Open in &amp;New Tab Group}other{Open All ({COUNT}) in &amp;New Tab Group}}</translation>
<translation id="6212039847102026977">Show advanced network properties</translation>
<translation id="6212168817037875041">Turn off display</translation>
<translation id="6212752530110374741">Email Link</translation>
@@ -5506,7 +5506,7 @@ You can assign multiple switches to this action.</translation>
<translation id="6387674443318562538">Split vertical</translation>
<translation id="6388429472088318283">Search languages</translation>
<translation id="6388577073199278153">Can't access your mobile account</translation>
-<translation id="6390020764191254941">Move tab to new window</translation>
+<translation id="6390020764191254941">Move Tab to New Window</translation>
<translation id="6393156038355142111">Suggest strong password</translation>
<translation id="6393550101331051049">Allowed to show insecure content</translation>
<translation id="6395423953133416962">Send <ph name="BEGIN_LINK1" />system information<ph name="END_LINK1" /> and <ph name="BEGIN_LINK2" />metrics<ph name="END_LINK2" /></translation>
@@ -5799,7 +5799,7 @@ You can assign multiple switches to this action.</translation>
<translation id="6680442031740878064">Available: <ph name="AVAILABLE_SPACE" /></translation>
<translation id="6680650203439190394">Rate</translation>
<translation id="6681668084120808868">Take photo</translation>
-<translation id="6683087162435654533">Restore all tabs</translation>
+<translation id="6683087162435654533">R&amp;estore All Tabs</translation>
<translation id="6684827949542560880">Downloading the latest update</translation>
<translation id="668599234725812620">Open Google Play</translation>
<translation id="6686490380836145850">Close tabs to the right</translation>
@@ -5938,7 +5938,7 @@ You can assign multiple switches to this action.</translation>
<translation id="6812841287760418429">Keep changes</translation>
<translation id="6813907279658683733">Entire screen</translation>
<translation id="6817174620439930047">Ask when a site wants to use system exclusive messages to access MIDI devices (recommended)</translation>
-<translation id="6818198425579322765">Page language to translate</translation>
+<translation id="6818198425579322765">Page Language to Translate</translation>
<translation id="6818802132960437751">Built-in virus protection</translation>
<translation id="6823174134746916417">Touchpad tap-to-click</translation>
<translation id="6824564591481349393">Copy &amp;Email Address</translation>
@@ -6164,7 +6164,7 @@ You can assign multiple switches to this action.</translation>
<translation id="7025082428878635038">Introducing a new way to navigate with gestures</translation>
<translation id="7025190659207909717">Mobile data service management</translation>
<translation id="7025895441903756761">Security and privacy</translation>
-<translation id="7027258625819743915">{COUNT,plural, =0{Open all in &amp;incognito window}=1{Open in &amp;incognito window}other{Open all ({COUNT}) in &amp;incognito window}}</translation>
+<translation id="7027258625819743915">{COUNT,plural, =0{Open All in &amp;Incognito Window}=1{Open in &amp;Incognito Window}other{Open All ({COUNT}) in &amp;Incognito Window}}</translation>
<translation id="7029307918966275733">Crostini is not installed. Please install Crostini to view credits.</translation>
<translation id="7029809446516969842">Passwords</translation>
<translation id="7030304022046916278">Sends URLs to Safe Browsing to check them</translation>
@@ -6208,7 +6208,7 @@ You can assign multiple switches to this action.</translation>
<translation id="7067396782363924830">Ambient colours</translation>
<translation id="7067725467529581407">Never show this again.</translation>
<translation id="7069811530847688087"><ph name="WEBSITE" /> may require a newer or different kind of security key</translation>
-<translation id="7070484045139057854">This can read and change site data</translation>
+<translation id="7070484045139057854">This Can Read and Change Site Data</translation>
<translation id="7072010813301522126">Shortcut name</translation>
<translation id="7075513071073410194">PKCS #1 MD5 With RSA Encryption</translation>
<translation id="7075625805486468288">Manage HTTPS/SSL certificates and settings</translation>
@@ -6246,7 +6246,7 @@ You can assign multiple switches to this action.</translation>
<translation id="7115361495406486998">No reachable contacts</translation>
<translation id="7117228822971127758">Please try again later</translation>
<translation id="7117247127439884114">Sign in Again...</translation>
-<translation id="711840821796638741">Show managed bookmarks</translation>
+<translation id="711840821796638741">Show Managed Bookmarks</translation>
<translation id="711902386174337313">Read the list of your signed-in devices</translation>
<translation id="711985611146095797">This page allows you to manage your signed-in Google Accounts. <ph name="LINK_BEGIN" />Learn more<ph name="LINK_END" /></translation>
<translation id="7120762240626567834">Chrome Browser and Android traffic will be blocked unless a VPN is connected</translation>
@@ -6287,7 +6287,7 @@ You can assign multiple switches to this action.</translation>
<translation id="7168109975831002660">Minimum font size</translation>
<translation id="7169122689956315694">Turn on notification when devices are nearby</translation>
<translation id="7170236477717446850">Profile picture</translation>
-<translation id="7171000599584840888">Add profile…</translation>
+<translation id="7171000599584840888">Add Profile…</translation>
<translation id="7171259390164035663">Don't enrol</translation>
<translation id="7172470549472604877">{NUM_TABS,plural, =1{Add tab to new group}other{Add tabs to new group}}</translation>
<translation id="7173114856073700355">Open settings</translation>
@@ -6337,11 +6337,11 @@ You can assign multiple switches to this action.</translation>
<translation id="7225179976675429563">Network type missing</translation>
<translation id="7227458944009118910">Apps listed below can handle protocol links as well. Other apps will ask for permission.</translation>
<translation id="7228523857728654909">Screen lock and sign-in</translation>
-<translation id="7230222852462421043">&amp;Restore window</translation>
+<translation id="7230222852462421043">&amp;Restore Window</translation>
<translation id="7230787553283372882">Customise your text size</translation>
<translation id="7231260028442989757">View, dismiss and reply to your phones notifications</translation>
<translation id="7232750842195536390">Renaming failed</translation>
-<translation id="723343421145275488">Search images with <ph name="VISUAL_SEARCH_PROVIDER" /></translation>
+<translation id="723343421145275488">Search Images with <ph name="VISUAL_SEARCH_PROVIDER" /></translation>
<translation id="7234010996000898150">Cancelling Linux restore</translation>
<translation id="7235716375204803342">Fetching activities...</translation>
<translation id="7235737137505019098">Your security key does not have enough space for any more accounts.</translation>
@@ -6576,7 +6576,7 @@ You can assign multiple switches to this action.</translation>
<translation id="7470424110735398630">Allowed to see your clipboard</translation>
<translation id="747114903913869239">Error: Unable to decode extension</translation>
<translation id="7471520329163184433">Slower</translation>
-<translation id="7473891865547856676">No, thanks</translation>
+<translation id="7473891865547856676">No, Thanks</translation>
<translation id="747459581954555080">Restore all</translation>
<translation id="747507174130726364">{NUM_DAYS,plural, =1{Immediate return required}other{Return <ph name="DEVICE_TYPE" /> within {NUM_DAYS} days}}</translation>
<translation id="7475671414023905704">Netscape Lost Password URL</translation>
@@ -6632,7 +6632,7 @@ You can assign multiple switches to this action.</translation>
<translation id="7526658513669652747">{NUM_DOWNLOADS,plural, =1{1 more}other{{NUM_DOWNLOADS} more}}</translation>
<translation id="7526989658317409655">Placeholder</translation>
<translation id="7527758104894292229">Update it in your Google Account, <ph name="ACCOUNT" /></translation>
-<translation id="7528224636098571080">Dont open</translation>
+<translation id="7528224636098571080">Dont Open</translation>
<translation id="7529411698175791732">Check your Internet connection. If the problem continues, try signing out and signing in again.</translation>
<translation id="7529876053219658589">{0,plural, =1{Close guest}other{Close guest}}</translation>
<translation id="7530016656428373557">Discharge Rate in Watts</translation>
@@ -6742,8 +6742,8 @@ You can assign multiple switches to this action.</translation>
<translation id="7633724038415831385">This is the only time that youll wait for an update. On Chromebooks, software updates happen in the background.</translation>
<translation id="7634280112532283638">Spam and fraud reduction</translation>
<translation id="7634566076839829401">Something went wrong. Please try again.</translation>
-<translation id="7635048370253485243">Pinned by your administrator</translation>
-<translation id="7636919061354591437">Install on this device</translation>
+<translation id="7635048370253485243">Pinned by your Administrator</translation>
+<translation id="7636919061354591437">Install on this Device</translation>
<translation id="7637593984496473097">Not enough disk space</translation>
<translation id="7639914187072011620">Failed to fetch the SAML redirect URL from the server</translation>
<translation id="764017888128728"><ph name="PASSWORD_MANAGER_BRAND" /> automatically signs you in to eligible sites with passwords that you saved.</translation>
@@ -7098,12 +7098,12 @@ Press an assigned switch or key to remove assignment.</translation>
<translation id="7957074856830851026">See device information, such as its serial number or asset ID</translation>
<translation id="7957615753207896812">Open keyboard device settings</translation>
<translation id="7959074893852789871">The file contained multiple certificates, some of which were not imported:</translation>
-<translation id="7959665254555683862">New incognito tab</translation>
+<translation id="7959665254555683862">New Incognito &amp;Tab</translation>
<translation id="7961015016161918242">Never</translation>
<translation id="7963001036288347286">Touchpad acceleration</translation>
<translation id="7963608432878156675">This name is visible to other devices for Bluetooth and network connections</translation>
<translation id="7963826112438303517">Your Assistant uses these recordings and your spoken requests to create and update your voice model, which is only stored on devices where you've turned on Voice Match. View or retrain voice activity in Assistant Settings.</translation>
-<translation id="7966241909927244760">C&amp;opy image address</translation>
+<translation id="7966241909927244760">C&amp;opy Image Address</translation>
<translation id="7966571622054096916">{COUNT,plural, =1{1 item in bookmark list}other{{COUNT} items in bookmark list}}</translation>
<translation id="7968072247663421402">Provider options</translation>
<translation id="7968742106503422125">Read and modify data that you copy and paste</translation>
@@ -7319,12 +7319,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="816095449251911490"><ph name="SPEED" /> - <ph name="RECEIVED_AMOUNT" />, <ph name="TIME_REMAINING" /></translation>
<translation id="81610453212785426">With <ph name="BEGIN_LINK" />Privacy Sandbox<ph name="END_LINK" />, Chrome is developing new technologies to safeguard you from cross-site tracking while preserving the open web.</translation>
<translation id="8161293209665121583">Reader mode for web pages</translation>
-<translation id="8162984717805647492">{NUM_TABS,plural, =1{Move tab to new window}other{Move tabs to new window}}</translation>
+<translation id="8162984717805647492">{NUM_TABS,plural, =1{Move Tab to New Window}other{Move Tabs to New Window}}</translation>
<translation id="8165997195302308593">Crostini port forwarding</translation>
<translation id="816704878106051517">{COUNT,plural, =1{a phone number}other{# phone numbers}}</translation>
<translation id="8168071266284693455">Your bookmarks, passwords, history and more are synced on all your devices</translation>
<translation id="8168435359814927499">Content</translation>
-<translation id="8169165065843881617">{NUM_TABS,plural, =1{Add tab to reading list}other{Add tabs to reading list}}</translation>
+<translation id="8169165065843881617">{NUM_TABS,plural, =1{Add Tab to Reading List}other{Add Tabs to Reading List}}</translation>
<translation id="8171334254070436367">Hide all cards</translation>
<translation id="8174047975335711832">Device information</translation>
<translation id="8174876712881364124">Back up to Google Drive. Easily restore data or switch device at any time. This backup includes app data. Backups are uploaded to Google and encrypted using your child's Google Account password. <ph name="BEGIN_LINK1" />Learn More<ph name="END_LINK1" /></translation>
@@ -7401,7 +7401,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8248381369318572865">Access your microphone and analyse your speech</translation>
<translation id="8248887045858762645">Chrome tip</translation>
<translation id="8249048954461686687">OEM folder</translation>
-<translation id="8249615410597138718">Send to your devices</translation>
+<translation id="8249615410597138718">Send to Your Devices</translation>
<translation id="8249672078237421304">Offer to translate pages that aren't in a language you read</translation>
<translation id="8250210000648910632">Out of storage space</translation>
<translation id="8251441930213048644">Refresh now</translation>
@@ -7415,7 +7415,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8260864402787962391">Mouse</translation>
<translation id="8261378640211443080">This extension is not listed in the <ph name="IDS_EXTENSION_WEB_STORE_TITLE" /> and may have been added without your knowledge.</translation>
<translation id="8261506727792406068">Delete</translation>
-<translation id="8263336784344783289">Name this group</translation>
+<translation id="8263336784344783289">Name This Group</translation>
<translation id="8263744495942430914"><ph name="FULLSCREEN_ORIGIN" /> has disabled your mouse cursor.</translation>
<translation id="8264024885325823677">This setting is managed by your administrator.</translation>
<translation id="8264718194193514834">"<ph name="EXTENSION_NAME" />" triggered full screen.</translation>
@@ -7569,7 +7569,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8425213833346101688">Change</translation>
<translation id="8425492902634685834">Pin to task bar</translation>
<translation id="8425768983279799676">You can use your PIN to unlock your device.</translation>
-<translation id="8426111352542548860">Save group</translation>
+<translation id="8426111352542548860">Save Group</translation>
<translation id="8426713856918551002">Enabling</translation>
<translation id="8427213022735114808">Dictation sends your voice to Google to allow voice typing in any text field.</translation>
<translation id="8427292751741042100">embedded on any host</translation>
@@ -7664,13 +7664,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8531701051932785007">Enhanced Safe Browsing is off</translation>
<translation id="8534656636775144800">Oops! Something went wrong when trying to join the domain. Please try again.</translation>
<translation id="8535005006684281994">Netscape Certificate Renewal URL</translation>
-<translation id="8536713137312218707">Quick commands</translation>
+<translation id="8536713137312218707">Quick Commands</translation>
<translation id="8536956381488731905">Sound on key-press</translation>
<translation id="8539727552378197395">No (HttpOnly)</translation>
<translation id="8539766201049804895">Upgrade</translation>
<translation id="8540136935098276800">Enter a correctly formatted URL</translation>
<translation id="8540503336857689453">Using a hidden network isn't recommended for security reasons.</translation>
-<translation id="854071720451629801">Mark as read</translation>
+<translation id="854071720451629801">Mark as Read</translation>
<translation id="8540942859441851323">Roaming required by provider</translation>
<translation id="8541462173655894684">Did not find any printers from the print server</translation>
<translation id="8541838361296720865">Press a switch or keyboard key to assign it to '<ph name="ACTION" />'</translation>
@@ -7689,7 +7689,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8557022314818157177">Keep touching your security key until your fingerprint is captured</translation>
<translation id="8557180006508471423">Turn on 'Google Chrome' in Location Services on your Mac</translation>
<translation id="8557856025359704738">Next download is at <ph name="NEXT_DATE_DOWNLOAD" />.</translation>
-<translation id="8560327176991673955">{COUNT,plural, =0{Open all in &amp;new window}=1{Open in &amp;new window}other{Open all ({COUNT}) in &amp;new window}}</translation>
+<translation id="8560327176991673955">{COUNT,plural, =0{Open All in &amp;New Window}=1{Open in &amp;New Window}other{Open All ({COUNT}) in &amp;New Window}}</translation>
<translation id="8561206103590473338">Elephant</translation>
<translation id="8561565784790166472">Proceed with caution</translation>
<translation id="8561853412914299728"><ph name="TAB_TITLE" /> <ph name="EMOJI_PLAYING" /></translation>
@@ -7752,7 +7752,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8630338733867813168">Sleep while charging</translation>
<translation id="8631032106121706562">Petals</translation>
<translation id="863109444997383731">Sites will be blocked from asking to show you notifications. If a site requests notifications, a blocked indicator will appear in the address bar.</translation>
-<translation id="8632104508818855045">You previously chose not to allow any extensions on <ph name="ORIGIN" /></translation>
+<translation id="8632104508818855045">You Previously Chose Not To Allow Any Extensions On <ph name="ORIGIN" /></translation>
<translation id="8633025649649592204">Recent activity</translation>
<translation id="8634348081024879304">You will no longer be able to use your virtual card with Google Pay. <ph name="BEGIN_LINK" />Learn about virtual cards<ph name="END_LINK" /></translation>
<translation id="8635628933471165173">Reloading...</translation>
@@ -7925,7 +7925,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8784626084144195648">Binned Average</translation>
<translation id="8785622406424941542">Stylus</translation>
<translation id="8786824282808281903">When your child sees this icon, a fingerprint can be used for identification or to approve purchases.</translation>
-<translation id="8787575090331305835">{NUM_TABS,plural, =1{Unnamed group 1 tab}other{Unnamed group # tabs}}</translation>
+<translation id="8787575090331305835">{NUM_TABS,plural, =1{Unnamed Group 1 Tab}other{Unnamed Group # Tabs}}</translation>
<translation id="8791534160414513928">Send a Do Not Track request with your browsing traffic</translation>
<translation id="879413103056696865">While the hotspot is on, your <ph name="PHONE_NAME" /> will:</translation>
<translation id="8795916974678578410">New Window</translation>
@@ -7935,7 +7935,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8803526663383843427">When on</translation>
<translation id="8803953437405899238">Open a new tab with one click</translation>
<translation id="8804419452060773146">Opens in</translation>
-<translation id="8804999695258552249">{NUM_TABS,plural, =1{Move tab to another window}other{Move tabs to another window}}</translation>
+<translation id="8804999695258552249">{NUM_TABS,plural, =1{Move Tab to Another Window}other{Move Tabs to Another Window}}</translation>
<translation id="8805140816472474147">Confirm sync settings to start sync.</translation>
<translation id="8806680466228877631"><ph name="SHORTCUT" /> can reopen accidentally closed tabs</translation>
<translation id="8807632654848257479">Stable</translation>
@@ -8311,7 +8311,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<ph name="LIST_ITEM" />Running Chrome Connectivity Diagnostics
<ph name="END_LIST" /></translation>
<translation id="916607977885256133">Picture in Picture</translation>
-<translation id="9167063903968449027">Show reading list</translation>
+<translation id="9167063903968449027">Show Reading List</translation>
<translation id="9167450455589251456">The profile is not supported</translation>
<translation id="9168436347345867845">Do it later</translation>
<translation id="9169496697824289689">View keyboard shortcuts</translation>
@@ -8410,7 +8410,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="971774202801778802">Bookmark URL</translation>
<translation id="972996901592717370">Touch the power button with your finger. Your data is stored securely and never leaves your <ph name="DEVICE_TYPE" />.</translation>
<translation id="973473557718930265">Quit</translation>
-<translation id="975893173032473675">Language to translate into</translation>
+<translation id="975893173032473675">Language to Translate into</translation>
<translation id="976499800099896273">Autocorrect undo dialogue is shown for <ph name="TYPED_WORD" /> corrected to <ph name="CORRECTED_WORD" />. Press up arrow to access, escape to ignore.</translation>
<translation id="978146274692397928">Initial punctuation width is Full</translation>
<translation id="97905529126098460">This window will close after cancellation is complete.</translation>
diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb
index 2b3ebf97bd67..feff984e5988 100644
--- a/chrome/app/resources/generated_resources_es-419.xtb
+++ b/chrome/app/resources/generated_resources_es-419.xtb
@@ -2860,7 +2860,7 @@ y Ctrl + Alt + Disminuir brillo para alejar.</translation>
<translation id="3755411799582650620">El <ph name="PHONE_NAME" /> ahora también puede desbloquear este dispositivo <ph name="DEVICE_TYPE" />.</translation>
<translation id="375636864092143889">El sitio está usando el micrófono</translation>
<translation id="3756485814916578707">Transmitiendo pantalla</translation>
-<translation id="3756578970075173856">Establece un PIN</translation>
+<translation id="3756578970075173856">Establecer un PIN</translation>
<translation id="3756795331760037744">Permite que Asistente de Google utilice información de la pantalla de <ph name="SUPERVISED_USER_NAME" /> para que le sea útil</translation>
<translation id="3757733214359997190">No se encontraron sitios</translation>
<translation id="375841316537350618">Descargando secuencia de comandos proxy...</translation>
@@ -3863,7 +3863,7 @@ y Ctrl + Alt + Disminuir brillo para alejar.</translation>
<translation id="4742970037960872810">Quitar el texto destacado</translation>
<translation id="4743260470722568160"><ph name="BEGIN_LINK" />Obtener información sobre cómo actualizar las aplicaciones<ph name="END_LINK" /></translation>
<translation id="4744981231093950366">{NUM_TABS,plural, =1{Activar el sonido del sitio}other{Activar el sonido de los sitios}}</translation>
-<translation id="474609389162964566">Accede a tu Asistente mediante "Hey Google"</translation>
+<translation id="474609389162964566">Accede a tu Asistente con "Hey Google"</translation>
<translation id="4746351372139058112">Mensajes</translation>
<translation id="4748783296226936791">Por lo general, los sitios se conectan a dispositivos HID para usarlos en funciones que utilizan teclados poco habituales, controles de juegos y otros dispositivos.</translation>
<translation id="4750185073185658673">Revisa algunos permisos en tu teléfono. Asegúrate de que las conexiones Bluetooth y Wi-Fi del teléfono estén activadas.</translation>
diff --git a/chrome/app/resources/generated_resources_gl.xtb b/chrome/app/resources/generated_resources_gl.xtb
index cb6696652d43..5bdf99d81713 100644
--- a/chrome/app/resources/generated_resources_gl.xtb
+++ b/chrome/app/resources/generated_resources_gl.xtb
@@ -1875,7 +1875,7 @@ Se máis tarde decides que prefires que o teu fillo ou filla non utilice Voice M
<translation id="2757338480560142065">Asegúrate de que o contrasinal que gardas coincida co contrasinal de <ph name="WEBSITE" /></translation>
<translation id="2762441749940182211">Bloqueouse a cámara</translation>
<translation id="2764786626780673772">Detalles da VPN</translation>
-<translation id="2765100602267695013">Contacta co teu provedor de telefonía móbil</translation>
+<translation id="2765100602267695013">Contacta co teu operador móbil</translation>
<translation id="2765217105034171413">Pequeno</translation>
<translation id="2766006623206032690">Pe&amp;gar e ir</translation>
<translation id="2766161002040448006">Preguntar a teu pai ou túa nai</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
index 86cf1fdbe9fb..f67d74e790b1 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_eu.xtb
@@ -332,7 +332,7 @@ Eduki sakatuta bilatu nahi duzun hitza. Bilaketa mugatzeko, hautatu hitz gehiago
<translation id="2806840421670364300">FLoC</translation>
<translation id="281504910091592009">Ikusi eta kudeatu <ph name="BEGIN_LINK" />Google-ko kontuan<ph name="END_LINK" /> gordetako pasahitzak</translation>
<translation id="2818669890320396765">Laster-markak gailu guztietan izateko, hasi saioa eta aktibatu sinkronizazioa</translation>
-<translation id="2827278682606527653">Jarioko txartelaren menua irekita dago eta altuera erdia hartzen du</translation>
+<translation id="2827278682606527653">Jarioko txartelaren menua altuera erdian irekita dago</translation>
<translation id="2830783625999891985">Ezkutatu dira arbeleko edukiak</translation>
<translation id="2838367486340230368">Pribatutasun-gidaren azalpena altuera erdian irekita dago</translation>
<translation id="2839327205551510876">Utzi diozu <ph name="SITE_NAME" /> webguneari jarraitzeari</translation>
diff --git a/components/strings/components_strings_en-GB.xtb b/components/strings/components_strings_en-GB.xtb
index 6586ebd3063e..b2067efb301b 100644
--- a/components/strings/components_strings_en-GB.xtb
+++ b/components/strings/components_strings_en-GB.xtb
@@ -45,7 +45,7 @@
<translation id="1081061862829655580">Tray 19</translation>
<translation id="1086953900555227778">Index-5x8</translation>
<translation id="1088860948719068836">Add Name on Card</translation>
-<translation id="1089439967362294234">Change password</translation>
+<translation id="1089439967362294234">Change Password</translation>
<translation id="1096545575934602868">This field should not have more than <ph name="MAX_ITEMS_LIMIT" /> entries. All further entries will be discarded.</translation>
<translation id="1100782917270858593">Resume your journey button, press Enter to resume your journey and see relevant activity in your Chrome history</translation>
<translation id="1101672080107056897">Error action</translation>
@@ -77,7 +77,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="1177802847690410663">Web browsers</translation>
<translation id="1178581264944972037">Pause</translation>
<translation id="1181037720776840403">Remove</translation>
-<translation id="1186201132766001848">Check passwords</translation>
+<translation id="1186201132766001848">Check Passwords</translation>
<translation id="1195558154361252544">Notifications are automatically blocked for all sites except ones that you allow</translation>
<translation id="1197088940767939838">Orange</translation>
<translation id="1201402288615127009">Next</translation>
@@ -138,7 +138,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="1323433172918577554">Show More</translation>
<translation id="132390688737681464">Save and fill addresses</translation>
<translation id="1330449323196174374">Left gate fold</translation>
-<translation id="1333745675627230582">Play Chrome Dino game</translation>
+<translation id="1333745675627230582">Play Chrome Dino Game</translation>
<translation id="1333989956347591814">Your activity <ph name="BEGIN_EMPHASIS" />might still be visible<ph name="END_EMPHASIS" /> to:
<ph name="BEGIN_LIST" />
<ph name="LIST_ITEM" />Websites that you visit
@@ -452,7 +452,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="2126374524350484896">PDF producer:</translation>
<translation id="2130448033692577677">The templates that you've specified may not be applied due to the DnsOverHttpsMode policy not being set.</translation>
<translation id="2135799067377889518">Men's clothing</translation>
-<translation id="213826338245044447">Mobile bookmarks</translation>
+<translation id="213826338245044447">Mobile Bookmarks</translation>
<translation id="214556005048008348">Cancel payment</translation>
<translation id="2148613324460538318">Add Card</translation>
<translation id="2149968176347646218">Connection is not secure</translation>
@@ -574,7 +574,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="2495083838625180221">JSON Parser</translation>
<translation id="2498091847651709837">Scan new card</translation>
<translation id="2501278716633472235">Go back</translation>
-<translation id="2505268675989099013">Protect account</translation>
+<translation id="2505268675989099013">Protect Account</translation>
<translation id="2509167091171468975">Food and grocery retailers</translation>
<translation id="2512101340618156538">Not allowed (default)</translation>
<translation id="2512413427717747692">Set Chrome as default browser button, press Enter to set Chrome as the system's default browser in iOS settings</translation>
@@ -744,7 +744,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="2972581237482394796">&amp;Redo</translation>
<translation id="2977665033722899841"><ph name="ROW_NAME" />, currently selected. <ph name="ROW_CONTENT" /></translation>
<translation id="2978824962390592855">Opera</translation>
-<translation id="2983666748527428214">Open incognito tab</translation>
+<translation id="2983666748527428214">Open Incognito Tab</translation>
<translation id="2985306909656435243">If enabled, Chromium will store a copy of your card on this device for faster form filling.</translation>
<translation id="2985398929374701810">Enter a valid address</translation>
<translation id="2986368408720340940">This pickup method isnt available. Try a different method.</translation>
@@ -1388,7 +1388,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="4757993714154412917">You just entered your password on a deceptive site. To secure your accounts, Chromium recommends checking your saved passwords.</translation>
<translation id="4758311279753947758">Add contact info</translation>
<translation id="4761104368405085019">Use your microphone</translation>
-<translation id="4761869838909035636">Run Chrome safety check</translation>
+<translation id="4761869838909035636">Run Chrome Safety Check</translation>
<translation id="4764776831041365478">The web page at <ph name="URL" /> might be temporarily down or it may have moved permanently to a new web address.</translation>
<translation id="4766713847338118463">Dual staple bottom</translation>
<translation id="4771973620359291008">An unknown error has occurred.</translation>
@@ -1515,7 +1515,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="5097099694988056070">Device statistics such as CPU/RAM usage</translation>
<translation id="5097501891273180634">A2</translation>
<translation id="5108881358339761672">Site is not secure</translation>
-<translation id="5109892411553231226">Manage payment methods</translation>
+<translation id="5109892411553231226">Manage Payment Methods</translation>
<translation id="5112422516732747637">A5</translation>
<translation id="5114288597538800140">Tray 18</translation>
<translation id="5114987907971894280">virtual reality</translation>
@@ -1613,7 +1613,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="5332219387342487447">Delivery method</translation>
<translation id="5333022057423422993">Chrome found the password that you just used in a data breach. To secure your accounts, we recommend checking your saved passwords.</translation>
<translation id="5334013548165032829">Detailed system logs</translation>
-<translation id="5334145288572353250">Save address?</translation>
+<translation id="5334145288572353250">Save Address?</translation>
<translation id="5335920952954443287">Beating heart</translation>
<translation id="5340250774223869109">Application is blocked</translation>
<translation id="534295439873310000">NFC devices</translation>
@@ -1764,7 +1764,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="5789643057113097023">.</translation>
<translation id="5803412860119678065">Do you want to fill in your <ph name="CARD_DETAIL" />?</translation>
<translation id="5804241973901381774">Permissions</translation>
-<translation id="5808435672482059465">View your Chrome history</translation>
+<translation id="5808435672482059465">View Your Chrome History</translation>
<translation id="5808542072418270309">Simulation games</translation>
<translation id="5810442152076338065">Your connection to <ph name="DOMAIN" /> is encrypted using an obsolete cipher suite.</translation>
<translation id="5812947184178430888">When security events are flagged by Chrome, relevant data about the events is sent to your administrator. This can include URLs of pages that you visit in Chrome, file names or metadata, and the username that you use to sign in to web-based applications, your device and Chrome.</translation>
@@ -1904,7 +1904,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="6232271601416750929">Clean beauty</translation>
<translation id="6233160458685643793">Grinning</translation>
<translation id="6234122620015464377">Trim after each document</translation>
-<translation id="6236290670123303279">Manage settings</translation>
+<translation id="6236290670123303279">Manage Settings</translation>
<translation id="6240447795304464094">Google Pay logo</translation>
<translation id="6241121617266208201">Hide suggestions</translation>
<translation id="624499991300733384">Print compositor service</translation>
@@ -2081,7 +2081,7 @@ This will otherwise be blocked by your privacy settings. This will allow the con
<translation id="6753269504797312559">Policy Value</translation>
<translation id="6755241357817244406">chrome://flags</translation>
<translation id="6757797048963528358">Your device went to sleep.</translation>
-<translation id="6767985426384634228">Update address?</translation>
+<translation id="6767985426384634228">Update Address?</translation>
<translation id="6768213884286397650">Hagaki (Postcard)</translation>
<translation id="6775759552199460396">JIS B2</translation>
<translation id="6784045420901191374">Commercial lending</translation>
@@ -2308,7 +2308,7 @@ Additional details:
<translation id="7386364858855961704">Not applicable</translation>
<translation id="7388594495505979117">{0,plural, =1{Your device will restart in 1 minute}other{Your device will restart in # minutes}}</translation>
<translation id="7390545607259442187">Confirm Card</translation>
-<translation id="7392089738299859607">Update address</translation>
+<translation id="7392089738299859607">Update Address</translation>
<translation id="7399802613464275309">Safety check</translation>
<translation id="7400418766976504921">URL</translation>
<translation id="7403392780200267761">Share this tab by sharing the link, creating a QR code, casting and more</translation>
@@ -2342,7 +2342,7 @@ Additional details:
<translation id="7460618730930299168">The screening is different from what you selected. Continue?</translation>
<translation id="7463075493919226237">Australian football</translation>
<translation id="7469935732330206581">Form is not secure</translation>
-<translation id="7473891865547856676">No, thanks</translation>
+<translation id="7473891865547856676">No, Thanks</translation>
<translation id="7481312909269577407">Forward</translation>
<translation id="7485870689360869515">No data found.</translation>
<translation id="7485948220959728508">Whos behind this information?</translation>
@@ -2499,7 +2499,7 @@ Additional details:
<translation id="7871445724586827387">Change your Google Account password</translation>
<translation id="7877007680666472091">protected content IDs</translation>
<translation id="7878562273885520351">Your password may be compromised</translation>
-<translation id="7880146494886811634">Save address</translation>
+<translation id="7880146494886811634">Save Address</translation>
<translation id="7882421473871500483">Brown</translation>
<translation id="7882995332186050355">Cargo trucks and trailers</translation>
<translation id="7887683347370398519">Check your CVC and try again</translation>
@@ -2634,7 +2634,7 @@ Additional details:
<translation id="8252991034201168845">Manage accessibility settings button, Enter to personalise your accessibility tools in Chrome OS settings</translation>
<translation id="8253091569723639551">Billing address required</translation>
<translation id="8257387598443225809">This app is designed for mobile</translation>
-<translation id="825929999321470778">Show all saved passwords</translation>
+<translation id="825929999321470778">Show All Saved Passwords</translation>
<translation id="8261506727792406068">Delete</translation>
<translation id="8262952874573525464">Edge stitch bottom</translation>
<translation id="8265992338205884890">Visible data</translation>
diff --git a/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb
index 55816e9537b4..b989b6b970ac 100644
--- a/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb
+++ b/ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb
@@ -69,7 +69,7 @@
<translation id="5777187867430702742">Chromium page</translation>
<translation id="5862307444128926510">Welcome to Chromium</translation>
<translation id="5945387852661427312">You are signing in with an account managed by <ph name="DOMAIN" /> and giving its administrator control over your Chromium data. Your data will become permanently tied to this account. Signing out of Chromium will delete your data from this device, but it will remain stored in your Google Account.</translation>
-<translation id="5983312940147103417">Make Chromium better</translation>
+<translation id="5983312940147103417">Make Chromium Better</translation>
<translation id="602807004951640891">By using Chromium, you agree to the <ph name="BEGIN_LINK_TOS" />Terms of Service<ph name="END_LINK_TOS" />.</translation>
<translation id="6119647025869519954">To make Chromium your default:
1. Open settings
diff --git a/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb
index 8bf1d9a78d85..8e1ad94d00ea 100644
--- a/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb
+++ b/ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb
@@ -59,7 +59,7 @@
<translation id="4819268619367838612">To help improve the app, Chrome sends usage and crash data to Google. <ph name="BEGIN_LINK" />Manage<ph name="END_LINK" /></translation>
<translation id="484033449593719797">Not supported on Chrome beta</translation>
<translation id="5030102366287574140">Chrome can help keep you safe from data breaches, unsafe websites and more.</translation>
-<translation id="5108659628347594808">Make Chrome better</translation>
+<translation id="5108659628347594808">Make Chrome Better</translation>
<translation id="5119391094379141756">Select Chrome</translation>
<translation id="5162467219239570114">Chrome is out of date. If no update is available in the <ph name="BEGIN_LINK" />app store<ph name="END_LINK" />, it's possible that your device doesn't support new versions of Chrome anymore.</translation>
<translation id="5389212809648216794">Google Chrome can't use your camera because it's in use by another application</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
index 8edfa8b82175..44dcc47c5133 100644
--- a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
@@ -74,7 +74,7 @@ Your search engine is <ph name="DSE_NAME" />. See their instructions for deletin
<translation id="1509960214886564027">Features on many sites may break</translation>
<translation id="152234381334907219">Never saved</translation>
<translation id="1523341279170789507">Allow All Cookies</translation>
-<translation id="1524563461097350801">No, thanks</translation>
+<translation id="1524563461097350801">No, Thanks</translation>
<translation id="1535268707340844072">Your current setting may cause some sites to break. To manage cookies for all sites, see <ph name="BEGIN_LINK" />Cookie settings<ph name="END_LINK" />.</translation>
<translation id="1540800554400757039">Address 1</translation>
<translation id="1545749641540134597">Scan QR Code</translation>
@@ -185,7 +185,7 @@ Sites can't use cookies to see your browsing activity across different sites, fo
<translation id="2600682495497606169">Clear site cookies</translation>
<translation id="2625189173221582860">Password copied</translation>
<translation id="2626236249646841566">Check your connection and try signing in again.</translation>
-<translation id="2637313651144986786">Search tabs…</translation>
+<translation id="2637313651144986786">Search Tabs…</translation>
<translation id="2647269890314209800">Cookies in Use</translation>
<translation id="2648803196158606475">Delete Read</translation>
<translation id="2653659639078652383">Submit</translation>
@@ -243,7 +243,7 @@ Sites can't use cookies to see your browsing activity across different sites, fo
<translation id="298306318844797842">Add Payment Method...</translation>
<translation id="2989805286512600854">Open in New Tab</translation>
<translation id="3037605927509011580">Aw, Snap!</translation>
-<translation id="3039722182465315531">Don't sign in</translation>
+<translation id="3039722182465315531">Don't Sign In</translation>
<translation id="3076846064362030967">You won't be signed out of your Google Account. <ph name="BEGIN_LINK" />Other forms of activity<ph name="END_LINK" /> may be saved in your Google Account when youre signed in. You can delete them at any time.
@@ -459,7 +459,7 @@ To change this setting, <ph name="BEGIN_LINK" />reset sync<ph name="END_LINK" />
<translation id="4901778704868714008">Save...</translation>
<translation id="4904877109095351937">Mark Read</translation>
<translation id="4908869848243824489">Discover by Google</translation>
-<translation id="4930714375720679147">Turn on</translation>
+<translation id="4930714375720679147">Turn On</translation>
<translation id="4941089862236492464">Sorry, there was a problem sharing your item.</translation>
<translation id="4944543191714094452">Find in page…</translation>
<translation id="4945756290001680296">Access password settings</translation>
@@ -769,7 +769,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across
<translation id="7464701184726199289">This clears synced data from all devices. Saved site settings will not be deleted and may reflect your browsing habits. <ph name="BEGIN_LINK" />Find out more<ph name="END_LINK" /></translation>
<translation id="746684838091935575">3. Select Chrome</translation>
<translation id="7472734401283673885">Company Name</translation>
-<translation id="7473891865547856676">No, thanks</translation>
+<translation id="7473891865547856676">No, Thanks</translation>
<translation id="7481312909269577407">Forward</translation>
<translation id="750493650310597496">0 selected</translation>
<translation id="7508728395076009983">To lock your incognito tabs, set up touch ID, face ID or a passcode.</translation>
--
2.37.0

View File

@ -0,0 +1,44 @@
From fb5cfd58e6ffe97dacf99f64b30d6ede4387a82e Mon Sep 17 00:00:00 2001
From: Ioana Pandele <ioanap@chromium.org>
Date: Wed, 15 Jun 2022 21:35:52 +0000
Subject: [PATCH 17/59] [Sheriff] Disable BluetoothTest.ConstructDefaultAdapter
on Mac
(cherry picked from commit 6ab5afb8214f18b886e3b190045ee8a90c3ca5f7)
Bug: 1334462
Change-Id: I95f9678936fa652c75949a48cfc53e788fc4b4a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3695178
Auto-Submit: Ioana Pandele <ioanap@chromium.org>
Owners-Override: Ioana Pandele <ioanap@chromium.org>
Commit-Queue: Lan Wei <lanwei@chromium.org>
Reviewed-by: Lan Wei <lanwei@chromium.org>
Owners-Override: Lan Wei <lanwei@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1011954}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708698
Commit-Queue: Phillis Tang <phillis@chromium.org>
Owners-Override: Phillis Tang <phillis@chromium.org>
Auto-Submit: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#1176}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
device/bluetooth/bluetooth_adapter_unittest.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index cfd96a78408b..8719f0f732b2 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -708,7 +708,8 @@ TEST_F(BluetoothAdapterTest, StartDiscoverySessionError_Destroy) {
}
// TODO(scheib): Enable BluetoothTest fixture tests on all platforms.
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC)
+// Flaky on Mac. See crbug.com/1334462
+#if BUILDFLAG(IS_ANDROID)
#define MAYBE_ConstructDefaultAdapter ConstructDefaultAdapter
#else
#define MAYBE_ConstructDefaultAdapter DISABLED_ConstructDefaultAdapter
--
2.37.0

View File

@ -0,0 +1,28 @@
From c93990fa0fcea605d74b8badf15176b64efb36ce Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Thu, 16 Jun 2022 01:00:42 +0000
Subject: [PATCH 18/59] Incrementing VERSION to 102.0.5005.131
Change-Id: Ic40d8b3a54cd65afec40dedd309f3e8010ffb8ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3706784
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1177}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 2a835d053cb4..31f19120d007 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=130
+PATCH=131
--
2.37.0

View File

@ -0,0 +1,308 @@
From f7a75a646b7a1ac6bbc83456f7b1d8c0b742a85d Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Thu, 16 Jun 2022 14:44:26 +0000
Subject: [PATCH 19/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I81cea9f1e1f44dfe52a89cef4fc26f06f0254a19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707982
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1178}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../android_chrome_tab_ui_strings_te.xtb | 6 +++---
.../app/resources/generated_resources_te.xtb | 14 ++++++-------
.../app/resources/generated_resources_vi.xtb | 2 +-
.../strings/accessibility_strings_te.xtb | 4 ++--
.../android_chrome_strings_te.xtb | 2 +-
chromeos/strings/chromeos_strings_te.xtb | 2 +-
components/strings/components_strings_fa.xtb | 20 +++++++++----------
components/strings/components_strings_te.xtb | 2 +-
.../strings/resources/ios_strings_zh-TW.xtb | 2 +-
ui/strings/translations/ax_strings_te.xtb | 2 +-
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb b/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb
index aa972690a329..08d399accf4e 100644
--- a/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb
+++ b/chrome/android/features/tab_ui/java/strings/translations/android_chrome_tab_ui_strings_te.xtb
@@ -19,7 +19,7 @@
<translation id="2539705006853443997">{TABS_COUNT,plural, =1{<ph name="TABS_COUNT_ONE" /> ట్యాబ్‌ను కుదించండి.}other{<ph name="TABS_COUNT_MANY" /> ట్యాబ్‌లతో ట్యాబ్ గ్రూప్‌ను కుదించండి.}}</translation>
<translation id="2569352796411618312">సూచన: మీ <ph name="NUMBER_OF_TABS" /> ట్యాబ్‌లను ఇటీవల ఉపయోగించలేదు. వాటిని మూసివేయాలా?</translation>
<translation id="257674075312929031">గ్రూప్‌గా చేయి</translation>
-<translation id="2613747923081026172">సమూహాన్ని క్రియేట్ చేయండి</translation>
+<translation id="2613747923081026172">గ్రూప్‌ను క్రియేట్ చేయండి</translation>
<translation id="2662028055331606429"><ph name="CURRENT_RATING" />/<ph name="RATING_BASELINE" /> రేటింగ్</translation>
<translation id="266935134738038806">సైట్‌కు వెళ్లండి</translation>
<translation id="2671423594960767771">గ్రూప్‌ను షేర్ చేయండి</translation>
@@ -92,7 +92,7 @@
<translation id="8749939518995770034">మూసివేయబడిన ట్యాబ్‌ స్ట్రిప్</translation>
<translation id="8820741577754260431">మీ ట్యాబ్‌లలో ధర తగ్గింపు వివరాలను చూడండి</translation>
<translation id="9090098097337832354">ఈ స్టోర్ గురించిన సమాచారాన్ని చూపించే స్క్రీన్ మూసివేయబడింది</translation>
-<translation id="9150694013019234766">స్క్రీన్ దిగువ భాగం దగ్గరలో ఉండే మీ ట్యాబ్ సమూహంలో కోరుకునే ట్యాబ్‌లకు మారండి</translation>
-<translation id="9169594135889675189">సమూహానికి కొత్త ట్యాబ్‌ను జోడించు</translation>
+<translation id="9150694013019234766">స్క్రీన్ దిగువ భాగం దగ్గరలో ఉండే మీ ట్యాబ్ గ్రూప్‌లో కోరుకునే ట్యాబ్‌లకు మారండి</translation>
+<translation id="9169594135889675189">గ్రూప్‌నకు కొత్త ట్యాబ్‌ను జోడించు</translation>
<translation id="959682366969460160">అన్నింటిని క్రమ పద్దతిలో అమర్చండి</translation>
</translationbundle>
\ No newline at end of file
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index a92ab6ddabb0..20010cb9bef6 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -829,7 +829,7 @@
<translation id="1779468444204342338">కనిష్ఠం</translation>
<translation id="1779652936965200207">దయచేసి "<ph name="DEVICE_NAME" />"లో ఈ పాస్‌కీని నమోదు చేయండి:</translation>
<translation id="177989070088644880">యాప్ (<ph name="ANDROID_PACKAGE_NAME" />)</translation>
-<translation id="1780152987505130652">సమూహాన్ని మూసివేయి</translation>
+<translation id="1780152987505130652">గ్రూప్‌ను మూసివేయి</translation>
<translation id="1780273119488802839">బుక్‌మార్క్‌లను దిగుమతి చేస్తోంది...</translation>
<translation id="178092663238929451">మీ చుట్టూ ఉన్న వ్యక్తులతో ఫైళ్లను అందుకోవడానికి, ఇంకా పంపడానికి 'సమీప షేరింగ్'ను సెటప్ చేయండి</translation>
<translation id="1781291988450150470">ప్రస్తుత పిన్‌</translation>
@@ -2035,7 +2035,7 @@
<translation id="2893013536106749396">మీరు ముఖ్యం అనుకునే విషయాల గురించి మీకు తెలియజేసే కార్డ్‌లను ఎంచుకోండి</translation>
<translation id="2893168226686371498">ఆటోమేటిక్ బ్రౌజర్</translation>
<translation id="2893180576842394309">శోధన, ఇతర Google సేవలను వ్యక్తిగతీకరించడానికి Google మీ చరిత్రను ఉపయోగించే అవకాశం ఉంటుంది</translation>
-<translation id="2894757982205307093">సమూహంలో కొత్త ట్యాబ్</translation>
+<translation id="2894757982205307093">గ్రూప్‌లో కొత్త ట్యాబ్</translation>
<translation id="289695669188700754">కీ ID: <ph name="KEY_ID" /></translation>
<translation id="2897713966423243833">మీరు మీ అన్ని అజ్ఞాత విండోలను మూసివేసినప్పుడు, ఈ అనుకూల సెట్టింగ్ తీసివేయబడుతుంది</translation>
<translation id="2897878306272793870">మీరు <ph name="TAB_COUNT" /> ట్యాబ్‌లను తెరవాలనుకుంటున్నారా?</translation>
@@ -2102,7 +2102,7 @@
<translation id="2949289451367477459">స్థానాన్ని ఉపయోగించండి. స్థాన అనుమతిని కలిగిన యాప్‌లు మరియు సేవలు ఈ పరికర స్థానాన్ని ఉపయోగించడానికి అనుమతించండి. Google కాలానుగుణంగా స్థాన డేటాని సేకరించవచ్చు మరియు స్థాన ఖచ్చితత్వం మరియు స్థానం-ఆధారిత సేవలను మెరుగుపరచడం కోసం ఈ డేటాని అనామకంగా ఉపయోగించవచ్చు. <ph name="BEGIN_LINK1" />మరింత తెలుసుకోండి<ph name="END_LINK1" /></translation>
<translation id="2950666755714083615">నన్ను సైన్ అప్ చేయనివ్వు</translation>
<translation id="2953019166882260872">మీ ఫోన్‌ను కేబుల్‌తో కనెక్ట్ చేయండి</translation>
-<translation id="2956070239128776395">విభాగం సమూహంలో ఉంది: <ph name="ERROR_LINE" /></translation>
+<translation id="2956070239128776395">విభాగం గ్రూప్‌లో ఉంది: <ph name="ERROR_LINE" /></translation>
<translation id="2958721676848865875">ప్యాక్ ఎక్స్‌టెన్షన్‌ హెచ్చరిక</translation>
<translation id="2959127025785722291">ఏదో తప్పు జరిగింది. స్కానింగ్ పూర్తి కాలేకపోయింది. దయచేసి మళ్లీ ప్రయత్నించండి.</translation>
<translation id="2959842337402130152">నిల్వ స్థలం లేని కారణంగా పునరుద్ధరించడం సాధ్యపడలేదు. పరికరంలో <ph name="SPACE_REQUIRED" /> స్థలం ఖాళీ చేసి, ఆపై మళ్లీ ప్రయత్నించండి.</translation>
@@ -3999,7 +3999,7 @@
<translation id="4871322859485617074">పిన్‌లో చెల్లని అక్షరాలు ఉన్నాయి</translation>
<translation id="4871370605780490696">బుక్‌మార్క్‌ను జోడించండి</translation>
<translation id="4871568871368204250">సింక్‌ని ఆఫ్ చేయి</translation>
-<translation id="4871719318659334896">సమూహాన్ని మూసివేయి</translation>
+<translation id="4871719318659334896">గ్రూప్‌ను మూసివేయి</translation>
<translation id="4873312501243535625">మీడియా ఫైల్ చెక్కర్</translation>
<translation id="4876273079589074638">క్రాష్ ఎందుకు జరిగిందన్నది తెలుసుకోవడానికి, పరిష్కరించడానికి మా ఇంజినీర్‌లకు సహాయం చేయండి. మీకు సాధ్యమైతే విషయాన్ని క్రమ పద్ధతిలో దశల వారీగా పేర్కొనండి. వివరణ ఏదీ మరీ చిన్నగా ఉండకూడదు!</translation>
<translation id="4876895919560854374">స్క్రీన్‌ను లాక్ చేయండి మరియు అన్‌లాక్ చేయండి</translation>
@@ -7410,7 +7410,7 @@
<translation id="8260864402787962391">మౌస్</translation>
<translation id="8261378640211443080">ఈ ఎక్స్‌టెన్షన్‌ <ph name="IDS_EXTENSION_WEB_STORE_TITLE" />లో లిస్ట్‌ చేయబడలేదు మరియు మీకు తెలియకుండానే జోడించబడి ఉండవచ్చు.</translation>
<translation id="8261506727792406068">తొలగించు</translation>
-<translation id="8263336784344783289">ఈ సమూహానికి పేరు పెట్టండి</translation>
+<translation id="8263336784344783289">ఈ గ్రూప్‌నకు పేరు పెట్టండి</translation>
<translation id="8263744495942430914"><ph name="FULLSCREEN_ORIGIN" /> మీ మౌస్ కర్సర్‌ను నిలిపివేసింది.</translation>
<translation id="8264024885325823677">ఈ సెట్టింగ్ మీ నిర్వాహకుడి ద్వారా నిర్వహించబడుతుంది.</translation>
<translation id="8264718194193514834"><ph name="EXTENSION_NAME" /> ఫుల్-స్క్రీన్‌ను ప్రారంభించింది.</translation>
@@ -7913,7 +7913,7 @@
<translation id="8779944680596936487">సైట్‌లు తమ సొంత సైట్‌లో మీ బ్రౌజింగ్ యాక్టివిటీని చూడటానికి మాత్రమే కుక్కీలను ఉపయోగించగలవు</translation>
<translation id="8780123805589053431">Google నుండి చిత్ర వివరణలను పొందండి</translation>
<translation id="8780443667474968681">వాయిస్ శోధన ఆపివేయబడింది.</translation>
-<translation id="8781834595282316166">సమూహంలో కొత్త ట్యాబ్</translation>
+<translation id="8781834595282316166">గ్రూప్‌లో కొత్త ట్యాబ్</translation>
<translation id="8782565991310229362">కియోస్క్ యాప్ అమలు రద్దు చేయబడింది.</translation>
<translation id="8783526165720272136">మెసేజింగ్ యాప్‌లు</translation>
<translation id="8783834180813871000">బ్లూటూత్ పెయిరింగ్ కోడ్‌ను టైప్ చేసి, ఆపై Return లేదా Enter నొక్కండి.</translation>
@@ -8363,7 +8363,7 @@
<translation id="933427034780221291">{NUM_FILES,plural, =1{భద్రతా తనిఖీ చేయడానికి వీల్లేనంతగా ఈ ఫైల్ చాలా పెద్దగా ఉంది. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}other{ఈ ఫైల్స్‌లో కొన్ని, భద్రతా తనిఖీ చేయడానికి వీల్లేనంత పెద్దగా ఉన్నాయి. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}}</translation>
<translation id="93343527085570547">చట్టపరమైన కారణాలతో కంటెంట్ మార్పులను అభ్యర్ధించడానికి <ph name="BEGIN_LINK1" />చట్టపరమైన అంశాల సహాయ పేజీ<ph name="END_LINK1" />కు వెళ్లండి. కొంత ఖాతా మరియు సిస్టమ్ సమాచారం Googleకి పంపబడవచ్చు. సాంకేతిక సమస్యల పరిష్కారానికి మరియు మా సేవలను మెరుగుపరచడానికి మీరు మాకు ఇచ్చిన సమాచారాన్ని మా <ph name="BEGIN_LINK2" />గోప్యతా విధానం<ph name="END_LINK2" /> మరియు <ph name="BEGIN_LINK3" />సేవా నిబంధనలు<ph name="END_LINK3" />కు లోబడి మేము ఉపయోగిస్తాము.</translation>
<translation id="93393615658292258">పాస్‌వర్డ్ మాత్రమే</translation>
-<translation id="934244546219308557">ఈ సమూహానికి పేరు పెట్టండి</translation>
+<translation id="934244546219308557">ఈ గ్రూప్‌నకు పేరు పెట్టండి</translation>
<translation id="934503638756687833">అవసరమైతే ఇక్కడ లిస్ట్‌ చేయబడని అంశాలను కూడా తీసివేయవచ్చు. Chrome గోప్యత విధాన డాక్యుమెంట్‌లో &lt;a href="<ph name="URL" />"&gt;అవాంఛిత సాఫ్ట్‌వేర్ రక్షణ&lt;/a&gt; గురించి మరింత తెలుసుకోండి.</translation>
<translation id="93480724622239549">బగ్ లేదా ఎర్రర్</translation>
<translation id="935854577147268200">Smart Lock ఫోన్ మారింది. Smart Lockను అప్‌డేట్ చేయడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేయండి. తదుపరిసారి, మీ ఫోన్ మీ <ph name="DEVICE_TYPE" />‌ను అన్‌లాక్ చేస్తుంది. మీరు సెట్టింగ్‌లలో Smart Lockను ఆఫ్ చేయవచ్చు</translation>
diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb
index c840b5de3ccf..7bf91bfe95da 100644
--- a/chrome/app/resources/generated_resources_vi.xtb
+++ b/chrome/app/resources/generated_resources_vi.xtb
@@ -5837,7 +5837,7 @@ Bạn có thể gán nhiều công tắc cho thao tác này.</translation>
<translation id="671619610707606484">Thao tác này sẽ xóa <ph name="TOTAL_USAGE" /> dữ liệu lưu trữ trong các trang web</translation>
<translation id="6716798148881908873">Đã mất kết nối mạng. Hãy kiểm tra kết nối mạng của bạn hoặc thử một mạng Wi-Fi khác.</translation>
<translation id="671928215901716392">Khóa màn hình</translation>
-<translation id="6721744718589119342">Có thể chúng tôi sẽ gửi email cho bạn khi có thông tin khác hoặc nội dung cập nhật</translation>
+<translation id="6721744718589119342">Chúng tôi có thể gửi email cho bạn để hỏi thêm thông tin hoặc để cập nhật thông tin cho bạn</translation>
<translation id="6721972322305477112">&amp;Tệp</translation>
<translation id="672208878794563299">Trang web này sẽ hỏi lại vào lần tới.</translation>
<translation id="6723661294526996303">Nhập dấu trang và các mục cài đặt...</translation>
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb
index ec08aaeefe97..ff870ab0ced5 100644
--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb
+++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb
@@ -215,7 +215,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి,
<translation id="2438712309510062123">సూచించండి</translation>
<translation id="2450814015951372393">చెక్‌ బాక్స్</translation>
<translation id="2461822463642141190">ప్రస్తుత</translation>
-<translation id="2462626033734746142">రేడియో బటన్ సమూహం</translation>
+<translation id="2462626033734746142">రేడియో బటన్ గ్రూప్‌</translation>
<translation id="2467741090055146971">ఎంపిక చేసిన దానిని రద్దు చేయండి</translation>
<translation id="2471138580042810658">శీర్షిక 6</translation>
<translation id="248982282205370495">{COUNT,plural, =1{నక్షత్రం గుర్తు}other{# నక్షత్రం గుర్తులు}}</translation>
@@ -290,7 +290,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి,
<translation id="2937799153569150791">తర్వాత స్థాయి 3 శీర్షిక లేదు</translation>
<translation id="2942710183375260152">ముదురు మేఘ వర్ణపు నీలం రంగు</translation>
<translation id="2943596527105977722">ముదురు బంగారు కడ్డీ రంగు</translation>
-<translation id="2964026537669811554">శీర్షిక సమూహం</translation>
+<translation id="2964026537669811554">శీర్షిక గ్రూప్‌</translation>
<translation id="2968634799764242930">సముద్రపు ఆకుపచ్చ రంగు</translation>
<translation id="296951647852255825">{COUNT,plural, =1{ట్యాబ్}other{# ట్యాబ్‌లు}}</translation>
<translation id="2972205263822847197">సాధన చిట్కా</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
index 061ad6df72d7..657f92070e7e 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
@@ -14,7 +14,7 @@
<translation id="107147699690128016">మీరు ఫైల్ ఎక్స్‌టెన్షన్‌ను మార్చితే, ఫైల్ వేరే అప్లికేషన్‌లో తెరవబడవచ్చు. అది మీ పరికరానికి హానికరంగా పరిణమించే అవకాశం ఉంటుంది.</translation>
<translation id="1089606299949659462">రివ్యూ పూర్తయింది!</translation>
<translation id="1095761715416917775">మీ సింక్ డేటాను మీరు ఎల్లప్పుడూ యాక్సెస్ చేయగలరని నిర్ధారించుకోండి</translation>
-<translation id="1100066534610197918">సమూహంలో కొత్త ట్యాబ్‌లో తెరువు</translation>
+<translation id="1100066534610197918">గ్రూప్‌లో కొత్త ట్యాబ్‌లో తెరువు</translation>
<translation id="1103142993930332957">Chromeను మెరుగుపరచుకోవడంలో సహాయపడతారా?</translation>
<translation id="1105960400813249514">స్క్రీన్ క్యాప్చర్</translation>
<translation id="1108938384783527433">హిస్టరీ సింక్</translation>
diff --git a/chromeos/strings/chromeos_strings_te.xtb b/chromeos/strings/chromeos_strings_te.xtb
index 55063e9f7f4f..590de1511a1c 100644
--- a/chromeos/strings/chromeos_strings_te.xtb
+++ b/chromeos/strings/chromeos_strings_te.xtb
@@ -362,7 +362,7 @@
<translation id="5019310272469539976">మీ స్క్రీన్ ఇన్‌యాక్టివ్‌గా ఉన్నప్పుడు, ఫోటోలు, సమయం, వాతావరణం, మీడియా సమాచారాన్ని చూపిస్తుంది.</translation>
<translation id="5039804452771397117">అనుమతించు</translation>
<translation id="5049856988445523908">SIM లాక్ చేయబడింది (<ph name="LOCK_TYPE" />)</translation>
-<translation id="5050042263972837708">సమూహం పేరు</translation>
+<translation id="5050042263972837708">గ్రూప్‌ పేరు</translation>
<translation id="5051044138948155788">ఈ పేజీ మాత్రమే ఉంది. ఇది మిమ్మల్ని స్కానింగ్ ప్రారంభ స్క్రీన్‌కు తీసుకువెళ్తుంది.</translation>
<translation id="5088172560898466307">సర్వర్ హోస్ట్ పేరు</translation>
<translation id="5089810972385038852">రాష్ట్రం</translation>
diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb
index e9d671b9971b..6e5c5880f302 100644
--- a/components/strings/components_strings_fa.xtb
+++ b/components/strings/components_strings_fa.xtb
@@ -147,7 +147,7 @@
<ph name="END_LIST" /></translation>
<translation id="1337692097987160377">هم‌رسانی این برگه</translation>
<translation id="1339601241726513588">دامنه ثبت‌نام:</translation>
-<translation id="1340482604681802745">نشانی تحویل گرفتن کالا</translation>
+<translation id="1340482604681802745">نشانی تحویل گرفتن</translation>
<translation id="1346748346194534595">راست</translation>
<translation id="1348198688976932919">سایت پیش‌رو حاوی برنامه‌های خطرناک است</translation>
<translation id="1348779747280417563">تأیید نام</translation>
@@ -207,7 +207,7 @@
<translation id="1476595624592550506">گذرواژه‌تان را تغییر دهید</translation>
<translation id="1482879811280872320">دوچرخه‌سواری</translation>
<translation id="1483493594462132177">ارسال</translation>
-<translation id="1484290072879560759">انتخاب نشانی تحویل کالا</translation>
+<translation id="1484290072879560759">انتخاب نشانی ارسال کالا</translation>
<translation id="1492194039220927094">اعمال خط‌مشی‌ها:</translation>
<translation id="149293076951187737">‏وقتی همه برگه‌های ناشناس Chrome را ببندید، فعالیتتان در این برگه‌ها از دستگاهتان پاک می‌شود:
<ph name="BEGIN_LIST" />
@@ -236,7 +236,7 @@
<translation id="153384715582417236">درحال‌حاضر مورد دیگری وجود ندارد</translation>
<translation id="1536390784834419204">ترجمه صفحه</translation>
<translation id="1539840569003678498">گزارش ارسال شد:</translation>
-<translation id="154408704832528245">انتخاب نشانی ارسال</translation>
+<translation id="154408704832528245">انتخاب نشانی تحویل کالا</translation>
<translation id="1549470594296187301">برای استفاده از این قابلیت، جاوا اسکریپت باید فعال باشد.</translation>
<translation id="155039086686388498">Engineering-D</translation>
<translation id="1551884710160394169">نرم‌افزار رایگان و اشتراکی</translation>
@@ -674,7 +674,7 @@
<translation id="2728127805433021124">گواهی سرور با استفاده از یک الگوریتم امضای ضعیف امضا شده است.</translation>
<translation id="2730326759066348565"><ph name="BEGIN_LINK" />در حال اجرای عیب‌یابی اتصال<ph name="END_LINK" /></translation>
<translation id="2730600605555029057">موسیقی کلاسیک</translation>
-<translation id="2738330467931008676">انتخاب نشانی تحویل گرفتن</translation>
+<translation id="2738330467931008676">انتخاب نشانی تحویل کالا</translation>
<translation id="2740531572673183784">تأیید</translation>
<translation id="2742511345840685325">تنیس روی میز</translation>
<translation id="2742870351467570537">حذف موارد انتخابی</translation>
@@ -894,10 +894,10 @@
<translation id="3381668585148405088">به تأیید رساندن خرید</translation>
<translation id="3383566085871012386">ترتیب اولویت کنونی</translation>
<translation id="3387261909427947069">روش‌های پرداخت</translation>
-<translation id="3391030046425686457">نشانی ارسال</translation>
+<translation id="3391030046425686457">نشانی تحویل کالا</translation>
<translation id="3391482648489541560">ویرایش فایل</translation>
<translation id="3395827396354264108">روش تحویل گرفتن</translation>
-<translation id="3399952811970034796">نشانی ارسال</translation>
+<translation id="3399952811970034796">نشانی تحویل کالا</translation>
<translation id="3402261774528610252">اتصال استفاده‌شده برای بار کردن این سایت از «امنیت لایه انتقال» نسخه ۱.۰ یا ۱.۱ استفاده می‌کرد که منسوخ شده است و در آینده غیرفعال خواهد شد. بعد از غیرفعال شدن، کاربران نمی‌توانند این سایت را بار کنند. سرور باید «امنیت لایه انتقال» نسخه ۱.۲ یا بالاتر را فعال کند.</translation>
<translation id="3405664148539009465">سفارشی کردن قلم‌ها</translation>
<translation id="3409896703495473338">مدیریت تنظیمات امنیتی</translation>
@@ -1566,7 +1566,7 @@
<translation id="5222812217790122047">ایمیل ضروری است</translation>
<translation id="5228404122310299359">لوازم مهمانی و تعطیلات</translation>
<translation id="5229588705416009823">بازی چندنفره گسترده</translation>
-<translation id="5230733896359313003">نشانی تحویل کالا</translation>
+<translation id="5230733896359313003">نشانی ارسال کالا</translation>
<translation id="5230815978613972521">B8</translation>
<translation id="5233045608889518621">12x19</translation>
<translation id="5234764350956374838">رد کردن</translation>
@@ -1727,7 +1727,7 @@
<translation id="568292603005599551">‏موقعیت X تصویر</translation>
<translation id="5684277895745049190">فهرست</translation>
<translation id="5684874026226664614">متأسفیم. این صفحه ترجمه نشد.</translation>
-<translation id="5685654322157854305">افزودن نشانی تحویل کالا</translation>
+<translation id="5685654322157854305">افزودن نشانی ارسال کالا</translation>
<translation id="5689199277474810259">‏صادر کردن به JSON</translation>
<translation id="5689516760719285838">مکان</translation>
<translation id="569000877158168851">‏مقدار DnsOverHttpsTemplates مرتبط نیست و استفاده نخواهد شد، مگراینکه خط‌مشی DnsOverHttpsMode روی <ph name="SECURE_DNS_MODE_AUTOMATIC" /> یا<ph name="SECURE_DNS_MODE_SECURE" /> تنظیم شده باشد.</translation>
@@ -2860,7 +2860,7 @@
<translation id="8963213021028234748"><ph name="MARKUP_1" />پیشنهادات:<ph name="MARKUP_2" />مطمئن شوید اتصال داده دارید<ph name="MARKUP_3" />بعداً این صفحه وب را تازه‌سازی کنید<ph name="MARKUP_4" />آدرسی را که وارد کرده‌اید، بررسی کنید<ph name="MARKUP_5" /></translation>
<translation id="8968766641738584599">ذخیره کارت</translation>
<translation id="8971063699422889582">گواهی سرور منقضی شده است.</translation>
-<translation id="8975012916872825179">شامل اطلاعاتی مانند شماره تلفن، نشانی ایمیل و نشانی تحویل کالا می‌شود</translation>
+<translation id="8975012916872825179">شامل اطلاعاتی مانند شماره تلفن، نشانی ایمیل، و نشانی تحویل کالا می‌شود</translation>
<translation id="8975263830901772334">نام فایل‌هایی که چاپ می‌کنید</translation>
<translation id="8978053250194585037">Google Safe Browsing اخیراً در <ph name="SITE" />، <ph name="BEGIN_LINK" />رمزگیری شناسایی کرده است<ph name="END_LINK" />. سایت‌های رمزگیری وانمود می‌کنند وب‌سایت‌های دیگری هستند تا شما را فریب دهند.</translation>
<translation id="8983369100812962543">اکنون می‌توانید برنامه را تغییر اندازه دهید</translation>
@@ -2977,7 +2977,7 @@
<translation id="962484866189421427">این محتوا ممکن است برنامه‌های فریب‌دهنده‌ای نصب کند که وانمود می‌کنند برنامه دیگری هستند یا اینکه داده‌هایی برای ردیابی شما جمع‌آوری می‌کنند. <ph name="BEGIN_LINK" />درهرصورت نشان داده شود<ph name="END_LINK" /></translation>
<translation id="96680173638229310">خودرو و وسیله نقلیه</translation>
<translation id="969892804517981540">ساخت رسمی</translation>
-<translation id="973773823069644502">افزودن نشانی ارسال</translation>
+<translation id="973773823069644502">افزودن نشانی تحویل کالا</translation>
<translation id="975560348586398090">{COUNT,plural, =0{هیچ‌کدام}=1{۱ مورد}one{# مورد}other{# مورد}}</translation>
<translation id="977502174772294970">مراسم ازدواج</translation>
<translation id="981121421437150478">آفلاین</translation>
diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb
index a7175812f17b..4c6638f9b39e 100644
--- a/components/strings/components_strings_te.xtb
+++ b/components/strings/components_strings_te.xtb
@@ -939,7 +939,7 @@
<ph name="PAGE_TITLE" /></translation>
<translation id="350069200438440499">ఫైల్ పేరు:</translation>
<translation id="3507936815618196901">మీ పరిసరాల 3D మ్యాప్‌ను రూపొందించడం, అలాగే కెమెరా పొజిషన్‌ను ట్రాక్ చేయడం</translation>
-<translation id="3512163584740124171">ఈ విధానం విస్మరించబడుతుంది, ఎందుకంటే ఒకే విధాన సమూహం నుండి మరొక విధానం అధిక ప్రాధాన్యతను కలిగి ఉంది.</translation>
+<translation id="3512163584740124171">ఈ విధానం విస్మరించబడుతుంది, ఎందుకంటే ఒకే విధాన గ్రూప్‌ నుండి మరొక విధానం అధిక ప్రాధాన్యతను కలిగి ఉంది.</translation>
<translation id="35172538073169599">'అడ్రస్‌లను మేనేజ్ చేయి' బటన్, Chrome సెట్టింగ్‌లలో అడ్రస్‌లను జోడించడానికి, మేనేజ్ చేయడానికి 'Enter'ను నొక్కండి</translation>
<translation id="3518941727116570328">అనేక వస్తువులను హ్యాండిల్ చేయడం</translation>
<translation id="3528171143076753409">సర్వర్ ప్రమాణపత్రం విశ్వసనీయమైనది కాదు.</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
index e0509bfd580b..6b5724474994 100644
--- a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
@@ -810,7 +810,7 @@
<translation id="7884694604461143138">在歷史記錄中搜尋 (找到 <ph name="COUNT" /> 項結果)</translation>
<translation id="7887198238286927132">為保護個人隱私Chrome 不會自動填入這個欄位。</translation>
<translation id="7911190106180361398">貴機構不允許你同步處理任何內容。</translation>
-<translation id="7920949005883349320">隱私權與安全性</translation>
+<translation id="7920949005883349320">隱私權和安全性</translation>
<translation id="7930998711684428189">可在密碼因資料侵害事件遭到外洩時顯示警告訊息。</translation>
<translation id="7938254975914653459">FaceTime</translation>
<translation id="7939128259257418052">匯出密碼...</translation>
diff --git a/ui/strings/translations/ax_strings_te.xtb b/ui/strings/translations/ax_strings_te.xtb
index 47c420b52d37..7437716cbb08 100644
--- a/ui/strings/translations/ax_strings_te.xtb
+++ b/ui/strings/translations/ax_strings_te.xtb
@@ -30,7 +30,7 @@
<translation id="2723001399770238859">ఆడియో</translation>
<translation id="2759744352195237655">పాప్ అప్ బటన్</translation>
<translation id="2844350028562914727">వివరాలు</translation>
-<translation id="2896972712917208084">రేడియో సమూహం</translation>
+<translation id="2896972712917208084">రేడియో గ్రూప్‌</translation>
<translation id="2931838996092594335">క్లిక్ చేయి</translation>
<translation id="2940813599313844715">ఆబ్జెక్ట్</translation>
<translation id="3040011195152428237">లింక్</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From e880c117e7d30009b1af32aa904a97a53a024580 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Fri, 17 Jun 2022 01:00:31 +0000
Subject: [PATCH 20/59] Incrementing VERSION to 102.0.5005.132
Change-Id: I305193c6abec7d1b6ad767f428e8ce1b232eef29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707777
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1179}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 31f19120d007..5fded03cba08 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=131
+PATCH=132
--
2.37.0

View File

@ -0,0 +1,212 @@
From cbe831f390de4ea05fcc3ec65a0716a7fe0a8883 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Fri, 17 Jun 2022 18:09:59 +0000
Subject: [PATCH 21/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: Ia1e4b034fbf40ae02d641e01ec1393a58b68a20a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3710835
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#1180}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/generated_resources_bs.xtb | 8 ++++----
chrome/app/resources/generated_resources_te.xtb | 4 ++--
chrome/app/resources/generated_resources_vi.xtb | 2 +-
chrome/app/resources/google_chrome_strings_gl.xtb | 2 +-
chrome/app/resources/google_chrome_strings_vi.xtb | 4 ++--
components/strings/components_strings_da.xtb | 2 +-
.../strings/resources/ios_share_extension_strings_hi.xtb | 2 +-
.../resources/ios_widget_kit_extension_strings_te.xtb | 2 +-
remoting/resources/remoting_strings_te.xtb | 2 +-
ui/chromeos/translations/ui_chromeos_strings_fi.xtb | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb
index 7234e04492b8..fe27694bd420 100644
--- a/chrome/app/resources/generated_resources_bs.xtb
+++ b/chrome/app/resources/generated_resources_bs.xtb
@@ -517,7 +517,7 @@ Odobrenja koja ste već dali aplikacijama se mogu primjenjivati na ovaj račun.
<translation id="1506061864768559482">Pretraživač</translation>
<translation id="1507170440449692343">Ovoj stranici je blokiran pristup vašoj kameri.</translation>
<translation id="1507246803636407672">&amp;Odbaci</translation>
-<translation id="1507884455975553832">Prenosite aplikacije za slanje poruka</translation>
+<translation id="1507884455975553832">Prenosite aplikacije za razmjenu poruka</translation>
<translation id="1509163368529404530">&amp;Vrati grupu</translation>
<translation id="1509281256533087115">Pristupiti bilo kojem uređaju <ph name="DEVICE_NAME_AND_VENDOR" /> putem USB-a</translation>
<translation id="1510238584712386396">Pokretač</translation>
@@ -724,7 +724,7 @@ da li proksi server funkcionira. Ako smatrate da ne trebate koristiti
<translation id="1682548588986054654">&amp;Novi anoniman prozor</translation>
<translation id="1682867089915960590">Uključiti navigaciju kursorom?</translation>
<translation id="1684279041537802716">Boja za isticanje</translation>
-<translation id="168511795252678620">Nedavne fotografije i aplikacije za slanje poruka</translation>
+<translation id="168511795252678620">Nedavne fotografije i aplikacije za razmjenu poruka</translation>
<translation id="1686550358074589746">Omogući pisanje klizanjem prstom</translation>
<translation id="168715261339224929">Da biste imali svoje oznake na svim svojim uređajima, uključite sinhronizaciju.</translation>
<translation id="1688867105868176567">Obrisati podatke web lokacije?</translation>
@@ -6276,7 +6276,7 @@ Domena <ph name="DOMAIN" /> zahtijeva da pametna kartica ostane umetnuta.</trans
<translation id="7152478047064750137">Za ovu ekstenziju nisu potrebna posebna odobrenja</translation>
<translation id="7154130902455071009">Promijenite početnu stranicu na: <ph name="START_PAGE" /></translation>
<translation id="7155171745945906037">Postojeća fotografija sa kamere ili fajl</translation>
-<translation id="7155352398126583949">Obavještenja i aplikacije za slanje poruka</translation>
+<translation id="7155352398126583949">Obavještenja i aplikacije za razmjenu poruka</translation>
<translation id="7163202347044721291">Potvrđivanje koda za aktivaciju...</translation>
<translation id="716640248772308851">Ekstenzija "<ph name="EXTENSION" />" može čitati fajlove za slike, videozapise i zvuk u označenim lokacijama.</translation>
<translation id="7167486101654761064">&amp;Uvijek otvori ovu vrstu datoteka</translation>
@@ -7585,7 +7585,7 @@ Fajl ključa: <ph name="KEY_FILE" />
<translation id="8439506636278576865">Ponudi prijevod stranica na ovom jeziku</translation>
<translation id="8440630305826533614">Linux aplikacije</translation>
<translation id="8443795068008423036">Provjerite je li uređaj ažuriran i pokušajte ponovo</translation>
-<translation id="8445046761938045900">Nedavne fotografije, obavještenja i aplikacije za slanje poruka</translation>
+<translation id="8445046761938045900">Nedavne fotografije, obavještenja i aplikacije za razmjenu poruka</translation>
<translation id="8446884382197647889">Saznajte više</translation>
<translation id="8447409163267621480">Uključite Ctrl ili Alt</translation>
<translation id="844850004779619592">Nisu pronađene komande</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index 20010cb9bef6..8e1f07c5d7d1 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -5950,7 +5950,7 @@
<translation id="6828182567531805778">మీ డేటాను సింక్ చేయడానికి మీ రహస్య పదబంధాన్ని నమోదు చేయండి</translation>
<translation id="682871081149631693">QuickFix</translation>
<translation id="6828860976882136098">వినియోగదారులందరి కోసం ఆటోమేటిక్ అప్‌డేట్‌లను సెటప్ చేయడం విఫలమైంది (ప్రీఫ్లయిట్ అమలు ఎర్రర్: <ph name="ERROR_NUMBER" />)</translation>
-<translation id="682971198310367122">Google గోప్యతా విధానం</translation>
+<translation id="682971198310367122">Google గోప్యతా పాలసీ</translation>
<translation id="6831043979455480757">అనువదించు</translation>
<translation id="6833479554815567477">గ్రూప్ నుండి ట్యాబ్ తొలగించబడింది <ph name="GROUP_NAME" /> - <ph name="GROUP_CONTENTS" /></translation>
<translation id="683373380308365518">స్మార్ట్ మరియు సురక్షిత బ్రౌజర్‌కు మారండి</translation>
@@ -8361,7 +8361,7 @@
<translation id="932327136139879170">హోమ్</translation>
<translation id="932508678520956232">ముద్రించడాన్ని ప్రారంభించడం సాధ్యం కాలేదు.</translation>
<translation id="933427034780221291">{NUM_FILES,plural, =1{భద్రతా తనిఖీ చేయడానికి వీల్లేనంతగా ఈ ఫైల్ చాలా పెద్దగా ఉంది. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}other{ఈ ఫైల్స్‌లో కొన్ని, భద్రతా తనిఖీ చేయడానికి వీల్లేనంత పెద్దగా ఉన్నాయి. మీరు గరిష్ఠంగా 50 MB వరకు ఉండే ఫైల్స్‌ను అప్‌లోడ్ చేయగలరు.}}</translation>
-<translation id="93343527085570547">చట్టపరమైన కారణాలతో కంటెంట్ మార్పులను అభ్యర్ధించడానికి <ph name="BEGIN_LINK1" />చట్టపరమైన అంశాల సహాయ పేజీ<ph name="END_LINK1" />కు వెళ్లండి. కొంత ఖాతా మరియు సిస్టమ్ సమాచారం Googleకి పంపబడవచ్చు. సాంకేతిక సమస్యల పరిష్కారానికి మరియు మా సేవలను మెరుగుపరచడానికి మీరు మాకు ఇచ్చిన సమాచారాన్ని మా <ph name="BEGIN_LINK2" />గోప్యతా విధానం<ph name="END_LINK2" /> మరియు <ph name="BEGIN_LINK3" />సేవా నిబంధనలు<ph name="END_LINK3" />కు లోబడి మేము ఉపయోగిస్తాము.</translation>
+<translation id="93343527085570547">చట్టపరమైన కారణాలతో కంటెంట్ మార్పులను అభ్యర్ధించడానికి <ph name="BEGIN_LINK1" />చట్టపరమైన అంశాల సహాయ పేజీ<ph name="END_LINK1" />కు వెళ్లండి. కొంత ఖాతా మరియు సిస్టమ్ సమాచారం Googleకి పంపబడవచ్చు. సాంకేతిక సమస్యల పరిష్కారానికి మరియు మా సేవలను మెరుగుపరచడానికి మీరు మాకు ఇచ్చిన సమాచారాన్ని మా <ph name="BEGIN_LINK2" />గోప్యతా పాలసీ<ph name="END_LINK2" /> మరియు <ph name="BEGIN_LINK3" />సేవా నిబంధనలు<ph name="END_LINK3" />కు లోబడి మేము ఉపయోగిస్తాము.</translation>
<translation id="93393615658292258">పాస్‌వర్డ్ మాత్రమే</translation>
<translation id="934244546219308557">ఈ గ్రూప్‌నకు పేరు పెట్టండి</translation>
<translation id="934503638756687833">అవసరమైతే ఇక్కడ లిస్ట్‌ చేయబడని అంశాలను కూడా తీసివేయవచ్చు. Chrome గోప్యత విధాన డాక్యుమెంట్‌లో &lt;a href="<ph name="URL" />"&gt;అవాంఛిత సాఫ్ట్‌వేర్ రక్షణ&lt;/a&gt; గురించి మరింత తెలుసుకోండి.</translation>
diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb
index 7bf91bfe95da..fa4aee89f515 100644
--- a/chrome/app/resources/generated_resources_vi.xtb
+++ b/chrome/app/resources/generated_resources_vi.xtb
@@ -6840,7 +6840,7 @@ Bạn có thể gán nhiều công tắc cho thao tác này.</translation>
<translation id="7716781361494605745">URL chính sách của tổ chức phát hành chứng chỉ Netscape</translation>
<translation id="7717014941119698257">Đang tải xuống: <ph name="STATUS" /></translation>
<translation id="771721654176725387">Thao tác này sẽ xóa vĩnh viễn dữ liệu duyệt web của bạn khỏi thiết bị này. Để khôi phục dữ liệu, hãy bật tùy chọn đồng bộ hóa cho địa chỉ email</translation>
-<translation id="7717845620320228976">Kiểm tra bản cập nhật</translation>
+<translation id="7717845620320228976">Kiểm tra để tìm bản cập nhật</translation>
<translation id="7719367874908701697">Thu phóng trang</translation>
<translation id="7719588063158526969">Tên thiết bị quá dài</translation>
<translation id="7720216670798402294">Đọc thông tin thiết bị và dữ liệu thiết bị ChromeOS.</translation>
diff --git a/chrome/app/resources/google_chrome_strings_gl.xtb b/chrome/app/resources/google_chrome_strings_gl.xtb
index 692445beff89..c6a9a7939c31 100644
--- a/chrome/app/resources/google_chrome_strings_gl.xtb
+++ b/chrome/app/resources/google_chrome_strings_gl.xtb
@@ -22,7 +22,7 @@
<translation id="137466361146087520">Google Chrome Beta</translation>
<translation id="1399397803214730675">Este ordenador ten instalada unha versión máis recente de Google Chrome. Se o software non funciona, desinstala Google Chrome e téntao de novo.</translation>
<translation id="139993653570221430">Se cambias de idea, podes modificar a configuración de Chrome en calquera momento. Con todo, as probas inscríbense na experiencia actual de publicación de anuncios, polo que non verás cambios de inmediato.</translation>
-<translation id="1434626383986940139">Aplicacións de valores controlados de Chrome</translation>
+<translation id="1434626383986940139">Aplicacións de Chrome Canary</translation>
<translation id="1507198376417198979">Personaliza o teu novo perfil de Chrome</translation>
<translation id="1516530951338665275">Google Chrome precisa acceso mediante Bluetooth para continuar coa vinculación. <ph name="IDS_BLUETOOTH_DEVICE_CHOOSER_AUTHORIZE_BLUETOOTH_LINK" /></translation>
<translation id="1547295885616600893">Chrome OS é posible grazas a <ph name="BEGIN_LINK_CROS_OSS" />software de código aberto<ph name="END_LINK_CROS_OSS" /> adicional.</translation>
diff --git a/chrome/app/resources/google_chrome_strings_vi.xtb b/chrome/app/resources/google_chrome_strings_vi.xtb
index 2fcf6338de07..5b286f0d9831 100644
--- a/chrome/app/resources/google_chrome_strings_vi.xtb
+++ b/chrome/app/resources/google_chrome_strings_vi.xtb
@@ -9,7 +9,7 @@
<translation id="110877069173485804">Đây là Chrome của bạn</translation>
<translation id="1125124144982679672">Ai đang sử dụng Chrome?</translation>
<translation id="1142745911746664600">Không thể cập nhật Chrome</translation>
-<translation id="1152920704813762236">Giới thiệu về Chrome OS</translation>
+<translation id="1152920704813762236">Giới thiệu về ChromeOS</translation>
<translation id="1154147086299354128">&amp;Mở trong Chrome</translation>
<translation id="1178374936842835197">Nếu bạn không thấy một chế độ cài đặt nào đó trên trang này, hãy xem phần <ph name="LINK_BEGIN" />Cài đặt ChromeOS Flex<ph name="LINK_END" /></translation>
<translation id="1182414570724401860">Chrome khuyên bạn không nên mở hoặc tải tệp này xuống</translation>
@@ -141,7 +141,7 @@
<translation id="3744202345691150878">Nhận trợ giúp về ChromeOS</translation>
<translation id="3780814664026482060">Chrome - <ph name="PAGE_TITLE" /></translation>
<translation id="3785324443014631273">ChromeOS Flex không đồng bộ hoá được dữ liệu của bạn do xảy ra lỗi khi đăng nhập.</translation>
-<translation id="3795971588916395511">Google ChromeOS</translation>
+<translation id="3795971588916395511">Google Chrome OS</translation>
<translation id="3835168907083856002">Thao tác này sẽ tạo một hồ sơ mới trên Chrome cho <ph name="USER_EMAIL_ADDRESS" /></translation>
<translation id="386202838227397562">Vui lòng đóng tất cả cửa sổ của Google Chrome và thử lại.</translation>
<translation id="3865754807470779944">Bạn đã cài đặt Chrome phiên bản <ph name="PRODUCT_VERSION" /></translation>
diff --git a/components/strings/components_strings_da.xtb b/components/strings/components_strings_da.xtb
index ba52e56898db..9756551c5981 100644
--- a/components/strings/components_strings_da.xtb
+++ b/components/strings/components_strings_da.xtb
@@ -2064,7 +2064,7 @@ Ellers vil det blive blokeret af dine privatlivsindstillinger. Det giver det ind
<translation id="6694681292321232194"><ph name="FIND_MY_PHONE_FOCUSED_FRIENDLY_MATCH_TEXT" /> tryk på Tab-tasten og derefter Enter for at finde din enhed på Google-kontoen</translation>
<translation id="6696588630955820014">Knappen "Del denne fane" tryk på Enter for at dele denne fane ved at dele linket, oprette en QR-kode, caste m.m.</translation>
<translation id="6698381487523150993">Oprettet:</translation>
-<translation id="6702919718839027939">Nutid</translation>
+<translation id="6702919718839027939">Præsenter</translation>
<translation id="6709133671862442373">Nyheder</translation>
<translation id="6709888928011386878">Musikinstrumenter</translation>
<translation id="6710213216561001401">Forrige</translation>
diff --git a/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb b/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb
index afcb2bc08a1a..d6928a5f14e1 100644
--- a/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb
+++ b/ios/chrome/share_extension/strings/resources/ios_share_extension_strings_hi.xtb
@@ -3,7 +3,7 @@
<translationbundle lang="hi">
<translation id="1613742542373525524">APPLICATION_NAME यह लिंक संसाधित नहीं कर सकता.</translation>
<translation id="4655616150233109325">Chrome में खोलें</translation>
-<translation id="601731541915429022">पठन सूची में जोड़ें</translation>
+<translation id="601731541915429022">रीडिंग लिस्ट में जोड़ें</translation>
<translation id="6930009216791986919">बुकमार्क में जोड़ें</translation>
<translation id="6965382102122355670">ठीक है</translation>
<translation id="8258999165172757081">जोड़ा गया</translation>
diff --git a/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb b/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb
index ab3f5b7da36e..ec5e2ffc324a 100644
--- a/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb
+++ b/ios/chrome/widget_kit_extension/strings/resources/ios_widget_kit_extension_strings_te.xtb
@@ -11,7 +11,7 @@
<translation id="529497070985873480">Chrome డినో</translation>
<translation id="5683557219437283801">వాయిస్ సెర్చ్</translation>
<translation id="6179961764474023795">త్వరిత చర్యలు</translation>
-<translation id="6855322554930231468">సెర్చ్</translation>
+<translation id="6855322554930231468">Search</translation>
<translation id="7048549665319929185">సెర్చ్ చేయండి లేదా
URLను టైప్ చేయండి</translation>
<translation id="7317302007099170473">QR కోడ్‌ను స్కాన్ చేయండి</translation>
diff --git a/remoting/resources/remoting_strings_te.xtb b/remoting/resources/remoting_strings_te.xtb
index a0b9bb7529fd..e7a20200384d 100644
--- a/remoting/resources/remoting_strings_te.xtb
+++ b/remoting/resources/remoting_strings_te.xtb
@@ -183,7 +183,7 @@
<translation id="858006550102277544">కామెంట్ చేయండి</translation>
<translation id="8743328882720071828">మీరు మీ కంప్యూటర్‌ను చూడటానికి, నియంత్రించడానికి <ph name="CLIENT_USERNAME" />ను అనుమతించదలిచారా?</translation>
<translation id="8747048596626351634">సెషన్ క్రాష్ అయింది లేదా ప్రారంభించడంలో విఫలమైంది. రిమోట్ కంప్యూటర్‍‌లో ~/.chrome-remote-desktop-session ఉన్నట్లయితే, ఇది ముందుభాగంలో దీర్ఘకాలం అమలయ్యే డెస్క్‌టాప్ ఎన్విరాన్మెంట్ లేదా విండో మేనేజర్ వంటి ప్రక్రియలను ప్రారంభిస్తుందని నిర్ధారించుకోండి.</translation>
-<translation id="8804164990146287819">గోప్యతా విధానం</translation>
+<translation id="8804164990146287819">గోప్యతా పాలసీ</translation>
<translation id="8906511416443321782">ఆడియోను క్యాప్చర్ చేసి, Chrome రిమోట్ డెస్క్‌టాప్ క్లయింట్‌లో స్ట్రీమ్ చేయడానికి మైక్రోఫోన్ యాక్సెస్ అవసరం.</translation>
<translation id="9111855907838866522">మీరు మీ రిమోట్ పరికరానికి కనెక్ట్ అయ్యారు. మెనూను తెరవడానికి, దయచేసి నాలుగు వేళ్లతో స్క్రీన్‌పై నొక్కండి.</translation>
<translation id="9126115402994542723">మరోసారి ఈ పరికరం నుండి ఈ హోస్ట్‌కు కనెక్ట్ చేస్తున్నప్పుడు PINను అడగవద్దు.</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_fi.xtb b/ui/chromeos/translations/ui_chromeos_strings_fi.xtb
index 6254446547d3..364331d04f8d 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_fi.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_fi.xtb
@@ -347,7 +347,7 @@
<translation id="3958548648197196644">Kiivi</translation>
<translation id="3966388904776714213">Äänisoitin</translation>
<translation id="3971140002794351170">Lataa mobiiliprofiili, verkko <ph name="NETWORK_INDEX" />/<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="NETWORK_PROVIDER_NAME" /></translation>
-<translation id="3973925058222872294">englanti (Iso-Britannia)</translation>
+<translation id="3973925058222872294">englanti (Yhdistynyt kuningaskunta)</translation>
<translation id="3975895378829046965">foneettinen bangla</translation>
<translation id="4002066346123236978">Nimi</translation>
<translation id="4017788180641807848">englanti (Yhdysvallat), Workman-näppäimistö</translation>
@@ -838,7 +838,7 @@
<translation id="8087576439476816834">Lataa, <ph name="PROFILE_NAME" /></translation>
<translation id="8106045200081704138">Jaettu minulle</translation>
<translation id="8116072619078571545">Jäävesi</translation>
-<translation id="8128733386027980860">englanti (Iso-Britannia), Dvorak-näppäimistö</translation>
+<translation id="8128733386027980860">englanti (Yhdistynyt kuningaskunta), Dvorak-näppäimistö</translation>
<translation id="8137331602592933310"><ph name="FILENAME" /> on jaettu sinulle. Et voi poistaa sitä, koska et ole tiedoston omistaja.</translation>
<translation id="813913629614996137">Käynnistetään…</translation>
<translation id="8151638057146502721">Määritä</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From e669776aaff0500402deff6cc913bd9da8c625f9 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sat, 18 Jun 2022 01:00:34 +0000
Subject: [PATCH 22/59] Incrementing VERSION to 102.0.5005.133
Change-Id: Ie8378adafa00bb27c17be361f3d0874d0e14781a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708486
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1181}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 5fded03cba08..a5342e3d2eec 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=132
+PATCH=133
--
2.37.0

View File

@ -0,0 +1,28 @@
From ed5754b4c3d57efb6431210105b09243c39873a5 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sun, 19 Jun 2022 01:00:33 +0000
Subject: [PATCH 23/59] Incrementing VERSION to 102.0.5005.134
Change-Id: I084efc295ca7a75c3a03e7095b0740e89d55018f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708489
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1182}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index a5342e3d2eec..fbc5358205d1 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=133
+PATCH=134
--
2.37.0

View File

@ -0,0 +1,41 @@
From 2f6ab4ecaef3d22e0f7c821d6b17991c7cf45ab8 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Sun, 19 Jun 2022 14:31:30 +0000
Subject: [PATCH 24/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I7ae4bba78ca7e8c92621ed59d5f577e62d2c3e8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3710701
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1183}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
components/strings/components_strings_ky.xtb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/strings/components_strings_ky.xtb b/components/strings/components_strings_ky.xtb
index a82d704e80b6..7f2feae5c2fe 100644
--- a/components/strings/components_strings_ky.xtb
+++ b/components/strings/components_strings_ky.xtb
@@ -1245,7 +1245,7 @@
<translation id="4349365535725594680">Купуя мазмун бөлүшүлбөй жатат</translation>
<translation id="4350629523305688469">Көп функционалдуу түпкүч</translation>
<translation id="4351060348582610152"><ph name="ORIGIN" /> сайты жакын жердеги Bluetooth түзмөктөрүн скандаганы жатат. Төмөнкү түзмөктөр табылды:</translation>
-<translation id="4351175281479794167">Текшерүү кодун киргизиңиз</translation>
+<translation id="4351175281479794167">Ырастоо кодун киргизиңиз</translation>
<translation id="4356973930735388585">Бул сайттагы бүлдүргүчтөр түзмөгүңүздөгү маалыматыңызды (мисалы, сүрөттөр, сырсөздөр, билдирүүлөр жана насыя карталары) уурдап же жок кыла турган коркунучтуу программаларды орнотууга аракет кылышы мүмкүн.</translation>
<translation id="4358059973562876591">Сиз көрсөткөн үлгүлөрдү колдонууга болбойт, анткени DnsOverHttpsMode саясатында ката кетти.</translation>
<translation id="4358461427845829800">Төлөм ыкмаларын башкаруу...</translation>
@@ -2778,7 +2778,7 @@
<translation id="8718314106902482036">Төлөм аягына чыккан жок</translation>
<translation id="8719263113926255150"><ph name="ENTITY" />, <ph name="DESCRIPTION" />, издөө сунушу</translation>
<translation id="8719528812645237045">Муштум менен өйдө жакка эки жолу уруу</translation>
-<translation id="8723535127346307411">Текшерүү кодун киргизиңиз</translation>
+<translation id="8723535127346307411">Ырастоо кодун киргизиңиз</translation>
<translation id="8725066075913043281">Кайра аракет кылып көрүү</translation>
<translation id="8726549941689275341">Барактын өлчөмү:</translation>
<translation id="8730621377337864115">Бүттү</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 57fb37eeee77178901e6c5b2377234785f586dbf Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Mon, 20 Jun 2022 01:00:49 +0000
Subject: [PATCH 25/59] Incrementing VERSION to 102.0.5005.135
Change-Id: Ifd8eb9c59904953d7b533ff4fd6d9a17789ca5dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707948
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1184}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index fbc5358205d1..308402a8004d 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=134
+PATCH=135
--
2.37.0

View File

@ -0,0 +1,262 @@
From b0cf7f5fab707c0208ad880dfdbee932dac4b335 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Mon, 20 Jun 2022 14:24:51 +0000
Subject: [PATCH 26/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I41d7abb1adc3a2eaa1066f814b8899076a14f1ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714549
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1185}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../strings/shortcut_viewer_strings_no.xtb | 2 +-
chrome/app/resources/chromium_strings_no.xtb | 2 +-
chrome/app/resources/generated_resources_it.xtb | 2 +-
chrome/app/resources/generated_resources_iw.xtb | 4 ++--
chrome/app/resources/generated_resources_no.xtb | 10 +++++-----
chrome/app/resources/google_chrome_strings_no.xtb | 2 +-
.../accessibility/strings/accessibility_strings_fa.xtb | 2 +-
.../strings/translations/android_chrome_strings_no.xtb | 4 ++--
components/strings/components_strings_no.xtb | 10 +++++-----
ios/chrome/app/strings/resources/ios_strings_no.xtb | 2 +-
ui/strings/translations/ui_strings_fa.xtb | 2 +-
11 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb
index 60814b0c8b29..bee3a3cdbcf7 100644
--- a/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb
+++ b/ash/shortcut_viewer/strings/shortcut_viewer_strings_no.xtb
@@ -191,7 +191,7 @@
<translation id="7730490981846175479"><ph name="SHIFT" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" /> og så <ph name="SPACE" /> eller <ph name="ENTER" /></translation>
<translation id="7787242579016742662">Åpne en fil i nettleseren</translation>
<translation id="7952165122793773711">Gå til fane 18</translation>
-<translation id="8026334261755873520">Slett nettleserdata</translation>
+<translation id="8026334261755873520">Slett nettlesingsdata</translation>
<translation id="8130528849632411619">Gå til begynnelsen av dokumentet</translation>
<translation id="8147954207400281792"><ph name="CTRL" /><ph name="SEPARATOR" /><ph name="K" /> eller <ph name="E" /></translation>
<translation id="8234414138295101081">Rotér skjermen 90 grader</translation>
diff --git a/chrome/app/resources/chromium_strings_no.xtb b/chrome/app/resources/chromium_strings_no.xtb
index 54159b6cb38b..2c87eb737f7d 100644
--- a/chrome/app/resources/chromium_strings_no.xtb
+++ b/chrome/app/resources/chromium_strings_no.xtb
@@ -328,7 +328,7 @@ Chromium kan ikke gjenopprette innstillingen dine.</translation>
<translation id="9089354809943900324">Chromium er utdatert</translation>
<translation id="9093206154853821181">{0,plural, =1{Chromium startes på nytt om en time}other{Chromium startes på nytt om # timer}}</translation>
<translation id="91086099826398415">Åpne linken i en ny &amp;fane i Chromium</translation>
-<translation id="911206726377975832">Vil du slette all nettleserdata også?</translation>
+<translation id="911206726377975832">Vil du slette all nettlesingsdata også?</translation>
<translation id="9144490074902256427">Underveis i prøveprosjektene kan du se og fjerne interesseemnene som nettsteder bruker for å vise deg annonser. Chromium anslår interessene dine basert på den nylige nettleserloggen din.</translation>
<translation id="9158494823179993217">Systemadministratoren din har konfigurert Chromium til å åpne en annen nettleser når du går til <ph name="TARGET_URL_HOSTNAME" />.</translation>
<translation id="9185526690718004400">Start på nytt for å oppdatere &amp;Chromium</translation>
diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb
index 91b21778fa2a..9303b12179b5 100644
--- a/chrome/app/resources/generated_resources_it.xtb
+++ b/chrome/app/resources/generated_resources_it.xtb
@@ -4491,7 +4491,7 @@ e Ctrl + Alt + Riduzione luminosità per diminuire lo zoom.</translation>
<translation id="5392192690789334093">Possono inviare notifiche</translation>
<translation id="5393761864111565424">{COUNT,plural, =1{Link}other{# link}}</translation>
<translation id="5396325212236512832">Accedi automaticamente ai siti e alle app usando le credenziali memorizzate. Se la funzionalità è disattivata, ti verrà chiesta una conferma ogni volta che vuoi accedere a un sito o a un'app.</translation>
-<translation id="5397378439569041789">Registra dispositivi kiosk o insegna</translation>
+<translation id="5397378439569041789">Registra dispositivi kiosk o segnaletica</translation>
<translation id="5397794290049113714">Tu</translation>
<translation id="5398497406011404839">Preferiti nascosti</translation>
<translation id="5398572795982417028">Riferimento pagina oltre i limiti. Il limite è <ph name="MAXIMUM_PAGE" /></translation>
diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb
index 68a5ad9bb773..5a57465d9121 100644
--- a/chrome/app/resources/generated_resources_iw.xtb
+++ b/chrome/app/resources/generated_resources_iw.xtb
@@ -1058,7 +1058,7 @@
<translation id="1994173015038366702">כתובת אתר</translation>
<translation id="1995916364271252349">בדף הזה אפשר לשלוט על המידע שאתרים יכולים להשתמש בו ולהציג אותו (מיקום, מצלמה, חלונות קופצים ועוד)</translation>
<translation id="1997616988432401742">האישורים שלך</translation>
-<translation id="1999115740519098545">בעת ההפעלה</translation>
+<translation id="1999115740519098545">כשפותחים את הדפדפן</translation>
<translation id="2000419248597011803">‏שליחה של חלק מקובצי ה-Cookie והחיפושים משורת כתובת האתר ומתיבת החיפוש אל מנוע החיפוש שהוגדר כברירת מחדל</translation>
<translation id="2002109485265116295">זמן אמת</translation>
<translation id="2003130567827682533">‏כדי להפעיל נתונים של '<ph name="NAME" />', יש להתחבר תחילה לרשת Wi-Fi</translation>
@@ -2312,7 +2312,7 @@
<translation id="3164329792803560526">המערכת משתפת את הכרטיסייה הזו עם <ph name="APP_NAME" /></translation>
<translation id="3165390001037658081">ייתכן שספקים מסוימים חוסמים את התכונה הזו.</translation>
<translation id="3170072451822350649">ניתן גם לדלג על הכניסה ו<ph name="LINK_START" />לגלוש כאורח<ph name="LINK_END" />.</translation>
-<translation id="31774765611822736">כרטיסייה חדשה מצד ימין</translation>
+<translation id="31774765611822736">כרטיסייה חדשה מצד שמאל</translation>
<translation id="3177909033752230686">שפת הדף:</translation>
<translation id="3179982752812949580">גופן הטקסט</translation>
<translation id="3181954750937456830">גלישה בטוחה (מגנה עליך ועל המכשיר מפני אתרים מסוכנים)</translation>
diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb
index 0d10527fa225..5315653a9912 100644
--- a/chrome/app/resources/generated_resources_no.xtb
+++ b/chrome/app/resources/generated_resources_no.xtb
@@ -187,7 +187,7 @@
<translation id="1173894706177603556">Gi nytt navn</translation>
<translation id="1174073918202301297">Snarveien er lagt til</translation>
<translation id="1174366174291287894">Tilkoblingen din er alltid sikker så lenge Chrome ikke forteller deg noe annet</translation>
-<translation id="117445914942805388">For å slette nettleserdata på alle synkroniserte enheter og Google-kontoen din <ph name="BEGIN_LINK" />går du til innstillingene for synkronisering<ph name="END_LINK" />.</translation>
+<translation id="117445914942805388">For å slette nettlesingsdata på alle synkroniserte enheter og Google-kontoen din <ph name="BEGIN_LINK" />går du til innstillingene for synkronisering<ph name="END_LINK" />.</translation>
<translation id="1175364870820465910">&amp;Skriv ut...</translation>
<translation id="1176471985365269981">Nettsteder som ikke har lov til å redigere filer eller mapper på enheten</translation>
<translation id="1177863135347784049">Tilpasset</translation>
@@ -200,7 +200,7 @@
<translation id="1187722533808055681">Inaktive oppvåkninger</translation>
<translation id="1188807932851744811">Loggen er ikke lastet opp.</translation>
<translation id="11901918071949011">{NUM_FILES,plural, =1{Tilgang til en fil som er lagret på datamaskinen din}other{Tilgang til # filer som er lagret på datamaskinen din}}</translation>
-<translation id="119092896208640858">For å slette nettleserdata på kun denne enheten, men beholde dataene på Google-kontoen, må du <ph name="BEGIN_LINK" />logge ut<ph name="END_LINK" />.</translation>
+<translation id="119092896208640858">For å slette nettlesingsdata på kun denne enheten, men beholde dataene på Google-kontoen, må du <ph name="BEGIN_LINK" />logge ut<ph name="END_LINK" />.</translation>
<translation id="1192706927100816598">{0,plural, =1{Du blir logget av automatisk om # sekund.
<ph name="DOMAIN" /> krever at smartkortet blir stående i.}other{Du blir logget av automatisk om # sekunder.
<ph name="DOMAIN" /> krever at smartkortet blir stående i.}}</translation>
@@ -1599,7 +1599,7 @@ Du kan administrere innstillingene for denne kontoen ved å installere Family Li
<translation id="2480868415629598489">endre data du kopierer og limer inn</translation>
<translation id="2482878487686419369">Varsler</translation>
<translation id="2482895651873876648">Fanen er flyttet til gruppen <ph name="GROUP_NAME" /> <ph name="GROUP_CONTENTS" /></translation>
-<translation id="2484959914739448251">For å slette nettleserdata på alle synkroniserte enheter og Google-kontoen din må du <ph name="BEGIN_LINK" />skrive inn passordfrasen din<ph name="END_LINK" />.</translation>
+<translation id="2484959914739448251">For å slette nettlesingsdata på alle synkroniserte enheter og Google-kontoen din må du <ph name="BEGIN_LINK" />skrive inn passordfrasen din<ph name="END_LINK" />.</translation>
<translation id="2485394160472549611">Toppvalg for deg</translation>
<translation id="2485422356828889247">Avinstaller</translation>
<translation id="2485681265915754872">Vilkår for bruk av Google Play</translation>
@@ -4101,7 +4101,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut.</translation>
<translation id="4977882548591990850"><ph name="CHARACTER_COUNT" />/<ph name="CHARACTER_LIMIT" /></translation>
<translation id="4977942889532008999">Bekreft tilgangen</translation>
<translation id="4980805016576257426">Denne utvidelsen inneholder skadelig programvare.</translation>
-<translation id="4981449534399733132">For å slette nettleserdata på alle synkroniserte enheter og Google-kontoen din må du <ph name="BEGIN_LINK" />logge på<ph name="END_LINK" />.</translation>
+<translation id="4981449534399733132">For å slette nettlesingsdata på alle synkroniserte enheter og Google-kontoen din må du <ph name="BEGIN_LINK" />logge på<ph name="END_LINK" />.</translation>
<translation id="4982236238228587209">Enhetsprogramvare</translation>
<translation id="4985248278475639481">Om personlig tilpasning av annonser</translation>
<translation id="4986728572522335985">Dette fører til at alle dataene på sikkerhetsnøkkelen, inkludert PIN-koden, blir slettet</translation>
@@ -7152,7 +7152,7 @@ Oppbevar nøkkelfilen på et trygt sted. Du får bruk for den når du skal oppre
<translation id="8023133589013344428">Administrer språk i ChromeOS Flex-innstillingene</translation>
<translation id="8023801379949507775">Oppdater utvidelser nå</translation>
<translation id="8025151549289123443">Låseskjerm og pålogging</translation>
-<translation id="8026334261755873520">Slett nettleserdata</translation>
+<translation id="8026334261755873520">Slett nettlesingsdata</translation>
<translation id="8028060951694135607">Microsoft nøkkelgjenoppretting</translation>
<translation id="8028803902702117856">Laster ned <ph name="SIZE" />, <ph name="FILE_NAME" /></translation>
<translation id="8028993641010258682">Størrelse</translation>
diff --git a/chrome/app/resources/google_chrome_strings_no.xtb b/chrome/app/resources/google_chrome_strings_no.xtb
index c061b599aa86..ae7f2483a61f 100644
--- a/chrome/app/resources/google_chrome_strings_no.xtb
+++ b/chrome/app/resources/google_chrome_strings_no.xtb
@@ -362,7 +362,7 @@ Tillatelser du allerede har gitt nettsteder og apper, kan gjelde for denne konto
<translation id="8999208279178790196">{0,plural, =0{En Chrome-oppdatering er tilgjengelig}=1{En Chrome-oppdatering er tilgjengelig}other{En Chrome-oppdatering har vært tilgjengelig i # dager}}</translation>
<translation id="9053892488859122171">ChromeOS Flex-system</translation>
<translation id="9067395829937117663">Google Chrome krever Windows 7 eller nyere.</translation>
-<translation id="911206726377975832">Vil du slette all nettleserdata også?</translation>
+<translation id="911206726377975832">Vil du slette all nettlesingsdata også?</translation>
<translation id="9138603949443464873">For å bruke endringene dine må du starte Chrome på nytt</translation>
<translation id="9195993889682885387">Chrome kan anslå interessene dine basert på nettleserloggen din fra de siste ukene. Denne informasjonen blir værende på enheten din.</translation>
<translation id="919706545465235479">Oppdater Chrome for å starte synkroniseringen</translation>
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb
index 8b75a0e734f4..38e6ff918c4b 100644
--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb
+++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_fa.xtb
@@ -10,7 +10,7 @@
<translation id="1025074108959230262">حالت چسبان غیرفعال شد</translation>
<translation id="1031961866430398710">سپس</translation>
<translation id="1038643060055067718">خطوط:</translation>
-<translation id="1038795173450935438">برای جلو رفتن بین موارد موجود در صفحه، «جستجو» + پیکان راست یا برای پرش به عقب «جستجو» + پیکان چپ را فشار دهید. برای رفتن به خط بعدی، «جستجو» + پیکان پایین را فشار دهید. برای رفتن به خط قبلی، از «جستجو» + پیکان بالا استفاده کنید. اگر به موردی رسیدید که می‌خواهید روی آن کلیک کنید، روی «جستجو» + فاصله فشار دهید.</translation>
+<translation id="1038795173450935438">برای جلو رفتن بین موارد موجود در صفحه، «جستجو» + کلید «راست‌بر» یا برای پرش به عقب «جستجو» + کلید «چپ‌بر» را فشار دهید. برای رفتن به خط بعدی، «جستجو» + کلید «پایین‌بر» را فشار دهید. برای رفتن به خط قبلی، از «جستجو» + کلید «بالابر» استفاده کنید. اگر به موردی رسیدید که می‌خواهید روی آن کلیک کنید، روی «جستجو» + کلید «فاصله» فشار دهید.</translation>
<translation id="106222400312645156">rwhdr</translation>
<translation id="1065552602950927991">ورودی نامعتبر</translation>
<translation id="1066085461259044485">سبز جنگلی</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
index afb4e74aa488..418884acaf3f 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
@@ -1203,7 +1203,7 @@ Tillitstokener gir bedre personvern på nettet og kan ikke brukes til å finne u
<translation id="7630202231528827509">Leverandørens nettadresse</translation>
<translation id="7634280112532283638">Reduksjon i nettsøppel og svindel</translation>
<translation id="7638584964844754484">Feil passordfrase</translation>
-<translation id="7641339528570811325">Slett nettleserdata</translation>
+<translation id="7641339528570811325">Slett nettlesingsdata</translation>
<translation id="7646772052135772216">Passordsynkronisering fungerer ikke</translation>
<translation id="7655900163790317559">Slår på Bluetooth …</translation>
<translation id="7658239707568436148">Avbryt</translation>
@@ -1274,7 +1274,7 @@ Tillitstokener gir bedre personvern på nettet og kan ikke brukes til å finne u
<translation id="8006818846907410687">Blokkér mens du er inkognito</translation>
<translation id="8013372441983637696">Fjern også Chrome-dataene dine fra denne enheten</translation>
<translation id="8015452622527143194">Tilbakestill alt på siden til standardstørrelsen</translation>
-<translation id="8026334261755873520">Slett nettleserdata</translation>
+<translation id="8026334261755873520">Slett nettlesingsdata</translation>
<translation id="8027863900915310177">Velg hvor du vil laste ned til</translation>
<translation id="8032569120109842252">Følger</translation>
<translation id="8035133914807600019">Ny mappe</translation>
diff --git a/components/strings/components_strings_no.xtb b/components/strings/components_strings_no.xtb
index 8786400bdfc9..c45f1e99d37e 100644
--- a/components/strings/components_strings_no.xtb
+++ b/components/strings/components_strings_no.xtb
@@ -347,7 +347,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
<translation id="1807246157184219062">Lys</translation>
<translation id="1807528111851433570">Startark</translation>
<translation id="1812527064848182527">liggende</translation>
-<translation id="1813414402673211292">Slett nettleserdata</translation>
+<translation id="1813414402673211292">Slett nettlesingsdata</translation>
<translation id="182139138257690338">automatiske nedlastinger</translation>
<translation id="1821930232296380041">Ugyldig forespørsel eller forespørselsparametere</translation>
<translation id="1822540298136254167">Nettsteder du besøker, og hvor mye tid du bruker på dem</translation>
@@ -973,7 +973,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
<translation id="361438452008624280">Listeoppføringen «<ph name="LANGUAGE_ID" />»: Språket er ukjent eller støttes ikke.</translation>
<translation id="3614934205542186002"><ph name="RUN_CHROME_SAFETY_CHECK_FOCUSED_FRIENDLY_MATCH_TEXT" /> trykk på Tab og deretter på Enter for å kjøre en sikkerhetssjekk i Chrome-innstillingene</translation>
<translation id="3615877443314183785">Angi en gyldig utløpsdato</translation>
-<translation id="36224234498066874">Slett nettleserdata</translation>
+<translation id="36224234498066874">Slett alle nettlesingsdata</translation>
<translation id="362276910939193118">Vis fullstendig logg</translation>
<translation id="3630155396527302611">Hvis programmet allerede har fått tillatelse til å bruke nettverket, kan du prøve
å fjerne det fra listen og så legge det til på nytt.</translation>
@@ -1637,7 +1637,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
<translation id="540969355065856584">Denne tjeneren kunne ikke bevise at den er <ph name="DOMAIN" />. Sikkerhetssertifikatet til tjeneren er ikke gyldig for øyeblikket. Dette kan være forårsaket av en feilkonfigurasjon eller en angriper som lytter på tilkoblingen din.</translation>
<translation id="5412236728747081950">Dette nettstedet mottar interessene dine fra Chrome for å kunne vise deg mer relevante annonser</translation>
<translation id="541416427766103491">Hylle 4</translation>
-<translation id="5421136146218899937">Slett nettleserdata</translation>
+<translation id="5421136146218899937">Slett nettlesingsdata</translation>
<translation id="5426179911063097041"><ph name="SITE" /> vil sende deg varsler</translation>
<translation id="5428105026674456456">Spansk</translation>
<translation id="5430298929874300616">Fjern bokmerke</translation>
@@ -1674,7 +1674,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
<translation id="5528532273234423708">Smarthus</translation>
<translation id="55293785478302737">Kantstifting</translation>
<translation id="553484882784876924">Prc6 (konvolutt)</translation>
-<translation id="5535133333442455806">Knappen «Slett nettleserdata» trykk på Enter for å tømme nettleserloggen, slette informasjonskapsler, tømme bufferen med mer i Chrome-innstillingene</translation>
+<translation id="5535133333442455806">Knappen «Slett nettlesingsdata» trykk på Enter for å tømme nettleserloggen, slette informasjonskapsler, tømme bufferen med mer i Chrome-innstillingene</translation>
<translation id="5536214594743852365">Vis «<ph name="SECTION" />»-delen</translation>
<translation id="5539243836947087108">Flåte</translation>
<translation id="5540224163453853">Den forespurte artikkelen ble ikke funnet.</translation>
@@ -2549,7 +2549,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
<translation id="8009225694047762179">Administrer passord</translation>
<translation id="8012116502927253373">{NUM_CARDS,plural, =1{Dette kortet og den tilknyttede faktureringsadressen lagres. Du kan bruke det når du er logget på <ph name="USER_EMAIL" />.}other{Disse kortene og de tilknyttede faktureringsadressene lagres. Du kan bruke dem når du er logget på <ph name="USER_EMAIL" />.}}</translation>
<translation id="8025119109950072390">Angripere på dette nettstedet prøver kanskje å lure deg til å gjøre farlige ting som å installere programvare eller avsløre personopplysningene dine (for eksempel passord, telefonnumre eller kredittkortinformasjon).</translation>
-<translation id="8026334261755873520">Slett nettleserdata</translation>
+<translation id="8026334261755873520">Slett nettlesingsdata</translation>
<translation id="8027077570865220386">Skuff 15</translation>
<translation id="8028698320761417183"><ph name="CREATE_GOOGLE_FORM_FOCUSED_FRIENDLY_MATCH_TEXT" /> trykk på Tab og deretter på Enter for å opprette et nytt skjema i Google Skjemaer raskt</translation>
<translation id="8028960012888758725">Beskjær etter jobben</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_no.xtb b/ios/chrome/app/strings/resources/ios_strings_no.xtb
index a3c0edf9089f..aab590e9581f 100644
--- a/ios/chrome/app/strings/resources/ios_strings_no.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_no.xtb
@@ -106,7 +106,7 @@ Søkemotoren din er <ph name="DSE_NAME" />. Se eventuelt instruksjonene deres om
<translation id="1753905327828125965">Mest besøkt</translation>
<translation id="1803264062614276815">Kortinnehaverens navn</translation>
<translation id="1809939268435598390">Slett mappen</translation>
-<translation id="1813414402673211292">Slett nettleserdata</translation>
+<translation id="1813414402673211292">Slett nettlesingsdata</translation>
<translation id="1815941218935345331">Sikkerhetskode</translation>
<translation id="1820259098641718022">Lagt til i leselisten</translation>
<translation id="1832848789136765277">For å sikre at du alltid har tilgang til de synkroniserte dataene dine, må du bekrefte at det er deg</translation>
diff --git a/ui/strings/translations/ui_strings_fa.xtb b/ui/strings/translations/ui_strings_fa.xtb
index cd0ff067ffc5..e0075ad5bd34 100644
--- a/ui/strings/translations/ui_strings_fa.xtb
+++ b/ui/strings/translations/ui_strings_fa.xtb
@@ -73,7 +73,7 @@
<translation id="3126026824346185272">Ctrl</translation>
<translation id="3157931365184549694">بازیابی</translation>
<translation id="3183922693828471536">پیمایش به اینجا</translation>
-<translation id="3234408098842461169">پیکان پایین</translation>
+<translation id="3234408098842461169">کلید پایین‌بر</translation>
<translation id="3291688615589870984">{DAYS,plural, =1{۱ روز}one{# روز}other{# روز}}</translation>
<translation id="3295886253693811851">برقراری تماس از</translation>
<translation id="3306688585798492231">نمایشگر داخلی</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 6c7428424278ac118e85629322ec5a95e2599c55 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Tue, 21 Jun 2022 01:00:33 +0000
Subject: [PATCH 27/59] Incrementing VERSION to 102.0.5005.136
Change-Id: Ie4d1e8587dfee142a28feeca12d5bec472864d23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715930
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1186}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 308402a8004d..ef7c482c8d42 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=135
+PATCH=136
--
2.37.0

View File

@ -0,0 +1,256 @@
From 3b1594ca494c25b4239ab6267e6bfa9b0e70e5ae Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Tue, 21 Jun 2022 14:41:48 +0000
Subject: [PATCH 28/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I69c09a61449fcfa7f00f44ffd4ea1be8977654e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715113
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1187}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_es-419.xtb | 2 +-
ash/strings/ash_strings_nl.xtb | 4 ++--
.../camera_app_ui/resources/strings/camera_strings_eu.xtb | 4 ++--
chrome/app/resources/generated_resources_ar.xtb | 4 ++--
chrome/app/resources/generated_resources_es-419.xtb | 4 ++--
chrome/app/resources/generated_resources_it.xtb | 2 +-
chrome/app/resources/generated_resources_vi.xtb | 2 +-
chrome/app/resources/google_chrome_strings_ar.xtb | 2 +-
.../strings/translations/android_chrome_strings_ar.xtb | 5 +++--
.../strings/translations/android_chrome_strings_es-419.xtb | 2 +-
.../strings/translations/android_chrome_strings_vi.xtb | 2 +-
components/strings/components_strings_ar.xtb | 3 ++-
components/strings/components_strings_vi.xtb | 4 ++--
13 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/ash/strings/ash_strings_es-419.xtb b/ash/strings/ash_strings_es-419.xtb
index 6d3ed2bac68e..450b9ac09bea 100644
--- a/ash/strings/ash_strings_es-419.xtb
+++ b/ash/strings/ash_strings_es-419.xtb
@@ -98,7 +98,7 @@ Estas son algunas de las cosas que puedes probar para comenzar.</translation>
<translation id="1420408895951708260">Activar o desactivar la Luz nocturna. <ph name="STATE_TEXT" /></translation>
<translation id="1420732223884894666">Ve las fotos y el contenido multimedia recientes del teléfono en tu <ph name="DEVICE_TYPE" /></translation>
<translation id="1426410128494586442">Sí</translation>
-<translation id="1438357537418863713">Se configuró la transmisión de app. Una vez que comiences, aparecerán aquí las apps iniciadas recientemente.</translation>
+<translation id="1438357537418863713">Se configuró la transmisión de app. Una vez que comiences, aparecerán aquí las apps utilizadas recientemente.</translation>
<translation id="1455242230282523554">Mostrar la configuración de idioma</translation>
<translation id="1460620680449458626">El volumen está silenciado.</translation>
<translation id="1467432559032391204">Izquierda</translation>
diff --git a/ash/strings/ash_strings_nl.xtb b/ash/strings/ash_strings_nl.xtb
index c87186593fdb..182e3161c8f4 100644
--- a/ash/strings/ash_strings_nl.xtb
+++ b/ash/strings/ash_strings_nl.xtb
@@ -95,7 +95,7 @@ Hier zijn wat voorbeelden van wat je kunt proberen om aan de slag te gaan.</tran
<translation id="1420408895951708260">Nachtverlichting aan- of uitzetten. <ph name="STATE_TEXT" /></translation>
<translation id="1420732223884894666">Recente foto's en media van je telefoon bekijken op je <ph name="DEVICE_TYPE" /></translation>
<translation id="1426410128494586442">Ja</translation>
-<translation id="1438357537418863713">App-streaming is nu ingesteld. Als je aan de slag gaat, zie je hier recent gelanceerde apps.</translation>
+<translation id="1438357537418863713">App-streaming is nu ingesteld. Als je aan de slag gaat, zie je hier recent gebruikte apps.</translation>
<translation id="1455242230282523554">Taalinstellingen bekijken</translation>
<translation id="1460620680449458626">Volume staat uit.</translation>
<translation id="1467432559032391204">Links</translation>
@@ -1328,7 +1328,7 @@ Nieuwe installatie</translation>
<translation id="9084606467167974638">Positie van menu wijzigen</translation>
<translation id="9089416786594320554">Invoermethoden</translation>
<translation id="9091626656156419976">Scherm <ph name="DISPLAY_NAME" /> is verwijderd</translation>
-<translation id="9098969848082897657">Geluid van telefoon uitzetten</translation>
+<translation id="9098969848082897657">Telefoon dempen</translation>
<translation id="9099154003160514616">Lacros-update beschikbaar</translation>
<translation id="9100887602489003640">Profiel toevoegen. Wacht een paar minuten.</translation>
<translation id="9105450214093926548">Een tweede gebruiker inloggen wordt niet ondersteund als de Lacros-browser actief is. Gebruik in plaats daarvan een tweede browserprofiel in Lacros of sluit Lacros en probeer het opnieuw.</translation>
diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb
index 974898761fe5..b6c3fd8ed3b8 100644
--- a/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb
+++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_eu.xtb
@@ -46,7 +46,7 @@
Memoria atzitzeko baimena duten aplikazioek atzi ditzakete argazkiak eta bideoak.</translation>
<translation id="3067436040345934772">Mugitu eskuinera</translation>
<translation id="3081586908890909590">Aldatu bideoak grabatzeko modura</translation>
-<translation id="313467653172006084">30 f/s</translation>
+<translation id="313467653172006084">30 fps</translation>
<translation id="3183731565330012717">Sareta mota</translation>
<translation id="3227137524299004712">Mikrofonoa</translation>
<translation id="3240426699337459095">Esteka kopiatu da</translation>
@@ -123,7 +123,7 @@ Irudi edo bideoaren kalitateari buruzko iritzia eman nahi baduzu, erantsi argazk
<translation id="761421184377987513">Behera eta ezkerrera mugitzen ari da</translation>
<translation id="7649070708921625228">Laguntza</translation>
<translation id="7658239707568436148">Utzi</translation>
-<translation id="7670511624014457267">60 f/s</translation>
+<translation id="7670511624014457267">60 fps</translation>
<translation id="7671804233658741790">Dokumentuaren beheko eskuinaldeko ertza</translation>
<translation id="7726641833034062494">Grabatu bideo normal bat</translation>
<translation id="7748344063862150053">Dokumentuaren goiko eskuinaldeko ertza</translation>
diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb
index 62cc88d48a2e..4eec1516e8e1 100644
--- a/chrome/app/resources/generated_resources_ar.xtb
+++ b/chrome/app/resources/generated_resources_ar.xtb
@@ -2835,7 +2835,7 @@
<translation id="3714195043138862580">وُضِعَ هذا الجهاز التجريبي في الحالة "غير متوفِّر".</translation>
<translation id="3719826155360621982">الصفحة الرئيسية</translation>
<translation id="372062398998492895">‏إعدادات طابعات CUPS</translation>
-<translation id="3721119614952978349">‏علاقتك مع Google</translation>
+<translation id="3721119614952978349">‏أنت وGoogle</translation>
<translation id="3722108462506185496">حدث خطأ أثناء بدء تشغيل خدمة الآلة الافتراضية. يُرجى إعادة المحاولة.</translation>
<translation id="3727144509609414201">‏شبكات Wi-Fi المتاحة</translation>
<translation id="3727187387656390258">فحص النوافذ المنبثقة</translation>
@@ -4157,7 +4157,7 @@
<translation id="5051836348807686060">لا تتوفر ميزة التدقيق الإملائي للغات التي اخترتها.</translation>
<translation id="5052499409147950210">تعديل موقع إلكتروني</translation>
<translation id="505347685865235222">مجموعة لم تتم تسميتها - <ph name="GROUP_CONTENT_STRING" /></translation>
-<translation id="5053962746715621840">‏ابحث في الصور عبر "عدسة Google"</translation>
+<translation id="5053962746715621840">‏البحث باستخدام الصورة بواسطة "عدسة Google"</translation>
<translation id="5054374119096692193">‏الاطّلاع على كل خيارات البطاقة في القسم <ph name="BEGIN_LINK" />تخصيص Chrome<ph name="END_LINK" /></translation>
<translation id="5056950756634735043">جارٍ الاتصال بالحاوية</translation>
<translation id="5057110919553308744">عند النقر على "الإضافة"</translation>
diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb
index feff984e5988..dd4a406234dd 100644
--- a/chrome/app/resources/generated_resources_es-419.xtb
+++ b/chrome/app/resources/generated_resources_es-419.xtb
@@ -3860,7 +3860,7 @@ y Ctrl + Alt + Disminuir brillo para alejar.</translation>
<translation id="473936925429402449">Seleccionado, contenido adicional: <ph name="CURRENT_ELEMENT" /> de <ph name="TOTAL_ELEMENTS" /></translation>
<translation id="4739639199548674512">Tickets</translation>
<translation id="4742334355511750246">No puede mostrar imágenes</translation>
-<translation id="4742970037960872810">Quitar el texto destacado</translation>
+<translation id="4742970037960872810">Dejar de destacar</translation>
<translation id="4743260470722568160"><ph name="BEGIN_LINK" />Obtener información sobre cómo actualizar las aplicaciones<ph name="END_LINK" /></translation>
<translation id="4744981231093950366">{NUM_TABS,plural, =1{Activar el sonido del sitio}other{Activar el sonido de los sitios}}</translation>
<translation id="474609389162964566">Accede a tu Asistente con "Hey Google"</translation>
@@ -6134,7 +6134,7 @@ Puedes asignar varios interruptores a esta acción.</translation>
<translation id="7009709314043432820"><ph name="APP_NAME" /> está utilizando la cámara</translation>
<translation id="701080569351381435">Ver código fuente</translation>
<translation id="7014174261166285193">Error de instalación</translation>
-<translation id="7014480873681694324">Quitar el texto destacado</translation>
+<translation id="7014480873681694324">Dejar de destacar</translation>
<translation id="7017004637493394352">Di "OK Google" otra vez.</translation>
<translation id="7017219178341817193">Agregar nueva página</translation>
<translation id="7017354871202642555">No es posible configurar el modo después de que se ha configurado la ventana.</translation>
diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb
index 9303b12179b5..f02f15ad7396 100644
--- a/chrome/app/resources/generated_resources_it.xtb
+++ b/chrome/app/resources/generated_resources_it.xtb
@@ -5569,7 +5569,7 @@ Puoi assegnare più sensori a questa azione.</translation>
<translation id="6466258437571594570">I siti non possono interromperti quando chiedono di poter inviare notifiche</translation>
<translation id="6466988389784393586">&amp;Apri tutti i Preferiti</translation>
<translation id="6467304607960172345">Ottimizza video a schermo intero</translation>
-<translation id="6467377768028664108"><ph name="DEVICE_TYPE" /> potrà poi:</translation>
+<translation id="6467377768028664108">Su <ph name="DEVICE_TYPE" />:</translation>
<translation id="6468485451923838994">Caratteri</translation>
<translation id="6468773105221177474"><ph name="FILE_COUNT" /> file</translation>
<translation id="6469557521904094793">Attiva rete mobile</translation>
diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb
index fa4aee89f515..20f391850ad6 100644
--- a/chrome/app/resources/generated_resources_vi.xtb
+++ b/chrome/app/resources/generated_resources_vi.xtb
@@ -7618,7 +7618,7 @@ Giữ tệp khóa của bạn ở nơi an toàn. Bạn sẽ cần tệp khóa đ
<translation id="8471525937465764768">Các trang web thường kết nối với thiết bị USB để áp dụng những tính năng như in tài liệu hoặc lưu vào thiết bị lưu trữ</translation>
<translation id="8471959340398751476">Tính năng nhận chiết khấu đang tắt. Bạn có thể bật tính năng này trong trình đơn tùy chỉnh</translation>
<translation id="8472623782143987204">được hỗ trợ bằng phần cứng</translation>
-<translation id="8473863474539038330">Địa chỉ và các tùy chọn khác</translation>
+<translation id="8473863474539038330">Địa chỉ và các lựa chọn khác</translation>
<translation id="8475313423285172237">Một chương trình khác trên máy tính của bạn đã thêm một tiện ích có thể thay đổi cách Chrome hoạt động.</translation>
<translation id="8477241577829954800">Đã thay thế</translation>
<translation id="8477384620836102176">&amp;Chung</translation>
diff --git a/chrome/app/resources/google_chrome_strings_ar.xtb b/chrome/app/resources/google_chrome_strings_ar.xtb
index 334de19ffada..88a11e1504fe 100644
--- a/chrome/app/resources/google_chrome_strings_ar.xtb
+++ b/chrome/app/resources/google_chrome_strings_ar.xtb
@@ -9,7 +9,7 @@
<translation id="110877069173485804">‏هذا Chrome الخاص بك</translation>
<translation id="1125124144982679672">‏مَن يستخدم متصفِّح Chrome؟</translation>
<translation id="1142745911746664600">‏تعذّرت إعادة التحميل Chrome</translation>
-<translation id="1152920704813762236">‏لمحة عن نظام التشغيل Chrome</translation>
+<translation id="1152920704813762236">‏لمحة عن ChromeOS</translation>
<translation id="1154147086299354128">&amp;فتح في Chrome</translation>
<translation id="1178374936842835197">‏في حال عدم عرض أحد الإعدادات على هذه الصفحة، انتقِل إلى <ph name="LINK_BEGIN" />
إعدادات نظام التشغيل ChromeOS Flex<ph name="LINK_END" /></translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
index f1e93ecf3279..d6c7f88702f7 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb
@@ -285,7 +285,8 @@
<translation id="2534155362429831547">تم حذف <ph name="NUMBER_OF_ITEMS" /> من العناصر</translation>
<translation id="2534582914273493287">‏يتم إرسال عناوين URL التي تزورها إلى Google</translation>
<translation id="2536728043171574184">عرض نسخة بلا اتصال من هذه الصفحة</translation>
-<translation id="2546283357679194313">ملفات تعريف الارتباط وبيانات المواقع</translation>
+<translation id="2546283357679194313">ملفات تعريف الارتباط وبيانات المواقع الإلكترونية
+</translation>
<translation id="2549516196460093976">‏يمكنك استخدام هذا الجهاز اللوحي لتسجيل الدخول إلى حساب Google على جهاز الكمبيوتر الذي يعرض رمز الاستجابة السريعة هذا.</translation>
<translation id="2558569818338050235">يؤثر سجلّ تصفّحك في الإعلانات التي تظهر لك.</translation>
<translation id="2561519700418191927">معاينات الفيديوهات</translation>
@@ -499,7 +500,7 @@
<translation id="371230970611282515">توقّع الأحداث الخطيرة قبل حدوثها والتحذير منها</translation>
<translation id="3714981814255182093">فتح شريط البحث</translation>
<translation id="3716182511346448902">‏تستهلك هذه الصفحة مساحة كبيرة من الذاكرة، لذلك أوقفها Chrome مؤقتًا.</translation>
-<translation id="3721119614952978349">‏علاقتك مع Google</translation>
+<translation id="3721119614952978349">‏أنت وGoogle</translation>
<translation id="3737319253362202215">إعدادات الترجمة</translation>
<translation id="3737402728074743863">عليك ضبط قفل الشاشة لاستخدام هذا الجهاز كمفتاح أمان.</translation>
<translation id="3738139272394829648">المس للبحث</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
index 09044681e203..e3a1afabb6c2 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb
@@ -667,7 +667,7 @@ Es posible que tu cuenta de Google tenga otros formularios de historial de naveg
<translation id="4736934858538408121">Tarjeta virtual</translation>
<translation id="4738836084190194332">Última sincronización: <ph name="WHEN" /></translation>
<translation id="4741753828624614066">Recibirás mejores sugerencias en la barra de direcciones.</translation>
-<translation id="4742970037960872810">Quitar el texto destacado</translation>
+<translation id="4742970037960872810">Dejar de destacar</translation>
<translation id="4749960740855309258">Abrir una pestaña nueva</translation>
<translation id="4758061975920522644">Compartir solo la imagen</translation>
<translation id="4759238208242260848">Descargas</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
index 6a066d11e660..21185014952d 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
@@ -1361,7 +1361,7 @@ Mã thông báo tin cậy giúp cải thiện quyền riêng tư trên web và
<translation id="8453310803815879010">Bắt đầu Trò chơi Khủng long</translation>
<translation id="8461694314515752532">Mã hóa dữ liệu đã đồng bộ hóa bằng cụm mật khẩu đồng bộ hóa của riêng bạn</translation>
<translation id="8466613982764129868">Hãy đảm bảo <ph name="TARGET_DEVICE_NAME" /> có kết nối Internet</translation>
-<translation id="8473863474539038330">Địa chỉ và các tùy chọn khác</translation>
+<translation id="8473863474539038330">Địa chỉ và các lựa chọn khác</translation>
<translation id="8481921391193215807">Khi bạn bật Hộp cát về quyền riêng tư, các trang web có thể dùng kỹ thuật bảo vệ quyền riêng tư theo mô tả ở đây để cung cấp nội dung và dịch vụ của mình. Các kỹ thuật này gồm có những biện pháp thay thế cho hoạt động theo dõi trên nhiều trang web. Theo thời gian, chúng tôi có thể bổ sung nhiều chế độ dùng thử khác.
<ph name="BEGIN_LIST_ITEM1" />Các nhà quảng cáo và nhà xuất bản có thể dùng kỹ thuật FLoC.<ph name="END_LIST_ITEM1" />
diff --git a/components/strings/components_strings_ar.xtb b/components/strings/components_strings_ar.xtb
index 9f063901bfe7..1fe4b2bf4b35 100644
--- a/components/strings/components_strings_ar.xtb
+++ b/components/strings/components_strings_ar.xtb
@@ -595,7 +595,8 @@
<translation id="2544546346215446551">المشرف أعاد تشغيل الجهاز</translation>
<translation id="2544644783021658368">مستند واحد</translation>
<translation id="254524874071906077">‏تعيين Chrome كمتصفح تلقائي</translation>
-<translation id="2546283357679194313">ملفات تعريف الارتباط وبيانات المواقع</translation>
+<translation id="2546283357679194313">ملفات تعريف الارتباط وبيانات المواقع الإلكترونية
+</translation>
<translation id="2547466893236767989">تصميم وتطوير مواقع إلكترونية</translation>
<translation id="254947805923345898">قيمة السياسة غير صحيحة.</translation>
<translation id="255002559098805027">أرسل <ph name="HOST_NAME" /> استجابة غير صالحة.</translation>
diff --git a/components/strings/components_strings_vi.xtb b/components/strings/components_strings_vi.xtb
index 737992fdba54..efc072d84b36 100644
--- a/components/strings/components_strings_vi.xtb
+++ b/components/strings/components_strings_vi.xtb
@@ -1658,7 +1658,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn
<translation id="54817484435770891">Thêm địa chỉ hợp lệ</translation>
<translation id="5485973315555778056">Thiết bị trên đám mây</translation>
<translation id="5487426985799386720">Thực phẩm và đồ uống</translation>
-<translation id="5490432419156082418">Địa chỉ và các tùy chọn khác</translation>
+<translation id="5490432419156082418">Địa chỉ và các lựa chọn khác</translation>
<translation id="5492298309214877701">Trang web trên mạng nội bộ của công ty, tổ chức hoặc trường học này có URL tương tự như trang web bên ngoài.
<ph name="LINE_BREAK" />
Hãy thử liên hệ với quản trị viên hệ thống của bạn.</translation>
@@ -2708,7 +2708,7 @@ Thông tin chi tiết bổ sung:
<translation id="8457125768502047971">Vô thời hạn</translation>
<translation id="8461694314515752532">Mã hóa dữ liệu đã đồng bộ hóa bằng cụm mật khẩu đồng bộ hóa của riêng bạn</translation>
<translation id="8466379296835108687">{COUNT,plural, =1{1 thẻ tín dụng}other{# thẻ tín dụng}}</translation>
-<translation id="8473863474539038330">Địa chỉ và các tùy chọn khác</translation>
+<translation id="8473863474539038330">Địa chỉ và các lựa chọn khác</translation>
<translation id="8474910779563686872">Hiển thị thông tin chi tiết của nhà phát triển</translation>
<translation id="8479754468255770962">Dập ghim dưới cùng bên trái</translation>
<translation id="8483780878231876732">Để sử dụng thẻ từ Tài khoản Google, hãy đăng nhập vào Chrome</translation>
--
2.37.0

View File

@ -0,0 +1,842 @@
From 2b4864af666871315c7eb8e7a5bf2c59968f62d0 Mon Sep 17 00:00:00 2001
From: Keybo Qian <keybo@google.com>
Date: Tue, 21 Jun 2022 16:43:59 +0000
Subject: [PATCH 29/59] [M102][infra] add "free_space" dimension to Chromium
builderless CI builders.
This dimension is currently only used by these builders, and is
"standard" by default.
(cherry picked from commit 2dfe967762507d2d6757b8e776e4efaea27d46ed)
Bug: 1311317
Change-Id: Id73fb6b2d4af9e072bf3f8b85498191ce5a00718
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703737
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Keybo Qian <keybo@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1015340}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714800
Cr-Commit-Position: refs/branch-heads/5005@{#1188}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../config/generated/luci/cr-buildbucket.cfg | 82 +++++++++++++++++++
infra/config/lib/builders.star | 22 +++++
infra/config/subprojects/chromium/ci.star | 3 +-
.../subprojects/flakiness/flakiness.star | 3 +-
infra/config/subprojects/goma/goma.star | 3 +-
.../config/subprojects/reclient/reclient.star | 3 +-
6 files changed, 112 insertions(+), 4 deletions(-)
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index e784735e10fc..3e6522e93ca2 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -28,6 +28,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -110,6 +111,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -192,6 +194,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -274,6 +277,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -356,6 +360,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -438,6 +443,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -520,6 +526,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -602,6 +609,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -684,6 +692,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -766,6 +775,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -848,6 +858,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -930,6 +941,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -1012,6 +1024,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1094,6 +1107,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1176,6 +1190,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1257,6 +1272,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Mac"
dimensions: "pool:luci.chromium.gpu.ci"
exe {
@@ -1338,6 +1354,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1420,6 +1437,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1502,6 +1520,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1584,6 +1603,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1666,6 +1686,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1748,6 +1769,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1830,6 +1852,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1912,6 +1935,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1994,6 +2018,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2076,6 +2101,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2158,6 +2184,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -2239,6 +2266,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Mac"
dimensions: "pool:luci.chromium.gpu.ci"
exe {
@@ -2320,6 +2348,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -2402,6 +2431,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:1"
@@ -2484,6 +2514,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2566,6 +2597,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2648,6 +2680,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2730,6 +2763,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2812,6 +2846,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2894,6 +2929,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -2976,6 +3012,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3058,6 +3095,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3140,6 +3178,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3232,6 +3271,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3314,6 +3354,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3556,6 +3597,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -3638,6 +3680,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -3720,6 +3763,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3802,6 +3846,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3884,6 +3929,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3966,6 +4012,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4048,6 +4095,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4130,6 +4178,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4212,6 +4261,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4294,6 +4344,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4376,6 +4427,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4458,6 +4510,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4540,6 +4593,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4622,6 +4676,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5028,6 +5083,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -5110,6 +5166,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5192,6 +5249,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5274,6 +5332,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5356,6 +5415,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5438,6 +5498,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5520,6 +5581,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5602,6 +5664,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5765,6 +5828,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5847,6 +5911,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5929,6 +5994,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6011,6 +6077,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6093,6 +6160,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6175,6 +6243,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6257,6 +6326,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6339,6 +6409,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6421,6 +6492,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6584,6 +6656,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6918,6 +6991,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7000,6 +7074,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7082,6 +7157,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7164,6 +7240,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7246,6 +7323,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7328,6 +7406,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7410,6 +7489,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7492,6 +7572,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7815,6 +7896,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
index d52370a10a90..226ed51648ba 100644
--- a/infra/config/lib/builders.star
+++ b/infra/config/lib/builders.star
@@ -171,6 +171,15 @@ xcode = struct(
x13wk = xcode_enum("13a1030dwk"),
)
+# Free disk space in a machine reserved for build tasks.
+# The values in this enum will be used to populate bot dimension "free_space",
+# and each bot will allocate a corresponding amount of free disk space based on
+# the value of the dimension through "bot_config.py".
+free_space = struct(
+ standard = "standard",
+ high = "high",
+)
+
################################################################################
# Implementation details #
################################################################################
@@ -297,6 +306,7 @@ defaults = args.defaults(
auto_builder_dimension = args.COMPUTE,
builder_group = None,
builderless = args.COMPUTE,
+ free_space = None,
cores = None,
cpu = None,
fully_qualified_builder_dimension = False,
@@ -345,6 +355,7 @@ def builder(
triggered_by = args.DEFAULT,
os = args.DEFAULT,
builderless = args.DEFAULT,
+ free_space = args.DEFAULT,
builder_cache_name = None,
override_builder_dimension = None,
auto_builder_dimension = args.DEFAULT,
@@ -425,6 +436,10 @@ def builder(
builderless: a boolean indicating whether the builder runs on
builderless machines. If True, emits a 'builderless:1' dimension. By
default, considered True iff `os` refers to a linux OS.
+ free_space: an enum that indicates the amount of free disk space reserved
+ in a machine for incoming build tasks. This value is used to create
+ a "free_space" dimension, and this dimension is appended to only
+ builderless builders.
override_builder_dimension: a string to assign to the "builder"
dimension. Ignores any other "builder" and "builderless" dimensions
that would have been assigned.
@@ -600,6 +615,12 @@ def builder(
if builderless:
dimensions["builderless"] = "1"
+ free_space = defaults.get_value("free_space", free_space)
+ if free_space:
+ dimensions["free_space"] = free_space
+ elif free_space and free_space != args.DEFAULT:
+ fail("\'free_space\' dimension can only be specified for builderless builders")
+
auto_builder_dimension = defaults.get_value(
"auto_builder_dimension",
auto_builder_dimension,
@@ -808,4 +829,5 @@ builders = struct(
os = os,
sheriff_rotations = sheriff_rotations,
xcode = xcode,
+ free_space = free_space,
)
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index e11b770d24e7..d19117eff5f4 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
load("//lib/branches.star", "branches")
-load("//lib/builders.star", "cpu")
+load("//lib/builders.star", "builders", "cpu")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//project.star", "settings")
@@ -14,6 +14,7 @@ ci.defaults.set(
build_numbers = True,
cpu = cpu.X86_64,
triggered_by = ["chromium-gitiles-trigger"],
+ free_space = builders.free_space.standard,
)
luci.bucket(
diff --git a/infra/config/subprojects/flakiness/flakiness.star b/infra/config/subprojects/flakiness/flakiness.star
index ee158bc947d3..c2b4fe86cb00 100644
--- a/infra/config/subprojects/flakiness/flakiness.star
+++ b/infra/config/subprojects/flakiness/flakiness.star
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-load("//lib/builders.star", "os")
+load("//lib/builders.star", "builders", "os")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
@@ -15,6 +15,7 @@ ci.defaults.set(
# TODO(jeffyoon): replace with smaller scoped service account, and update
# below for bucket ACL
service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
+ free_space = builders.free_space.standard,
)
luci.bucket(
diff --git a/infra/config/subprojects/goma/goma.star b/infra/config/subprojects/goma/goma.star
index be425023964f..54a585a691a4 100644
--- a/infra/config/subprojects/goma/goma.star
+++ b/infra/config/subprojects/goma/goma.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
load("//lib/builder_config.star", "builder_config")
-load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode")
+load("//lib/builders.star", "builder", "builders", "cpu", "defaults", "goma", "os", "xcode")
load("//lib/structs.star", "structs")
luci.bucket(
@@ -32,6 +32,7 @@ defaults.executable.set("recipe:chromium")
defaults.execution_timeout.set(3 * time.hour)
defaults.os.set(os.LINUX_DEFAULT)
defaults.pool.set("luci.chromium.ci")
+defaults.free_space.set(builders.free_space.standard)
defaults.service_account.set(
"goma-release-testing@chops-service-accounts.iam.gserviceaccount.com",
)
diff --git a/infra/config/subprojects/reclient/reclient.star b/infra/config/subprojects/reclient/reclient.star
index ad898d6cb6cd..fb789ff4b504 100644
--- a/infra/config/subprojects/reclient/reclient.star
+++ b/infra/config/subprojects/reclient/reclient.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
load("//lib/builder_config.star", "builder_config")
-load("//lib/builders.star", "cpu", "os")
+load("//lib/builders.star", "builders", "cpu", "os")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//lib/structs.star", "structs")
@@ -41,6 +41,7 @@ ci.defaults.set(
"chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
),
triggered_by = ["chromium-gitiles-trigger"],
+ free_space = builders.free_space.standard,
)
consoles.console_view(
--
2.37.0

View File

@ -0,0 +1,197 @@
From 5e676bfdc8c9329ee5f749098383586c7ad87bde Mon Sep 17 00:00:00 2001
From: Gregory Guterman <guterman@google.com>
Date: Wed, 22 Jun 2022 00:21:37 +0000
Subject: [PATCH 30/59] [infra] Migrate configs for android_cronet src-side.
(cherry picked from commit cd384a5c8ef5736f97ae34982f8d3e38a1a64e8f)
Bug: 1317104
Change-Id: I17c2d9d869ea57125d92d4278a820a6ff87b05ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3656312
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Auto-Submit: Gregory Guterman <guterman@google.com>
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1011734}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3717523
Cr-Commit-Position: refs/branch-heads/5005@{#1189}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../ci/android-cronet-arm-rel/properties.json | 53 +++++++++++++++++++
.../try/android_cronet/properties.json | 48 +++++++++++++++++
.../chromium/ci/chromium.android.star | 23 ++++++++
.../try/tryserver.chromium.android.star | 6 +++
4 files changed, 130 insertions(+)
diff --git a/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json b/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json
index d68921bae929..4c1bee9eeb18 100644
--- a/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json
+++ b/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json
@@ -1,4 +1,57 @@
{
+ "$build/chromium_tests_builder_config": {
+ "builder_config": {
+ "builder_db": {
+ "entries": [
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "android-cronet-arm-rel",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-android-archive",
+ "builder_group": "chromium.android",
+ "execution_mode": "COMPILE_AND_TEST",
+ "legacy_android_config": {
+ "config": "main_builder"
+ },
+ "legacy_chromium_config": {
+ "apply_configs": [
+ "cronet_builder",
+ "mb"
+ ],
+ "build_config": "Release",
+ "config": "android",
+ "target_bits": 32,
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "enable_reclient"
+ ],
+ "config": "chromium"
+ }
+ }
+ }
+ ]
+ },
+ "builder_ids": [
+ {
+ "bucket": "ci",
+ "builder": "android-cronet-arm-rel",
+ "project": "chromium"
+ }
+ ],
+ "mirroring_builder_group_and_names": [
+ {
+ "builder": "android_cronet",
+ "group": "tryserver.chromium.android"
+ }
+ ]
+ }
+ },
"$build/reclient": {
"instance": "rbe-chromium-trusted",
"jobs": 500,
diff --git a/infra/config/generated/builders/try/android_cronet/properties.json b/infra/config/generated/builders/try/android_cronet/properties.json
index d90599ce7370..160fc425c26a 100644
--- a/infra/config/generated/builders/try/android_cronet/properties.json
+++ b/infra/config/generated/builders/try/android_cronet/properties.json
@@ -1,4 +1,52 @@
{
+ "$build/chromium_tests_builder_config": {
+ "builder_config": {
+ "builder_db": {
+ "entries": [
+ {
+ "builder_id": {
+ "bucket": "ci",
+ "builder": "android-cronet-arm-rel",
+ "project": "chromium"
+ },
+ "builder_spec": {
+ "build_gs_bucket": "chromium-android-archive",
+ "builder_group": "chromium.android",
+ "execution_mode": "COMPILE_AND_TEST",
+ "legacy_android_config": {
+ "config": "main_builder"
+ },
+ "legacy_chromium_config": {
+ "apply_configs": [
+ "cronet_builder",
+ "mb"
+ ],
+ "build_config": "Release",
+ "config": "android",
+ "target_bits": 32,
+ "target_platform": "android"
+ },
+ "legacy_gclient_config": {
+ "apply_configs": [
+ "android",
+ "enable_reclient"
+ ],
+ "config": "chromium"
+ }
+ }
+ }
+ ]
+ },
+ "builder_ids": [
+ {
+ "bucket": "ci",
+ "builder": "android-cronet-arm-rel",
+ "project": "chromium"
+ }
+ ],
+ "is_compile_only": true
+ }
+ },
"$build/goma": {
"enable_ats": true,
"rpc_extra_params": "?prod",
diff --git a/infra/config/subprojects/chromium/ci/chromium.android.star b/infra/config/subprojects/chromium/ci/chromium.android.star
index a2e046777d7a..8905963349cd 100644
--- a/infra/config/subprojects/chromium/ci/chromium.android.star
+++ b/infra/config/subprojects/chromium/ci/chromium.android.star
@@ -632,6 +632,29 @@ ci.builder(
ci.builder(
name = "android-cronet-arm-rel",
+ builder_spec = builder_config.builder_spec(
+ gclient_config = builder_config.gclient_config(
+ config = "chromium",
+ apply_configs = [
+ "android",
+ "enable_reclient",
+ ],
+ ),
+ chromium_config = builder_config.chromium_config(
+ config = "android",
+ apply_configs = [
+ "cronet_builder",
+ "mb",
+ ],
+ build_config = builder_config.build_config.RELEASE,
+ target_bits = 32,
+ target_platform = builder_config.target_platform.ANDROID,
+ ),
+ android_config = builder_config.android_config(
+ config = "main_builder",
+ ),
+ build_gs_bucket = "chromium-android-archive",
+ ),
branch_selector = branches.STANDARD_MILESTONE,
console_view_entry = consoles.console_view_entry(
category = "cronet|arm",
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
index 94cd15630829..994a280cb969 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
@@ -555,6 +555,12 @@ try_.builder(
try_.builder(
name = "android_cronet",
+ mirrors = [
+ "ci/android-cronet-arm-rel",
+ ],
+ try_settings = builder_config.try_settings(
+ is_compile_only = True,
+ ),
branch_selector = branches.STANDARD_MILESTONE,
builderless = not settings.is_main,
main_list_view = "try",
--
2.37.0

View File

@ -0,0 +1,77 @@
From b81edbf02a6ab821e51ba5128b3984fc2e8653c2 Mon Sep 17 00:00:00 2001
From: Rebekah Potter <rbpotter@chromium.org>
Date: Wed, 22 Jun 2022 00:39:37 +0000
Subject: [PATCH 31/59] [M102] Print Preview: Fix missing destinations in
dialog
Print Preview's dialog fails to display destinations in cases where all
printers have already been loaded into the backing destination store
before the dialog is opened. This can happen if users have all printer
types represented in their recent printers + system default printer, as
such printers are pre-loaded at startup to populate the dropdown. Note
the system default printer is a local/native printer.
This bug previously did not manifest because users did not have an
extension, privet, and cloud printer all in their recent destinations.
However, with the removal of privet and cloud printer types, this bug
could be triggered by simply having a recent extension printer + having
a system default native printer.
(cherry picked from commit 76e2dc10bc759469dcaea1604a582fd2c6bd55fa)
Bug: 1330678
Change-Id: Ia0684b908690cca6691c9d44ad94296dadfb9536
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3696838
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1012174}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3698743
Cr-Commit-Position: refs/branch-heads/5005@{#1190}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../resources/print_preview/ui/destination_dialog.ts | 7 ++++++-
.../resources/print_preview/ui/destination_dialog_cros.ts | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/chrome/browser/resources/print_preview/ui/destination_dialog.ts b/chrome/browser/resources/print_preview/ui/destination_dialog.ts
index 64ededd87966..2b8ad610c167 100644
--- a/chrome/browser/resources/print_preview/ui/destination_dialog.ts
+++ b/chrome/browser/resources/print_preview/ui/destination_dialog.ts
@@ -174,8 +174,13 @@ export class PrintPreviewDestinationDialogElement extends
this.metrics_ = MetricsContext.destinationSearch();
}
this.$.dialog.showModal();
- this.loadingDestinations_ = this.destinationStore === undefined ||
+ const loading = this.destinationStore === undefined ||
this.destinationStore.isPrintDestinationSearchInProgress;
+ if (!loading) {
+ // All destinations have already loaded.
+ this.updateDestinations_();
+ }
+ this.loadingDestinations_ = loading;
this.metrics_.record(DestinationSearchBucket.DESTINATION_SHOWN);
}
diff --git a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts
index a164805bde4a..4c7b53daafc0 100644
--- a/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts
+++ b/chrome/browser/resources/print_preview/ui/destination_dialog_cros.ts
@@ -293,8 +293,13 @@ export class PrintPreviewDestinationDialogCrosElement extends
this.metrics_ = MetricsContext.destinationSearch();
}
this.$.dialog.showModal();
- this.loadingDestinations_ = this.destinationStore === undefined ||
+ const loading = this.destinationStore === undefined ||
this.destinationStore.isPrintDestinationSearchInProgress;
+ if (!loading) {
+ // All destinations have already loaded.
+ this.updateDestinations_();
+ }
+ this.loadingDestinations_ = loading;
this.metrics_.record(DestinationSearchBucket.DESTINATION_SHOWN);
}
--
2.37.0

View File

@ -0,0 +1,28 @@
From d40c1c345c6c905254498a9622b8cd89297dd0f2 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Wed, 22 Jun 2022 01:00:40 +0000
Subject: [PATCH 32/59] Incrementing VERSION to 102.0.5005.137
Change-Id: I6f8a3d5bee97dabe89b4660a3b1593418851091f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715133
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1191}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index ef7c482c8d42..96ae4bfab48f 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=136
+PATCH=137
--
2.37.0

View File

@ -0,0 +1,807 @@
From 1bca1691d091c6cf48d290bdb6abdf1549a228c2 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Wed, 22 Jun 2022 14:27:36 +0000
Subject: [PATCH 33/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I05ee4132f9aa5149e40cfae97d5aad0f20fe33e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3715647
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1192}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_fa.xtb | 2 +-
ash/strings/ash_strings_uk.xtb | 2 +-
.../android_webapk_strings_uk.xtb | 2 +-
.../app/resources/generated_resources_eu.xtb | 2 +-
.../app/resources/generated_resources_hu.xtb | 2 +-
.../app/resources/generated_resources_te.xtb | 4 +-
.../app/resources/generated_resources_zu.xtb | 4 +-
.../android_chrome_strings_ml.xtb | 2 +-
.../android_chrome_strings_uk.xtb | 2 +-
chromeos/strings/chromeos_strings_ml.xtb | 2 +-
chromeos/strings/chromeos_strings_te.xtb | 4 +-
.../translations/browser_ui_strings_uk.xtb | 2 +-
components/strings/components_strings_uk.xtb | 2 +-
components/strings/components_strings_zu.xtb | 8 +-
.../translations/ui_chromeos_strings_zu.xtb | 152 +++++++++---------
15 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/ash/strings/ash_strings_fa.xtb b/ash/strings/ash_strings_fa.xtb
index 297fa02a8dcc..c36debe1ef20 100644
--- a/ash/strings/ash_strings_fa.xtb
+++ b/ash/strings/ash_strings_fa.xtb
@@ -374,7 +374,7 @@
<translation id="3217205077783620295">دکمه میزان صدا فعال است، با تغییر وضعیت صامت می‌شود.</translation>
<translation id="3226991577105957773">+<ph name="COUNT" /> مورد دیگر</translation>
<translation id="3227137524299004712">میکروفن</translation>
-<translation id="324366796737464147">کاهش صدای محیط</translation>
+<translation id="324366796737464147">حذف نوفه زمینه</translation>
<translation id="3249513730522716925">پنجره <ph name="WINDOW_TITLE" /> از میز <ph name="ACTIVE_DESK" /> به میز <ph name="TARGET_DESK" /> منتقل شد</translation>
<translation id="3252573918265662711">راه‌اندازی</translation>
<translation id="3255483164551725916">What can you do? (چه کاری می‌توانی انجام دهی؟)</translation>
diff --git a/ash/strings/ash_strings_uk.xtb b/ash/strings/ash_strings_uk.xtb
index f6bbbbe31669..9762292db963 100644
--- a/ash/strings/ash_strings_uk.xtb
+++ b/ash/strings/ash_strings_uk.xtb
@@ -179,7 +179,7 @@
<translation id="1978498689038657292">Ввести текст</translation>
<translation id="1989113344093894667">Не вдається записати контент</translation>
<translation id="1990046457226896323">Файли живих субтитрів завантажено</translation>
-<translation id="1993072747612765854">Докладніше про останнє оновлення додатка <ph name="SYSTEM_APP_NAME" /></translation>
+<translation id="1993072747612765854">Докладніше про останнє оновлення <ph name="SYSTEM_APP_NAME" /></translation>
<translation id="1998100899771863792">Поточний робочий стіл</translation>
<translation id="2001444736072756133">Шукайте <ph name="CATEGORY" />, файли, додатки тощо.</translation>
<translation id="2016340657076538683">Введіть повідомлення</translation>
diff --git a/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb b/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb
index 49c8e02806af..f8d0f3f47a65 100644
--- a/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb
+++ b/chrome/android/webapk/strings/translations/android_webapk_strings_uk.xtb
@@ -5,7 +5,7 @@
<translation id="1700971771753530690">Щоб запустити <ph name="APP_NAME" />, потрібен такий додаток:</translation>
<translation id="2697679025356221813">Щоб запустити <ph name="APP_NAME" />, потрібен веб-переглядач</translation>
<translation id="3858759029325727987">Виберіть веб-переглядач, який підтримує цей додаток:</translation>
-<translation id="4165986682804962316">Налаштування сайту</translation>
+<translation id="4165986682804962316">Налаштування сайтів</translation>
<translation id="6377677440246641805"><ph name="BROWSER_NAME" />\nНе підтримується</translation>
<translation id="7671141431838911305">INSTALL</translation>
<translation id="8252328707312954493">ЗАКРИТИ</translation>
diff --git a/chrome/app/resources/generated_resources_eu.xtb b/chrome/app/resources/generated_resources_eu.xtb
index 3bb13d525fef..51abc041b8fc 100644
--- a/chrome/app/resources/generated_resources_eu.xtb
+++ b/chrome/app/resources/generated_resources_eu.xtb
@@ -7099,7 +7099,7 @@ Esleipen bat kentzeko, berriz, sakatu esleipen bat daukan erabilerraztasun-eteng
<translation id="7974936243149753750">Bilatu gainetik</translation>
<translation id="7975504106303186033">Chrome Education-eko gailu hau G Suite for Education-eko kontu batekin erregistratu behar duzu. Beste kontu bat erregistratzeko, joan g.co/workspace/edusignup helbidera.</translation>
<translation id="7978412674231730200">Gako pribatua</translation>
-<translation id="7978450511781612192">Zure Google-ko kontuen saioa amaituko da. Aurrerantzean, ez dira sinkronizatuko laster-markak, historia, pasahitzak eta beste.</translation>
+<translation id="7978450511781612192">Zure Google-ko kontuetako saioa amaituko da. Aurrerantzean, ez dira sinkronizatuko laster-markak, historia, pasahitzak eta beste.</translation>
<translation id="7980084013673500153">Erreproduzigai IDa: <ph name="ASSET_ID" /></translation>
<translation id="7981313251711023384">Aurrekargatu orriak azkarrago arakatzeko eta bilatzeko</translation>
<translation id="798145602633458219">Erantsi <ph name="SUGGESTION_NAME" /> iradokizuna bilaketa-koadroan</translation>
diff --git a/chrome/app/resources/generated_resources_hu.xtb b/chrome/app/resources/generated_resources_hu.xtb
index e47d89c523d0..b68b291d5234 100644
--- a/chrome/app/resources/generated_resources_hu.xtb
+++ b/chrome/app/resources/generated_resources_hu.xtb
@@ -3850,7 +3850,7 @@ Elindítja a következőt: <ph name="CONTROL_PANEL_APPLET_NAME" />?</translation
<translation id="4701335814944566468">Tegnap tekintette meg</translation>
<translation id="4701540735981103145">A rendszergazda letiltotta a bejelentkezést</translation>
<translation id="4707337002099455863">Mindig, minden webhelyen</translation>
-<translation id="4708794300267213770">Lezárási képernyő megjelenítése, az alvó módból történő felébresztéskor</translation>
+<translation id="4708794300267213770">Lezárási képernyő megjelenítése az alvó módból történő felébresztéskor</translation>
<translation id="4708849949179781599">Kilépés a <ph name="PRODUCT_NAME" />-ból</translation>
<translation id="4711638718396952945">A beállítások visszaállítása</translation>
<translation id="47158868804223727">Kattintson a csoport nevére a kibontásához vagy összecsukásához</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index 8e1f07c5d7d1..8af2cc506d63 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -3305,7 +3305,7 @@
<translation id="4144468798716165316">క్విక్ కమాండ్స్</translation>
<translation id="4146026355784316281">ఎల్లప్పుడూ సిస్టమ్ వ్యూయర్‌తో తెరువు</translation>
<translation id="4146785383423576110">రీసెట్ చేసి హానికరమైన వాటిని తీసివేయండి</translation>
-<translation id="4147897805161313378">Google ఫోటోలు</translation>
+<translation id="4147897805161313378">Google Photos</translation>
<translation id="4147911968024186208">దయచేసి మళ్లీ ప్రయత్నించండి. మీకు ఈ ఎర్రర్ మళ్లీ కనిపిస్తే, దయచేసి మీ మద్దతు ప్రతినిధిని సంప్రదించండి.</translation>
<translation id="4150201353443180367">డిస్‌ప్లే</translation>
<translation id="4150569944729499860">స్క్రీన్ కాంటెక్ట్స్</translation>
@@ -5615,7 +5615,7 @@
<translation id="6499143127267478107">ప్రాక్సీ స్క్రిప్ట్‌లో హోస్ట్‌ను పరిష్కరిస్తోంది...</translation>
<translation id="6499764981457476645">సమీపంలో పరికరాలు ఏవీ కనుగొనబడలేదు</translation>
<translation id="6501957628055559556">అన్ని కంటైనర్లు</translation>
-<translation id="650266656685499220">ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google ఫోటోలు'కు వెళ్లండి</translation>
+<translation id="650266656685499220">ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google Photos'కు వెళ్లండి</translation>
<translation id="6503077044568424649">ఎక్కువగా సందర్శించేవి</translation>
<translation id="650457560773015827">ఎడమవైపు బటన్</translation>
<translation id="6504601948739128893">మీ పరికరంలో ఇన్‌స్టాల్ చేయబడిన ఫాంట్‌లను ఉపయోగించడానికి సైట్‌లకు అనుమతి లేదు</translation>
diff --git a/chrome/app/resources/generated_resources_zu.xtb b/chrome/app/resources/generated_resources_zu.xtb
index b56ac630b7ab..65e9fa24ccf3 100644
--- a/chrome/app/resources/generated_resources_zu.xtb
+++ b/chrome/app/resources/generated_resources_zu.xtb
@@ -3700,7 +3700,7 @@ I-<ph name="DOMAIN" /> idinga ukuba ugcine ikhadi lakho elimsathi lifakiwe.</tra
<translation id="4559617833001311418">Leli sayithi lifinyelela kuzinzwa zakho zokunyakaza noma zokukhanya.</translation>
<translation id="4561893854334016293">Azikho izimvume ezishintshwe kamuva</translation>
<translation id="4562155214028662640">Engeza izigxivizo zeminwe</translation>
-<translation id="4563210852471260509">Ulimi lokufaka lasekuqaleni isi-Chinese</translation>
+<translation id="4563210852471260509">Ulimi lokufaka lasekuqaleni Chinese</translation>
<translation id="4563880231729913339">Umunwe 3</translation>
<translation id="4564245002465020751">Qedela ukusetha efonini yakho</translation>
<translation id="4565377596337484307">Fihla iphasiwedi</translation>
@@ -7564,7 +7564,7 @@ Gcina ifayela lakho elingukhiye endaweni evikelekile. Uzolidinga ukuze udale izi
<translation id="8418445294933751433">Bonisa njengethebhu</translation>
<translation id="8419098111404128271">Imiphumela yosesho ye-'<ph name="SEARCH_TEXT" />'</translation>
<translation id="8420308167132684745">Hlela okufakwa kusichazamazwi</translation>
-<translation id="8421361468937925547">Okushuthwe Bukhoma (I-English kuphela)</translation>
+<translation id="8421361468937925547">Okushuthwe Bukhoma (English kuphela)</translation>
<translation id="8422787418163030046">Ithreyi alikho</translation>
<translation id="8424250197845498070">Ivinjwe Ukuvikela Okuthuthukile</translation>
<translation id="8425213833346101688">Guqula</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
index 3a8d37507b34..5ae3d51061a1 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
@@ -904,7 +904,7 @@
സ്വകാര്യതാ സാൻഡ്‌ബോക്‌സ് ട്രയലുകൾ ഇപ്പോഴും സജീവ വികസന ഘട്ടത്തിലാണ്, തിരഞ്ഞെടുത്ത പ്രദേശങ്ങളിൽ അത് ലഭ്യമാണ്. ഇപ്പോഴത്തേക്ക്, മൂന്നാം കക്ഷി കുക്കികൾ പോലുള്ള നിലവിലെ വെബ് സാങ്കേതിക വിദ്യകൾ ഉപയോഗിക്കുന്നത് തുടരുന്നതിനൊപ്പം സൈറ്റുകൾക്ക് സ്വകാര്യതാ സാൻഡ്‌ബോക്‌സ് പരീക്ഷിക്കാവുന്നതാണ്.</translation>
<translation id="6039379616847168523">അടുത്ത ടാബിലേക്ക് പോകുക</translation>
<translation id="6040143037577758943">അടയ്ക്കുക</translation>
-<translation id="604124094241169006">സ്വപ്രേരിതം</translation>
+<translation id="604124094241169006">സ്വയമേവ</translation>
<translation id="6042308850641462728">കൂടുതൽ</translation>
<translation id="604996488070107836">ഒരു അജ്ഞാതമായ പിശക് കാരണം <ph name="FILE_NAME" /> ഡൗൺലോഡ് ചെയ്യാനായില്ല.</translation>
<translation id="605721222689873409">YY</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
index 0c3702ce921c..29714f8bb56e 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb
@@ -568,7 +568,7 @@
<translation id="4137746084635924146">Поточна мова пристрою</translation>
<translation id="4141536112466364990">Ознайомтеся з Chrome</translation>
<translation id="4162867837470729563">Список параметрів спільного доступу відкрито на всю висоту.</translation>
-<translation id="4165986682804962316">Налаштування сайту</translation>
+<translation id="4165986682804962316">Налаштування сайтів</translation>
<translation id="4170011742729630528">Служба не доступна. Повторіть спробу пізніше.</translation>
<translation id="4181841719683918333">Мови</translation>
<translation id="4195643157523330669">Відкрити в новій вкладці</translation>
diff --git a/chromeos/strings/chromeos_strings_ml.xtb b/chromeos/strings/chromeos_strings_ml.xtb
index 8c796fdfd303..f91c5b11ebb5 100644
--- a/chromeos/strings/chromeos_strings_ml.xtb
+++ b/chromeos/strings/chromeos_strings_ml.xtb
@@ -449,7 +449,7 @@
<translation id="6037291330010597344">സ്‌കാനറിന്റെ ഡോക്യുമെന്റ് ഫീഡർ ശൂന്യമാണ്. ഡോക്യുമെന്റുകൾ ചേർത്ത് വീണ്ടും ശ്രമിക്കുക.</translation>
<translation id="6040143037577758943">അടയ്ക്കുക</translation>
<translation id="6040852767465482106">അജ്ഞാത ഐഡന്‍റിറ്റി</translation>
-<translation id="604124094241169006">സ്വപ്രേരിതം</translation>
+<translation id="604124094241169006">സ്വയമേവ</translation>
<translation id="6048107060512778456">പ്രിന്റ് ചെയ്യാനായില്ല - പേപ്പർ ജാമായിരിക്കുന്നു</translation>
<translation id="6050189528197190982">ഗ്രേസ്‌കെയിൽ</translation>
<translation id="6058625436358447366">പൂർത്തിയാക്കാൻ നിങ്ങളുടെ പഴയ പാസ്‌വേഡും പുതിയ പാസ്‌വേഡും നൽകുക</translation>
diff --git a/chromeos/strings/chromeos_strings_te.xtb b/chromeos/strings/chromeos_strings_te.xtb
index 590de1511a1c..49ee3f34cf34 100644
--- a/chromeos/strings/chromeos_strings_te.xtb
+++ b/chromeos/strings/chromeos_strings_te.xtb
@@ -263,7 +263,7 @@
<translation id="4131410914670010031">నలుపు మరియు తెలుపు</translation>
<translation id="4140251671072434548">RMA సర్వర్‌ను అన్‌లాక్ చేయండి</translation>
<translation id="4145784616224233563">HTTP ఫైర్‌వాల్</translation>
-<translation id="4147897805161313378">Google ఫోటోలు</translation>
+<translation id="4147897805161313378">Google Photos</translation>
<translation id="4155551848414053977">స్కానర్ ఆన్ చేయబడి ఉందని, అలాగే నెట్‌వర్క్ లేదా ప్రత్యక్ష కనెక్షన్ ద్వారా అందుబాటులో ఉందని నిర్ధారించుకోండి</translation>
<translation id="4170180284036919717">ఫోటో తీయండి</translation>
<translation id="4170700058716978431">విఫలమైంది</translation>
@@ -498,7 +498,7 @@
<translation id="6480327114083866287"><ph name="MANAGER" /> ద్వారా మేనేజ్ చేయబడుతోంది</translation>
<translation id="649050271426829538">ఆగిపోయింది - కాగితం జామ్ అయింది</translation>
<translation id="6500818810472529210">Google Searchలో ఫలితాన్ని చూడండి</translation>
-<translation id="650266656685499220">ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google ఫోటోలు'కు వెళ్లండి</translation>
+<translation id="650266656685499220">ఆల్బమ్‌లను క్రియేట్ చేయడానికి, 'Google Photos'కు వెళ్లండి</translation>
<translation id="6516990319416533844">బ్యాటరీ ఛార్జ్ అయ్యే రేట్‌ను పరీక్షించడానికి, కొంత వ్యవధి పాటు మీ బ్యాటరీని తగ్గనివ్వండి</translation>
<translation id="6517239166834772319">అన్వేషణ</translation>
<translation id="6527081081771465939">తెలియని WiFi భద్రతా ప్రోటోకాల్</translation>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb
index 9686c58a9344..602bf901bd4c 100644
--- a/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb
+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb
@@ -126,7 +126,7 @@
<translation id="4008040567710660924">Дозволити файли cookie для конкретного сайту.</translation>
<translation id="4046123991198612571">Наступна композиція</translation>
<translation id="4149994727733219643">Спрощений перегляд веб-сторінок</translation>
-<translation id="4165986682804962316">Налаштування сайту</translation>
+<translation id="4165986682804962316">Налаштування сайтів</translation>
<translation id="4194328954146351878">Запитувати, перш ніж дозволяти сайтам переглядати й змінювати інформацію на пристроях NFC (рекомендовано)</translation>
<translation id="4200726100658658164">Відкрити налаштування доступу до моїх геоданих</translation>
<translation id="4226663524361240545">Коли надходитимуть сповіщення, пристрій може вібрувати</translation>
diff --git a/components/strings/components_strings_uk.xtb b/components/strings/components_strings_uk.xtb
index a619ef148117..7b7f783cf635 100644
--- a/components/strings/components_strings_uk.xtb
+++ b/components/strings/components_strings_uk.xtb
@@ -1155,7 +1155,7 @@
<translation id="4152318981910038897">{COUNT,plural, =1{Сторінка 1}one{Сторінка {COUNT}}few{Сторінка {COUNT}}many{Сторінка {COUNT}}other{Сторінка {COUNT}}}</translation>
<translation id="4154664944169082762">Відбитки</translation>
<translation id="4159784952369912983">Пурпуровий</translation>
-<translation id="4165986682804962316">Налаштування сайту</translation>
+<translation id="4165986682804962316">Налаштування сайтів</translation>
<translation id="4171400957073367226">Недійсний підпис для підтвердження</translation>
<translation id="4171489848299289778"><ph name="RESULT_MODIFIED_DATE" /> <ph name="RESULT_OWNER" />, <ph name="RESULT_PRODUCT_SOURCE" /></translation>
<translation id="4172051516777682613">Завжди показувати</translation>
diff --git a/components/strings/components_strings_zu.xtb b/components/strings/components_strings_zu.xtb
index f540914060f7..81baebec6ab4 100644
--- a/components/strings/components_strings_zu.xtb
+++ b/components/strings/components_strings_zu.xtb
@@ -837,7 +837,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum
<translation id="3249151924975132674">Izimali mboleko zabafundi kanye nezimali zasekolishi</translation>
<translation id="3249845759089040423">I-Groovy</translation>
<translation id="3250640885957938546">Ukukhangisa nokumaketha</translation>
-<translation id="3252266817569339921">Isi-French</translation>
+<translation id="3252266817569339921">French</translation>
<translation id="3256863843508922226">Ukuyeka emsebenzini nepenshini</translation>
<translation id="3259648571731540213"><ph name="CREATE_GOOGLE_CALENDAR_EVENT_FOCUSED_FRIENDLY_MATCH_TEXT" />, cindezela u-Tab bese u-Enter ukuze udale umcimbi omusha ngokushesha ku-Google Calendar</translation>
<translation id="3261488570342242926">Funda mayelana namakhadi we-virtual</translation>
@@ -1636,7 +1636,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum
<translation id="541416427766103491">Isitaki esingu-4</translation>
<translation id="5421136146218899937">Sula idatha yokudlulisa amehlo...</translation>
<translation id="5426179911063097041">I-<ph name="SITE" /> ifuna ukukuthumelela izaziso</translation>
-<translation id="5428105026674456456">Isi-Spanish</translation>
+<translation id="5428105026674456456">Spanish</translation>
<translation id="5430298929874300616">Susa ibhukhimakhi</translation>
<translation id="5439770059721715174">Iphutha lokuqinisekisa i-schema ku-"<ph name="ERROR_PATH" />": <ph name="ERROR" /></translation>
<translation id="5443468954631487277">I-oda elingemuva libheke phezulu</translation>
@@ -2655,7 +2655,7 @@ Imininingwane engeziwe:
<translation id="8294431847097064396">Umthombo</translation>
<translation id="8296205692406981542">Izifunda zamaphakhi nezingadi</translation>
<translation id="8298115750975731693">I-Wi-Fi oyisebenzisayo (<ph name="WIFI_NAME" />) ingakudinga ukuthi uvakashele ku-<ph name="BEGIN_BOLD" /><ph name="LOGIN_URL" /><ph name="END_BOLD" />.</translation>
-<translation id="8299269255470343364">Isi-Japanese</translation>
+<translation id="8299269255470343364">Japanese</translation>
<translation id="8303854710873047864">Isigaba se-"<ph name="SECTION" />" esibonisiwe</translation>
<translation id="830498451218851433">Goqa ngohafu</translation>
<translation id="8307358339886459768">Isithombe esincane</translation>
@@ -2752,7 +2752,7 @@ Imininingwane engeziwe:
<translation id="8625384913736129811">Londoloza leli khadi kule divayisi</translation>
<translation id="865032292777205197">izinzwa zokunyakaza</translation>
<translation id="8663226718884576429">Isifinyezo se-oda, <ph name="TOTAL_LABEL" />, Imininingwane eminingi</translation>
-<translation id="8666678546361132282">I-English</translation>
+<translation id="8666678546361132282">English</translation>
<translation id="8669306706049782872">Sebenzisa ulwazi olumayelana nezikrini zakho ukuze uvule futhi ubeke amawindi</translation>
<translation id="867224526087042813">Isiginesha</translation>
<translation id="8672264262457010862">Amabhizinisi nomkhakha</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb
index 1f1ddb2eb0b1..474eda5c24ca 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb
@@ -10,8 +10,8 @@
<translation id="1119069657431255176">Ingobo yomlando yotiyela wokuminyanisa i-Bzip2</translation>
<translation id="1119447706177454957">Iphutha langaphakathi</translation>
<translation id="1120073797882051782">I-Hangul Romaja</translation>
-<translation id="112387589102719461">I-English (US) enekhibhodi yomhleli we-Dvorak</translation>
-<translation id="1134697384939541955">I-English (US) enekhibhodi enwetshiwe</translation>
+<translation id="112387589102719461">English (US) enekhibhodi yomhleli we-Dvorak</translation>
+<translation id="1134697384939541955">English (US) enekhibhodi enwetshiwe</translation>
<translation id="1148097584170732637"><ph name="FILE_COUNT" /> itholakele.
<ph name="LINE_BREAK1" />
Asikho isikhala esanele esitholakalayo kusitoreji sendawo. U-<ph name="FILE_SIZE" /> ngaphezulu uyadingeka.
@@ -51,7 +51,7 @@
<translation id="1383876407941801731">Sesha</translation>
<translation id="1395262318152388157">Funa isilayida</translation>
<translation id="1399511500114202393">Asikho isitifiketi somsebenzisi</translation>
-<translation id="1404323374378969387">Isi-Norwegian</translation>
+<translation id="1404323374378969387">Norwegian</translation>
<translation id="1433628812591023318">Ukuze udedele amafayela ku-Parallels Desktop, ifayela kufanele lihanjiswe kumafayela e-Windows.</translation>
<translation id="1435838927755162558">Yabelana ngefolda ne-Parallels Desktop</translation>
<translation id="1439919885608649279">Umuntu onezimbali</translation>
@@ -60,7 +60,7 @@
<translation id="1482884275703521657">Isi-Finnish</translation>
<translation id="148466539719134488">I-Swiss</translation>
<translation id="1497522201463361063">Ayikwazi ukuqamba kabusha i-"<ph name="FILE_NAME" />". <ph name="ERROR_MESSAGE" /></translation>
-<translation id="1499943022354839699">I-English (US) enekhibhodi ye-Dvorak</translation>
+<translation id="1499943022354839699">English (US) enekhibhodi ye-Dvorak</translation>
<translation id="1515909359182093592"><ph name="INPUT_LABEL" /> - Umsingathi</translation>
<translation id="1521655867290435174">Amashidi we-Google</translation>
<translation id="1538729222189715449">Ivula amafayela e-Linux...</translation>
@@ -74,7 +74,7 @@
<translation id="1620510694547887537">Ikhamela</translation>
<translation id="162175252992296058">Isi-Portuguese nge-US International keyboard</translation>
<translation id="1629521517399325891">Isitifiketi somsebenzisi asitholakali ukufakazela ubuqiniso inethiwekhi.</translation>
-<translation id="1641780993263690097">Isi-Chinese Pinyin</translation>
+<translation id="1641780993263690097">Chinese Pinyin</translation>
<translation id="1646019627374511909">Yenza amafayela angu-<ph name="NUMBER_OF_ITEMS" /> atholakale ngokungaxhunyiwe kwi-inthanethi</translation>
<translation id="164969095109328410">Idivivayisi ye-Chrome</translation>
<translation id="1661867754829461514">Iphinikhodi ayikho</translation>
@@ -88,7 +88,7 @@
<translation id="1722687688096767818">Ingeza Iphrofayela...</translation>
<translation id="1726100011689679555">Amagama wamasevisi</translation>
<translation id="1729953886957086472">Isi-German (Germany)</translation>
-<translation id="1730235522912993863">Isi-Chinese Cangjie</translation>
+<translation id="1730235522912993863">Chinese Cangjie</translation>
<translation id="1731889557567069540">izinto ezingu-<ph name="NUMBER_OF_ITEMS" /> zikopishiwe.</translation>
<translation id="174173592514158117">Bonisa onke amafolda e-Google Play</translation>
<translation id="1742316578210444689">Ukugugulwa kwamaletha kwesi-Hebrew</translation>
@@ -121,7 +121,7 @@
<translation id="1995337122023280937">Iya endaweni yefayela</translation>
<translation id="2001796770603320721">Phatha kuDrayivu</translation>
<translation id="2009067268969781306">Ukufometha idrayivu kuzosula yonke idatha elondolozwe kuyo. Lesi senzo asikwazi ukuhlehliswa.</translation>
-<translation id="2025955442973426285">Isi-Tigrinya</translation>
+<translation id="2025955442973426285">Tigrinya</translation>
<translation id="2028997212275086731">Ingobo yomlando ye-RAR</translation>
<translation id="2036414735548252477">Ingobo yomlando yotiyela eminyanisiwe ye-LZMA</translation>
<translation id="2037845485764049925">Isi-Russian</translation>
@@ -143,7 +143,7 @@
<translation id="2184934335987813305">Isi-Portuguese nge-US International PC keyboard</translation>
<translation id="2198315389084035571">isi-Sipmlified Chinese</translation>
<translation id="2208158072373999562">Ingobo yomlando yeziphu</translation>
-<translation id="22085916256174561">Isi-Korean</translation>
+<translation id="22085916256174561">Korean</translation>
<translation id="2208919847696382164">Faka nge-Linux</translation>
<translation id="2225536596944493418">Ingabe ufuna ukususa izinto ze-<ph name="NUMBER_OF_ITEMS" />?</translation>
<translation id="2230062665678605299">Ayikwazi ukudala ifolda le-"<ph name="FOLDER_NAME" />". <ph name="ERROR_MESSAGE" /></translation>
@@ -158,7 +158,7 @@
<translation id="2305020378527873881"><ph name="VOLUME_NAME" /> ikhishiwe.</translation>
<translation id="2307462900900812319">Lungiselela inethiwekhi</translation>
<translation id="2325650632570794183">Uhlobo lwefayela alusekelwe. Sicela uvakashele isitolo sewebhu se-Chrome ukuze uthole uhlelo lokusebenza olungavula lolu hlobo lwefayela.</translation>
-<translation id="2326539130272988168">Isi-Bulgaria</translation>
+<translation id="2326539130272988168">Bulgarian</translation>
<translation id="2352947182261340447">Asikho isikhala esanele kusitoreji sendawo.</translation>
<translation id="23721837607121582">Landa iphroayela yeselula, Inethiwekhi engu-<ph name="NETWORK_INDEX" /> kwezingu-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" /></translation>
<translation id="2377319039870049694">Shintshela ekubukeni kohlu</translation>
@@ -203,7 +203,7 @@
<translation id="2676946222714718093">Idlala ku</translation>
<translation id="2718540689505416944">Faka uhlelo lokusebenza nge-Linux</translation>
<translation id="2719020180254996569">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="CONNECTION_STATUS" />, imininingwane</translation>
-<translation id="2724954091494693138">Isi-Turkish esinekhibhodi ye-F</translation>
+<translation id="2724954091494693138">Turkish esinekhibhodi ye-F</translation>
<translation id="2732839045120506979">I-Vietnamese VNI</translation>
<translation id="2735623501230989521">Nikeza i-Parallels Desktop imvume yokufinyelela amafayela kufolda ye-<ph name="FOLDER_NAME" /></translation>
<translation id="2771816809568414714">Ushizi</translation>
@@ -220,22 +220,22 @@
<translation id="2888807692577297075">Azikho izinto ezifana ne-&lt;b&gt;"<ph name="SEARCH_STRING" />"&lt;/b&gt;</translation>
<translation id="2894654529758326923">Ulwazi</translation>
<translation id="2902734494705624966">Inwetshwelwe i-US</translation>
-<translation id="290843123675549676">Isi-Marathi</translation>
+<translation id="290843123675549676">Marathi</translation>
<translation id="2923240520113693977">Isi-Estonian</translation>
-<translation id="2938685643439809023">Isi-Mongolian</translation>
+<translation id="2938685643439809023">Mongolian</translation>
<translation id="2943503720238418293">Sebenzisa igama elifushane</translation>
<translation id="2949781154072577687">Ifometha i-<ph name="DRIVE_NAME" />...</translation>
<translation id="2951236788251446349">I-Jellyfish</translation>
<translation id="2984337792991268709">Namhlanje ngo-<ph name="TODAY_DAYTIME" /></translation>
<translation id="2994320653639462337">Ibuyisela izinto ezingu-<ph name="COUNT" />...</translation>
<translation id="2994669386200004489">Ayikwazanga ukwenza isipele i-<ph name="FILE_NAME" /></translation>
-<translation id="299638574917407533">Isi-French (Canada)</translation>
+<translation id="299638574917407533">French (Canada)</translation>
<translation id="3003189754374775221">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="NETWORK_PROVIDER_NAME" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, Xhuma</translation>
<translation id="3003633581067744647">Shintshela ekubukeni kwesithonjana</translation>
<translation id="3016566519832145558">Isexwayiso: Lamafayela awesikhashana futhi angase asuswe ngokuzenzekelayo ukukhulula isikhala sediski.</translation>
<translation id="3029114385395636667">Nika amandla i-Google Amadokhumenti angaxhumekile ku-inthanethi ukwenza Amadokhumenti, AmaSpredishithi namaSlayidi kutholakale ngokungaxhunyiwe kwi-inthanethi.</translation>
<translation id="303198083543495566">Ukuma komhlaba</translation>
-<translation id="3047197340186497470">Isi-Chinese Dayi</translation>
+<translation id="3047197340186497470">Chinese Dayi</translation>
<translation id="3057861065630527966">Yenza isipele izithombe zakho namavidiyo</translation>
<translation id="3067790092342515856">Amafayela e-Windows</translation>
<translation id="3078461028045006476">Yabelana nge-<ph name="EXTENSION_NAME" /></translation>
@@ -254,13 +254,13 @@
<translation id="3205852408225871810">Isi-Portuguese (Brazil)</translation>
<translation id="3224239078034945833">Izilimi eziningi ze-Canadian</translation>
<translation id="3236289833370040187">Ubunikazi buzodluliselwa ku-<ph name="DESTINATION_DOMAIN" />.</translation>
-<translation id="3241720467332021590">Isi-Irish</translation>
+<translation id="3241720467332021590">Irish</translation>
<translation id="3245321423178950146">Umculi ongaziwa</translation>
<translation id="3248185426436836442">Ilindile</translation>
-<translation id="3252266817569339921">Isi-French</translation>
+<translation id="3252266817569339921">French</translation>
<translation id="3253225298092156258">Ayitholakali</translation>
<translation id="3254434849914415189">Khetha uhlelo lokusebenza oluzenzakalelayo lwamafayela we-<ph name="FILE_TYPE" />:</translation>
-<translation id="3255159654094949700">Isi-Arabic</translation>
+<translation id="3255159654094949700">Arabic</translation>
<translation id="3264582393905923483">Okuqukethwe</translation>
<translation id="3272909651715601089">Ayikwazanga ukuvula i-"<ph name="PATH" />"</translation>
<translation id="3280431534455935878">Iyalungiselela</translation>
@@ -268,15 +268,15 @@
<translation id="3290356915286466215">Okungaphephanga</translation>
<translation id="3291218047831493686">Xhuma kule nethiwekhi ukuze ushintshe amasethingi wokukhiya i-SIM</translation>
<translation id="3295357220137379386">Idivayisi imatasa</translation>
-<translation id="3296763833017966289">Isi-Georgian</translation>
-<translation id="3307875152560779385">Isi-Ukrain</translation>
+<translation id="3296763833017966289">Georgian</translation>
+<translation id="3307875152560779385">Ukrainian</translation>
<translation id="3326821416087822643">Izipha i-<ph name="FILE_NAME" />...</translation>
<translation id="3335337277364016868">Unyaka okurekhodwe ngawo</translation>
<translation id="3353984535370177728">Khetha ifolda okumele uyilayishe</translation>
<translation id="3356580349448036450">Qedile</translation>
<translation id="3358452157379365236">Isiginci</translation>
<translation id="3368922792935385530">Ixhunyiwe</translation>
-<translation id="3382143449143186018">Isi-Nepali ngekhibhodi ye-InScript</translation>
+<translation id="3382143449143186018">Nepali ngekhibhodi ye-InScript</translation>
<translation id="338691029516748599">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="SECURITY_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, kuphethwe umlawuli wakho, xhuma</translation>
<translation id="3408072735282270043">Yenza kusebenze, i-<ph name="NETWORK_NAME" /></translation>
<translation id="3408236822532681288">Isi-German (Germany) esinekhibhodi ye-Neo 2</translation>
@@ -288,7 +288,7 @@
<translation id="3468522857997926824"><ph name="FILE_COUNT" /> izithombe zenziwe isipele ku-<ph name="BEGIN_LINK" />Google Drayivu<ph name="END_LINK" /></translation>
<translation id="3475447146579922140">Isipredishithi se-Google</translation>
<translation id="3479552764303398839">Hhayi manje</translation>
-<translation id="3486821258960016770">Isi-Mongolian</translation>
+<translation id="3486821258960016770">Mongolian</translation>
<translation id="3495304270784461826"><ph name="COUNT" /> amaphutha.</translation>
<translation id="3509680540198371098">Inethiwkehi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="SECURITY_STATUS" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, imininingwane</translation>
<translation id="3522708245912499433">Isi-Portuguese</translation>
@@ -296,9 +296,9 @@
<translation id="3527085408025491307">Ifolda</translation>
<translation id="3549797760399244642">Hamba ku-drive.google.com...</translation>
<translation id="3553048479571901246">Ukuze uvule amafayela nge-<ph name="APP_NAME" />, kukopishe kuqala kufolda lamafayela we-Windows.</translation>
-<translation id="3556731189587832921">I-English (US) enekhibhodi yamazwe ngamazwe ye-PC</translation>
+<translation id="3556731189587832921">English (US) enekhibhodi yamazwe ngamazwe ye-PC</translation>
<translation id="3567221313191587603">Khetha ifayela, bese uguqula ukuvula i-<ph name="OFFLINE_CHECKBOX_NAME" /> yokufinyelela ungaxhunyiwe ku-inthanethi</translation>
-<translation id="357479282490346887">Isi-Lithuanian</translation>
+<translation id="357479282490346887">Lithuanian</translation>
<translation id="3587482841069643663">Konke</translation>
<translation id="3592251141500063301">Ayikwazanga ukwenza i-<ph name="FILE_NAME" /> itholakale ngokungaxhunyiwe kwi-inthanethi</translation>
<translation id="3601151620448429694"><ph name="NETWORK_NAME" /> · <ph name="CARRIER_NAME" /></translation>
@@ -337,7 +337,7 @@
<translation id="3858860766373142691">Igama</translation>
<translation id="386548886866354912">Pakisha nge-<ph name="EXTENSION_NAME" /></translation>
<translation id="3866249974567520381">Incazelo</translation>
-<translation id="3899991606604168269">Isi-French (Canada) esinekhibhodi Yezilimi eziningi</translation>
+<translation id="3899991606604168269">French (Canada) esinekhibhodi Yezilimi eziningi</translation>
<translation id="3901991538546252627">Ixhumeka ku-<ph name="NAME" /></translation>
<translation id="3906232975181435906">Ifaka iphrofayela leselula, Inethiwekhi engu-<ph name="NETWORK_INDEX" /> kwangu-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" /></translation>
<translation id="3924145049010392604">I-Meta</translation>
@@ -347,21 +347,21 @@
<translation id="3958548648197196644">I-Kiwi</translation>
<translation id="3966388904776714213">Isidlali somsindo</translation>
<translation id="3971140002794351170">Landa iphrofayela yeselula, Inethiwekhi engu-<ph name="NETWORK_INDEX" /> kwezingu-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="NETWORK_PROVIDER_NAME" /></translation>
-<translation id="3973925058222872294">I-English (UK)</translation>
+<translation id="3973925058222872294">English (UK)</translation>
<translation id="3975895378829046965">I-Bangla Phonetic</translation>
<translation id="4002066346123236978">Isihloko</translation>
-<translation id="4017788180641807848">I-English (US) enekhibhodi ye-Workman</translation>
+<translation id="4017788180641807848">English (US) enekhibhodi ye-Workman</translation>
<translation id="4040753847560036377">I-PUK engalungile</translation>
<translation id="4057991113334098539">Yenza kusebenze...</translation>
-<translation id="4092890906744441904">Isi-Irish</translation>
+<translation id="4092890906744441904">Irish</translation>
<translation id="4124935795427217608">I-Unicorn</translation>
<translation id="4158739975813877944">Vula uhlu lwadlalayo</translation>
<translation id="4159731583141908892">kuhanjiswe okungu-<ph name="FILE_NAME" />.</translation>
<translation id="4186579485882418952">Nika Amandla Ungaxhumekile Ku-inthanethi</translation>
<translation id="4193154014135846272">I-Google dokhumenti</translation>
<translation id="4197674956721858839">Ukukhethwa kweziphu</translation>
-<translation id="4202378258276439759">Isi-Spanish (Latin America)</translation>
-<translation id="4202977638116331303">Isi-Georgian</translation>
+<translation id="4202378258276439759">Spanish (Latin America)</translation>
+<translation id="4202977638116331303">Georgian</translation>
<translation id="421017592316736757">Kumele ube ku-inthanethi ukuze ufinyelele kule fayela.</translation>
<translation id="4212740939091998969">Ifolda enegama "<ph name="FOLDER_NAME" />" isivele ikhona. Sicela ukhethe igama elihlukile.</translation>
<translation id="4215448920900139318">Yenza isipele <ph name="FILE_COUNT" /></translation>
@@ -373,7 +373,7 @@
<translation id="4302605047395093221">Noma ubani osebenzisa le divayisi kuzodingeka afake Iphinikhodi ukuze axhumeke kule nethiwekhi yeselula</translation>
<translation id="4309915981827077375">Ulwazi oluvamile</translation>
<translation id="432252891123397018">Isi-Romanian esinekhibhodi Evamile</translation>
-<translation id="4325128273762811722">Isi-Slovenian</translation>
+<translation id="4325128273762811722">Slovenian</translation>
<translation id="4326142238881453352">Ingcweti yezitshalo</translation>
<translation id="4326192123064055915">Ikhofi</translation>
<translation id="4336032328163998280">Ukusebenza kwekhophi kuhlulekile. <ph name="ERROR_MESSAGE" /></translation>
@@ -397,7 +397,7 @@
<translation id="4477002475007461989">Isi-Romanian</translation>
<translation id="4477219268485577442">Ifonethikhi yesi-Bulgarian</translation>
<translation id="4508265954913339219">Ukwenza kusebenze kuhlulekile</translation>
-<translation id="4509667233588080747">I-English (US) enekhibhodi yamazwe ngamazwe ye-Workman</translation>
+<translation id="4509667233588080747">English (US) enekhibhodi yamazwe ngamazwe ye-Workman</translation>
<translation id="4522570452068850558">Imininingwane</translation>
<translation id="4527800702232535228">Le folda yabiwa Nedeskithophu ye-Parallels</translation>
<translation id="4552678318981539154">Thenga isitoreji esiningi</translation>
@@ -421,17 +421,17 @@
<translation id="4690246192099372265">Isi-Swedish</translation>
<translation id="4693155481716051732">I-Sushi</translation>
<translation id="4694604912444486114">Inkawu</translation>
-<translation id="469612310041132144">Isi-Chinese Esisheshayo</translation>
+<translation id="469612310041132144">Chinese Esisheshayo</translation>
<translation id="4697043402264950621">Uhlu lwefayela luhlungwe nge-<ph name="COLUMN_NAME" /> nge-oda elikhuphukayo.</translation>
<translation id="4706042980341760088">Isi-Tamil esinekhibhodi ye-Typewriter</translation>
-<translation id="4711094779914110278">Isi-Turkish</translation>
+<translation id="4711094779914110278">Turkish</translation>
<translation id="4712283082407695269">Ivula i-"<ph name="PATH" />"</translation>
<translation id="4720185134442950733">Inethiwekhi yedatha yeselula</translation>
<translation id="4724850507808590449"><ph name="FILE_COUNT" /> izithombe ezenziwe isipele</translation>
<translation id="4725511304875193254">I-Corgi</translation>
<translation id="4732760563705710320">Uxolo, le vidiyo ayisekelwe yidivayisi yakho yokusakaza.</translation>
<translation id="4737050008115666127">Ukufika</translation>
-<translation id="4747271164117300400">Isi-Macedonian</translation>
+<translation id="4747271164117300400"> Macedonian</translation>
<translation id="4759238208242260848">Ukulanda</translation>
<translation id="4779041693283480986">Isi-Portuguese (Portugal)</translation>
<translation id="4779136857077979611">I-Onigiri</translation>
@@ -461,7 +461,7 @@
<translation id="4969785127455456148">Albhamu</translation>
<translation id="4973523518332075481">Sebenzisa igama elinezinhlamvu ezingu-<ph name="MAX_LENGTH" /> noma ngaphansi</translation>
<translation id="4973970068702235170">Ukuzipha kwehlulekile, iphutha elingalindelekile livelile: <ph name="ERROR_MESSAGE" /></translation>
-<translation id="4984616446166309645">Isi-Japanese</translation>
+<translation id="4984616446166309645">Japanese</translation>
<translation id="4988205478593450158">Ingabe uqinisekile ukuthi ufuna ukususa i-"<ph name="FILE_NAME" />"?</translation>
<translation id="498902553138568924">Uvemvame obomvu</translation>
<translation id="4992066212339426712">Susa ukuthula</translation>
@@ -471,7 +471,7 @@
<translation id="5024856940085636730">Umsebenzi uthatha isikhathi eside kunokulindelekile. Ingabe ufuna ukuwukhansela?</translation>
<translation id="5036159836254554629">Phatha ukwabelana ne-Parallels Desktop</translation>
<translation id="5038625366300922036">Bona okuningi...</translation>
-<translation id="5044852990838351217">Isi-Armenian</translation>
+<translation id="5044852990838351217">Armenian</translation>
<translation id="5045550434625856497">Iphasiwedi engalungile</translation>
<translation id="5059127710849015030">Ukuguqulwa kwamaletha esi-Nepali</translation>
<translation id="5068919226082848014">I-Pizza</translation>
@@ -480,7 +480,7 @@
<translation id="509429900233858213">Kuvele iphutha.</translation>
<translation id="5098629044894065541">Isi-Hebrew</translation>
<translation id="5109254780565519649">Kuvele iphutha. Ezinye zezinto kungenzeka azibuyiselwanga.</translation>
-<translation id="5110329002213341433">I-English (Canada)</translation>
+<translation id="5110329002213341433">English (Canada)</translation>
<translation id="5123433949759960244">I-Basketball</translation>
<translation id="5129662217315786329">Isi-Polish</translation>
<translation id="5144820558584035333">Isethi ye-Hangul 3 (390)</translation>
@@ -524,16 +524,16 @@
<translation id="5411472733320185105">Ungasebenzisi izilungiselelo zommeleli zalaba basingathi nezizinda:</translation>
<translation id="541890217011173530">Isi-Sorani Kurdish esinekhibhodi esekelwe ku-English</translation>
<translation id="5422221874247253874">Iphoyinti lokufinyelela</translation>
-<translation id="5428105026674456456">Isi-Spanish</translation>
+<translation id="5428105026674456456">Spanish</translation>
<translation id="5438282218546237410">Ayikho imiphumela ye-<ph name="SEARCH_TERM" />.</translation>
<translation id="5449551289610225147">Iphasiwedi engavumelekile</translation>
<translation id="5463231940765244860">Faka</translation>
<translation id="5469868506864199649">Isi-Italian</translation>
<translation id="5473333559083690127">Phinda ufake iphinikhodi entsha</translation>
-<translation id="5489067830765222292">Isi-Latvian</translation>
+<translation id="5489067830765222292">Latvian</translation>
<translation id="5489965683297092283">Isihlungi esithi <ph name="FILTER_NAME" /> sivaliwe.</translation>
<translation id="5494920125229734069">Khetha konke</translation>
-<translation id="5500122897333236901">Isi-Icelandic</translation>
+<translation id="5500122897333236901">Icelandic</translation>
<translation id="5508696409934741614">Amachashazi</translation>
<translation id="5522908512596376669">Uhlu lwefayela lushintshele kuhlu lokubuka.</translation>
<translation id="5524517123096967210">Ifayela alikwazanga ukufundwa.</translation>
@@ -564,11 +564,11 @@
<translation id="5776325638577448643">Susa futhi ufomethe</translation>
<translation id="57838592816432529">Thulisa</translation>
<translation id="5788127256798019331">Amafayela e-Google Play</translation>
-<translation id="5790193330357274855">Isi-Kazakh</translation>
+<translation id="5790193330357274855">Kazakh</translation>
<translation id="5804245609861364054">Ukuguqulwa kwamaletha kwesi-Kannada</translation>
<translation id="5814126672212206791">Uhlobo lokuxhumeka</translation>
-<translation id="5817397429773072584">Isi-Chinese Sosiko</translation>
-<translation id="5818003990515275822">Isi-Korean</translation>
+<translation id="5817397429773072584">Chinese Sosiko</translation>
+<translation id="5818003990515275822">Korean</translation>
<translation id="5819442873484330149">Isethi ye-Hangul 3 (Kokugcina)</translation>
<translation id="5832976493438355584">Ikhiyiwe</translation>
<translation id="5833610766403489739">Leli fayela selilibele kwenye indawo. Sicela uhlole ukulungiselelwa kwendawo yakho yokulanda uphinde uzame futhi.</translation>
@@ -594,21 +594,21 @@
<translation id="6040143037577758943">Vala</translation>
<translation id="6055907707645252013">Inethiwekhi ye-<ph name="NETWORK_TYPE" /> ayixhunyiwe</translation>
<translation id="6074825444536523002">Ifomu le-Google</translation>
-<translation id="6079871810119356840">Isi-Hungarian esinekhibhodi ye-Qwerty</translation>
+<translation id="6079871810119356840">Hungarian esinekhibhodi ye-Qwerty</translation>
<translation id="6082256976217156453">Ingobo yomlando eminyanisiwe ye-LZMA</translation>
<translation id="6096979789310008754">Umbhalo wosesho usuliwe, kuboniswa wonke amafaela namafolda.</translation>
<translation id="610101264611565198">Ihambisa i-<ph name="FILE_NAME" /> ku-<ph name="FOLDER_NAME" /></translation>
<translation id="61118516107968648">Umbhalo we-CSV</translation>
<translation id="6129953537138746214">Isikhala</translation>
<translation id="6133173853026656527">Ihambisa i-<ph name="FILE_NAME" />...</translation>
-<translation id="613750717151263950">Isi-Japanese esinekhibhodi yase-US</translation>
+<translation id="613750717151263950">Japanese esinekhibhodi yase-US</translation>
<translation id="6138894911715675297"><ph name="NETWORK_TYPE" />, ayikho inethiwekhi</translation>
<translation id="6146563240635539929">Amavidiyo</translation>
<translation id="6150853954427645995">Ukuze ulondoloze leli fayela ukuthi ulisebenzise ngokungaxhunyiwe, buyela emuva ku-inthanethi, chofoza ngakwesokudla ifayela, bese ukhethe inketho ye-<ph name="OFFLINE_CHECKBOX_NAME" />.</translation>
<translation id="6164412158936057769">Izimvemvane</translation>
<translation id="6165508094623778733">Funda kabanzi</translation>
<translation id="6170470584681422115">Isemishi</translation>
-<translation id="6187719147498869044">Isi-Hungarian</translation>
+<translation id="6187719147498869044">Hungarian</translation>
<translation id="6189412234224385711">Vula nge-<ph name="EXTENSION_NAME" /></translation>
<translation id="6198252989419008588">Guqula iphinikhodi</translation>
<translation id="6199801702437275229">Ilindele ulwazi lesikhala...</translation>
@@ -620,7 +620,7 @@
<translation id="6241349547798190358">Isi-Dutch (Belgium)</translation>
<translation id="6248400709929739064">Nika amandla imibhalo engezansi</translation>
<translation id="6267547857941397424">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="PHONE_NAME" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, Ibhethri lefoni <ph name="BATTERY_STATUS" />%, xhuma</translation>
-<translation id="6269630227984243955">Isi-Malay</translation>
+<translation id="6269630227984243955">Malay</translation>
<translation id="6287852322318138013">Khetha uhlelo lokusebenza ukuze livule leli fayela</translation>
<translation id="6296410173147755564">I-PUK engavumelekile</translation>
<translation id="6312403991423642364">Iphutha elingaziwa lenethiwekhi</translation>
@@ -642,7 +642,7 @@
<translation id="6485131920355264772">Yehlulekile ukuthola ulwazi lesikhala</translation>
<translation id="6495925982925244349">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="SECURITY_STATUS" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, kuphethwe umlawuli wakho, imininingwane</translation>
<translation id="6499681088828539489">Ungavumeli abammeleli kumanethiwekhi abiwe</translation>
-<translation id="6509122719576673235">Isi-Norwegian</translation>
+<translation id="6509122719576673235">Norwegian</translation>
<translation id="6528513914570774834">Vumela abanye abasebenzisi bale divayisi ukuthi basebenzise le nethiwekhi</translation>
<translation id="653019979737152879">Ivumelanisa i-<ph name="FILE_NAME" />...</translation>
<translation id="6549689063733911810">Okwakamuva</translation>
@@ -675,7 +675,7 @@
<translation id="6827236167376090743">Le vidiyo izoqhubeka idlale kuze izinkomo zibuye ekhaya.</translation>
<translation id="6847101934483209767">Isusiwe i-<ph name="ENTRY_NAME" /> kusuka okhethweni.</translation>
<translation id="6856459657722366306">Inethiwkehi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="NETWORK_PROVIDER_NAME" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, imininingwane</translation>
-<translation id="6861394552169064235">Isi-Persian</translation>
+<translation id="6861394552169064235">Persian</translation>
<translation id="6862635236584086457">Wonke amafayela alondolozwe kule folda enziwa isipele ngokuzenzakalelayo ku-inthanethi</translation>
<translation id="6864328437977279120">Isi-Sanskrit</translation>
<translation id="6874758081814639712">Umuntu owenza i-tai chi</translation>
@@ -708,14 +708,14 @@
<translation id="6998711733709403587"><ph name="SELCTED_FOLDERS_COUNT" /> amafolda akhethiwe</translation>
<translation id="7012943028104619157"><ph name="ROOT_TITLE" /> (<ph name="ROOT_SUMMARY" />)</translation>
<translation id="7014174261166285193">Ukufakwa kuhlulekile.</translation>
-<translation id="7031639531908619281">Isi-Turkish</translation>
+<translation id="7031639531908619281">Turkish</translation>
<translation id="7037472120706603960">Isi-Tamil (Ukuguqulwa kwamaletha)</translation>
<translation id="7040138676081995583">Vula nge...</translation>
<translation id="7048024426273850086">Inethiwekhi ye-<ph name="NETWORK_INDEX" /> kwangu-<ph name="NETWORK_COUNT" />, <ph name="PHONE_NAME" />, <ph name="PROVIDER_NAME" />, Amandla Esignali <ph name="SIGNAL_STRENGTH" />%, Ibhethri Lefoni <ph name="BATTERY_STATUS" />%, Xhuma</translation>
<translation id="7075931588889865715">Isi-Thai esinekhibhodi ye-TIS 820-2531</translation>
<translation id="708278670402572152">Nqamula ukuze unike amandla ukuskena</translation>
<translation id="7086590977277044826">Isi-Tamil esinekhibhodi ye-InScript</translation>
-<translation id="7103992300314999525">Isi-Macedonian</translation>
+<translation id="7103992300314999525"> Macedonian</translation>
<translation id="7106346894903675391">Thenga isitoreji esiningi...</translation>
<translation id="7126604456862387217">'&lt;b&gt;<ph name="SEARCH_STRING" />&lt;/b&gt;' - &lt;em&gt;iDrayivu yokusesha&lt;/em&gt;</translation>
<translation id="7135561821015524160">I-Kannada Phonetic</translation>
@@ -754,7 +754,7 @@
<translation id="7495372004724182530">I-Malayalam Phonetic</translation>
<translation id="7505167922889582512">Bonisa amafayela afihliwe</translation>
<translation id="7514365320538308">Landa</translation>
-<translation id="751507702149411736">Isi-Belarusian</translation>
+<translation id="751507702149411736">Belarusian</translation>
<translation id="7532029025027028521">Ukuguqulwa kwamaletha esi-Persian</translation>
<translation id="7544830582642184299">Nikeza i-Linux imvume yezinhlelo zokusebenza ukufinyelela amafayela ku-Google Drayivu yakho. Izinguquko zizovumelanisa kwamanye amadivayisi akho.</translation>
<translation id="7544853251252956727">Shova</translation>
@@ -774,17 +774,17 @@
<translation id="7654209398114106148">Ihambisa izinto ezingu-<ph name="NUMBER_OF_ITEMS" />...</translation>
<translation id="7655441028674523381">Finyelela kalula kokuthi Izithombe ze-Google</translation>
<translation id="7658239707568436148">Khansela</translation>
-<translation id="7663224033570512922">Isi-Hindi</translation>
+<translation id="7663224033570512922">Hindi</translation>
<translation id="7693909743393669729">Ukufometha idrayivu kuzosula yonke idatha egcinwe kuyo kuphinde kususe zonke izingxenye ezikhona, okufaka zonke izingxenye okungenzeka zingabonakali. Lesi senzo asikwazi ukuhlehliswa.</translation>
<translation id="7695430100978772476">Ayikwazanga ukufometha i-<ph name="DRIVE_NAME" /></translation>
-<translation id="770015031906360009">Isi-Greek</translation>
+<translation id="770015031906360009">Greek</translation>
<translation id="7705251383879779343">kukopishwe okungu-<ph name="FILE_NAME" />.</translation>
<translation id="7711920809702896782">Ulwazi lwesithombe</translation>
<translation id="7724603315864178912">Sika</translation>
<translation id="7730494089396812859">Bonisa imininingwane yesipele samafu</translation>
<translation id="7732111077498238432">Inethiwekhi ilawulwa inqubomgomo</translation>
<translation id="7748626145866214022">Izinketho eziningi ezitholakala kubha yesenzo. Cindezela ku-Alt + A ukuze ugxilise ibha yesenzo.</translation>
-<translation id="7760449188139285140">Isi-Chinese Wubi</translation>
+<translation id="7760449188139285140">Chinese Wubi</translation>
<translation id="7765158879357617694">Hambisa</translation>
<translation id="7774365994322694683">Inyoni</translation>
<translation id="7788080748068240085">Ukuze ulondoloze i-"<ph name="FILE_NAME" />" ngokungaxhunyiwe ku-inthanethi kuzomele ukhulule ngokungeziwe okungu-<ph name="TOTAL_FILE_SIZE" /> kwesikhala:<ph name="MARKUP_1" />
@@ -819,10 +819,10 @@
<translation id="7943385054491506837">I-US Colemak</translation>
<translation id="7948417415021769876">ingobo yomlando ye-7z</translation>
<translation id="7953739707111622108">Idivayisi ayikwazi ukuvulwa ngoba isistimu yefayela ayiboniwe.</translation>
-<translation id="7969525169268594403">Isi-Slovenian</translation>
-<translation id="7972920761225148017">Isi-French (Switzerland)</translation>
+<translation id="7969525169268594403">Slovenian</translation>
+<translation id="7972920761225148017">French (Switzerland)</translation>
<translation id="7973962044839454485">Ukuqinisekisa kwe-PPP kuhlulekile ngenxa yegama lomsebenzisi elingalungile noma iphasiwedi</translation>
-<translation id="7980421588063892270">I-English (US) enekhibhodi ye-Colemak</translation>
+<translation id="7980421588063892270">English (US) enekhibhodi ye-Colemak</translation>
<translation id="79907182588096956">Leli fayela lenzelwe i-PC esebenzisa isofthiwe ye-Windows. Lokhu akuhambelani nedivayisi yakho esebenzisa i-Chrome OS. <ph name="BEGIN_LINK_HELP" />Funda kabanzi<ph name="END_LINK_HELP" /> ngokuvula amafayela ku-Chrome OS.</translation>
<translation id="8000066093800657092">Ayikho inethiwekhi</translation>
<translation id="8008366997883261463">I-Jack Russell Terrier</translation>
@@ -837,13 +837,13 @@
<translation id="8087576439476816834">Dawuniloda, <ph name="PROFILE_NAME" /></translation>
<translation id="8106045200081704138">Kwabiwe nami</translation>
<translation id="8116072619078571545">Amanzi e-ice</translation>
-<translation id="8128733386027980860">I-English (UK enekhibhodi ye-Dvorak</translation>
+<translation id="8128733386027980860">English (UK enekhibhodi ye-Dvorak</translation>
<translation id="8137331602592933310">I-"<ph name="FILENAME" />" yabiwe nawe. Awukwazi ukuyisusa ngoba akuyona eyakho.</translation>
<translation id="813913629614996137">Iyaqalisa...</translation>
<translation id="8151638057146502721">Lungiselela</translation>
<translation id="8154842056504218462">Ukhethe konke okungenayo.</translation>
<translation id="8157684860301034423">Yehlulekile ukubuyisa ulwazi lohlelo lokusebenza.</translation>
-<translation id="8175731104491895765">Isi-French (Belgium)</translation>
+<translation id="8175731104491895765">French (Belgium)</translation>
<translation id="8179976553408161302">Faka</translation>
<translation id="8193175696669055101">Imodeli yedivayisi</translation>
<translation id="8208580316430297579">Umsebenzi wobuciko</translation>
@@ -856,7 +856,7 @@
<translation id="8280151743281770066">Ifonethikhi yesi-Armenian</translation>
<translation id="8294431847097064396">Umthombo</translation>
<translation id="8297012244086013755">Isethi ye-Hangul 3 (Akekho u-Shift)</translation>
-<translation id="8299269255470343364">Isi-Japanese</translation>
+<translation id="8299269255470343364">Japanese</translation>
<translation id="8300849813060516376">I-OTASP ihlulekile</translation>
<translation id="8308481408797647857">Ingobo yomlando yotiyela eminyanisiwe ye-XZ</translation>
<translation id="8312871300878166382">Namathisela kufolda</translation>
@@ -866,7 +866,7 @@
<translation id="8336153091935557858">Izolo ngo-<ph name="YESTERDAY_DAYTIME" /></translation>
<translation id="8342318071240498787">Ifayela noma uhla lwemibhalo olunegama elifanayo seluvele likhona</translation>
<translation id="8372369524088641025">Ukhiye omubi we-WEP</translation>
-<translation id="8372852072747894550">Isi-Greek</translation>
+<translation id="8372852072747894550">Greek</translation>
<translation id="8386903983509584791">Ukuskena kuphelile</translation>
<translation id="8387733224523483503">I-<ph name="FILE_NAME" /> ithukululiwe.</translation>
<translation id="8395901698320285466">Ubukhulu</translation>
@@ -889,29 +889,29 @@
<translation id="8499098729323186194">Ikhipha izinto ezingu-<ph name="NUMBER_OF_ITEMS" />...</translation>
<translation id="8521441079177373948">I-UK</translation>
<translation id="8525306231823319788">Isikrini esigcwele</translation>
-<translation id="853494022971700746">Isi-French (France)</translation>
+<translation id="853494022971700746">French (France)</translation>
<translation id="8540608333167683902">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, imininingwane</translation>
-<translation id="8545476925160229291">I-English(US)</translation>
+<translation id="8545476925160229291">English(US)</translation>
<translation id="854655314928502177">I-URL yokutholakala kommeleli ozenzakalelayo wewebhu</translation>
<translation id="8549186985808798022">Isi-Italian</translation>
-<translation id="8551494947769799688">Isi-Latvian</translation>
+<translation id="8551494947769799688">Latvian</translation>
<translation id="8560515948038859357">Isi-Cantonese</translation>
<translation id="8561206103590473338">Indlovu</translation>
<translation id="8566466896628108558">Inethiwekhi engu-<ph name="NETWORK_INDEX" /> kwezingu-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="SECURITY_STATUS" />, Amandla Wesinglai<ph name="SIGNAL_STRENGTH" />%, Kuvinjelwe Umphathi wakho, Imininingwane</translation>
<translation id="8569764466147087991">Khetha ifayela okumele ulivule</translation>
-<translation id="8577897833047451336">Isi-Croatia</translation>
-<translation id="8578308463707544055">Isi-Indonesia</translation>
+<translation id="8577897833047451336">Croatian</translation>
+<translation id="8578308463707544055">Indonesian</translation>
<translation id="8579285237314169903">Ivumelanisa izinto ezingu-<ph name="NUMBER_OF_FILES" />...</translation>
<translation id="8600173386174225982">Uhlu lwefayela lushintshele ekubukeni kwesithonjana.</translation>
<translation id="8601932370724196034">Ifayela lesithombe se-Crostini</translation>
-<translation id="8609695766746872526">Isi-Icelandic</translation>
+<translation id="8609695766746872526">Icelandic</translation>
<translation id="863903787380594467">Iphinikhodi engalungile. Unemizamo engu-<ph name="RETRIES" /> esele.</translation>
<translation id="8639391553632924850"><ph name="INPUT_LABEL" /> - Imbobo</translation>
<translation id="8656768832129462377">Ungahloli</translation>
<translation id="8688591111840995413">Iphasiwedi embi</translation>
<translation id="8698464937041809063">Ukudweba kwe-Google</translation>
<translation id="8712637175834984815">Ngiyitholile</translation>
-<translation id="8713112442029511308">Isi-Maltese</translation>
+<translation id="8713112442029511308">Maltese</translation>
<translation id="8714406895390098252">Ibhayisikili</translation>
<translation id="8719721339511222681">Okukhethiwe <ph name="ENTRY_NAME" />.</translation>
<translation id="872537912056138402">Isi-Croatian</translation>
@@ -923,19 +923,19 @@
<translation id="8802459921616481935">Hambisa Kudoti</translation>
<translation id="8808686172382650546">Ikati</translation>
<translation id="8810671769985673465">Ukuzipha kwehlulekile, into ikhona: "<ph name="FILE_NAME" />"</translation>
-<translation id="8813284582615685103">Isi-Spanish (I-Spain)</translation>
+<translation id="8813284582615685103">Spanish (I-Spain)</translation>
<translation id="8834164572807951958">Amalungu e-'<ph name="DESTINATION_NAME" />' azothola ukufinyelela kwikhophi yalezi zinto.</translation>
-<translation id="8857149712089373752">Isi-Nepali ngekhibhodi ye-Phonetic</translation>
+<translation id="8857149712089373752">Nepali ngekhibhodi ye-Phonetic</translation>
<translation id="8860454412039442620">Isipredishithi se-Excel</translation>
<translation id="8866284467018526531">Ukuguqulwa kwamaletha we-Arabic</translation>
<translation id="8874184842967597500">Ayixhunyiwe</translation>
-<translation id="8900820606136623064">Isi-Hungarian</translation>
+<translation id="8900820606136623064">Hungarian</translation>
<translation id="8903931173357132290">Thola iziqu</translation>
<translation id="8912078710089354287">Inja enyakazisa umsila</translation>
<translation id="8919081441417203123">Isi-Danish</translation>
<translation id="8965697826696209160">Asikho isikhala esanele.</translation>
<translation id="8970501467542182729">Leli fayela lidizayinelwe ikhompuyutha esebenzisa isofthiwe ye-Macintosh. Lokhu akuhambelani nedivayisi yakho esebenzisa i-Chrome OS. <ph name="BEGIN_LINK_HELP" />Funda kabanzi<ph name="END_LINK_HELP" /> ngokuvula amafayela ku-Chrome OS.</translation>
-<translation id="8997962250644902079">Isi-Chinese (Traditional) Pinyin</translation>
+<translation id="8997962250644902079">Chinese (Traditional) Pinyin</translation>
<translation id="9003940392834790328">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, kuphethwe umlawuli wakho, imininingwane</translation>
<translation id="9017798300203431059">Ifonethiki yesi-Russian</translation>
<translation id="9034924485347205037">Amafayela e-Linux</translation>
@@ -959,10 +959,10 @@
<translation id="9153934054460603056">Londoloza ubunikazi nephasiwedi</translation>
<translation id="9171921933192916600">Othanda izincwadi</translation>
<translation id="9172592259078059678">Ukuguqulwa kwamaletha kwesi-Gujarati</translation>
-<translation id="9173120999827300720">I-English (US enekhibhodi yamazwe ngamazwe</translation>
+<translation id="9173120999827300720">English (US enekhibhodi yamazwe ngamazwe</translation>
<translation id="9174050671906956834">Izinto ezikudoti zisuswa ingunaphakade ngemva kwezinsuku ezingama-30.</translation>
<translation id="9183302530794969518">Google Amadokhumenti</translation>
-<translation id="9189836632794948435">Isi-Kazakh</translation>
+<translation id="9189836632794948435">Kazakh</translation>
<translation id="9200427192836333033">Izinto ezingu-<ph name="NUMBER_OF_ITEMS" /> zithukululiwe.</translation>
<translation id="9213073329713032541">Ukufaka kuqaliswe ngempumelelo.</translation>
<translation id="9219103736887031265">Izithombe</translation>
@@ -973,7 +973,7 @@
<translation id="945522503751344254">Thumela impendulo</translation>
<translation id="947144732524271678">Ibanga elikhethiwe lokungenayo kwe-<ph name="ENTRY_COUNT" /> kusuka ku-<ph name="FROM_ENTRY_NAME" /> kuya ku-<ph name="TO_ENTRY_NAME" />.</translation>
<translation id="961973045258256291">Ingobo yomlando eminyanisiwe ye-Gzip</translation>
-<translation id="965477715979482472">I-English (South Africa)</translation>
+<translation id="965477715979482472">English (South Africa)</translation>
<translation id="981121421437150478">Ayixhunyiwe ku-inthanethi</translation>
<translation id="988685240266037636">Ifayela elinegama "<ph name="FILE_NAME" />" selivele likhona. Ingabe ufuna ukuyimiselela?</translation>
<translation id="992401651319295351">Unemizamo engu-<ph name="RETRIES" /> esele. Ngeke ukwazi ukusebenzisa le nethiwekhi kuze kube yilapho usetha Iphinikhodi entsha.</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 54eda0b04d06a18c37d0fe5acd9c7e59a9309ecf Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Thu, 23 Jun 2022 01:00:32 +0000
Subject: [PATCH 34/59] Incrementing VERSION to 102.0.5005.138
Change-Id: I72b187b9006fa47fafdd1239751c65d268601487
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3719359
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1193}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 96ae4bfab48f..a63b8dbbec13 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=137
+PATCH=138
--
2.37.0

View File

@ -0,0 +1,578 @@
From 72690f8bebac28c822f300c57111518f5e0711b0 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Thu, 23 Jun 2022 14:24:18 +0000
Subject: [PATCH 35/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I1a319a29c31a8d9cdc82ef3481cbaf7422832818
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721556
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1194}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_hi.xtb | 2 +-
.../app/resources/generated_resources_fi.xtb | 30 ++++----
.../app/resources/generated_resources_km.xtb | 2 +-
.../app/resources/generated_resources_ml.xtb | 8 +--
components/strings/components_strings_zu.xtb | 4 +-
.../translations/ui_chromeos_strings_hy.xtb | 2 +-
.../translations/ui_chromeos_strings_ml.xtb | 2 +-
.../translations/ui_chromeos_strings_zu.xtb | 70 +++++++++----------
ui/strings/translations/ui_strings_ml.xtb | 2 +-
9 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/ash/strings/ash_strings_hi.xtb b/ash/strings/ash_strings_hi.xtb
index 3dc696f3a7ea..291935cd90a5 100644
--- a/ash/strings/ash_strings_hi.xtb
+++ b/ash/strings/ash_strings_hi.xtb
@@ -68,7 +68,7 @@
<translation id="1272079795634619415">रोकें</translation>
<translation id="1275285675049378717"><ph name="POWER_SOURCE" /> चार्ज कर रहा है</translation>
<translation id="1279938420744323401"><ph name="DISPLAY_NAME" /> (<ph name="ANNOTATION" />)</translation>
-<translation id="1285992161347843613">फ़ोन का पता लगाने की सुविधा</translation>
+<translation id="1285992161347843613">फ़ोन का पता लगाएं</translation>
<translation id="1289185460362160437"><ph name="COME_BACK_DAY_OF_WEEK" /> को <ph name="COME_BACK_TIME" /> बजे फिर से देखें.</translation>
<translation id="1290331692326790741">कमज़ोर सिग्नल</translation>
<translation id="1290982764014248209"><ph name="DRAGGED_APP" /> को फ़ोल्डर <ph name="FOLDER_NAME" /> पर ले जाएं.</translation>
diff --git a/chrome/app/resources/generated_resources_fi.xtb b/chrome/app/resources/generated_resources_fi.xtb
index 27cbdce92d1e..512a1c28b236 100644
--- a/chrome/app/resources/generated_resources_fi.xtb
+++ b/chrome/app/resources/generated_resources_fi.xtb
@@ -340,7 +340,7 @@
<translation id="1338631221631423366">Laiteparia muodostetaan…</translation>
<translation id="1338802252451106843"><ph name="ORIGIN" /> haluaa avata tämän sovelluksen.</translation>
<translation id="1338950911836659113">Poistetaan…</translation>
-<translation id="1339009753652684748">Käytä Assistantia sanomalla "Ok Google". Jos haluat säästää virtaa, valitse Käytössä (suositus). Assistant vastaa vain, jos laite on kytketty virtalähteeseen tai laturiin.</translation>
+<translation id="1339009753652684748">Käytä Assistantia sanomalla "Hey Google". Jos haluat säästää virtaa, valitse Käytössä (suositus). Assistant vastaa vain, jos laite on kytketty virtalähteeseen tai laturiin.</translation>
<translation id="13392265090583506">A11y</translation>
<translation id="1340527397989195812">Varmuuskopioi mediatiedostot laitteelta Tiedostot-sovelluksen avulla.</translation>
<translation id="1341988552785875222"><ph name="APP_NAME" /> asetti nykyisen taustakuvan. Saatat joutua poistamaan sovelluksen <ph name="APP_NAME" /> ennen kuin voit valita uuden taustakuvan.</translation>
@@ -1408,7 +1408,7 @@ Voit ylläpitää tilin asetuksia asentamalla laitteellesi Family Link sovell
<translation id="23030561267973084"><ph name="EXTENSION_NAME" /> on pyytänyt lisäoikeuksia.</translation>
<translation id="23055578400314116">Valitse käyttäjänimi</translation>
<translation id="2307462900900812319">Määritä verkko</translation>
-<translation id="2307553512430195144">Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Ok Google" ja tunnistaa Voice Matchilla puhujaksi käyttäjän <ph name="SUPERVISED_USER_NAME" />.
+<translation id="2307553512430195144">Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Hey Google" ja tunnistaa Voice Matchilla puhujaksi käyttäjän <ph name="SUPERVISED_USER_NAME" />.
<ph name="BR" />
Voice Matchin avulla Google Assistant voi tunnistaa käyttäjän (<ph name="SUPERVISED_USER_NAME" />) äänen laitteellasi (<ph name="DEVICE_TYPE" />) ja erottaa hänet muista.
<ph name="BR" />
@@ -2363,7 +2363,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys.</translation>
<translation id="3244294424315804309">Jatka äänen mykistystä</translation>
<translation id="324849028894344899"><ph name="WINDOW_TITLE" /> verkkovirhe</translation>
<translation id="3248902735035392926">Turvallisuudella on väliä. Käytä nyt hetki <ph name="BEGIN_LINK" />laajennusten tarkistamiseen<ph name="END_LINK" />.</translation>
-<translation id="3251714896659475029">Salli, että <ph name="SUPERVISED_USER_NAME" /> voi käyttää Google Assistantia sanomalla "Ok Google"</translation>
+<translation id="3251714896659475029">Salli, että <ph name="SUPERVISED_USER_NAME" /> voi käyttää Google Assistantia sanomalla "Hey Google"</translation>
<translation id="3251759466064201842">&lt;Ei osa varmennetta&gt;</translation>
<translation id="325238099842880997">Määritä digitaaliset pelisäännöt, joiden avulla lapsesi voi pelata, tutkia ja oppia sekä tehdä koulutehtäviä kotona.</translation>
<translation id="3253448572569133955">Tuntematon tili</translation>
@@ -3878,7 +3878,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys.</translation>
<translation id="4742970037960872810">Poista korostus</translation>
<translation id="4743260470722568160"><ph name="BEGIN_LINK" />Katso, miten sovelluksia päivitetään<ph name="END_LINK" /></translation>
<translation id="4744981231093950366">{NUM_TABS,plural, =1{Poista sivuston mykistys}other{Poista sivustojen mykistys}}</translation>
-<translation id="474609389162964566">Käytä Assistantia sanomalla "Ok Google"</translation>
+<translation id="474609389162964566">Käytä Assistantia sanomalla "Hey Google"</translation>
<translation id="4746351372139058112">Viestit</translation>
<translation id="4748783296226936791">Sivustot yhdistävät yleensä HID-laitteisiin esim. käyttääkseen epätavallisia näppäimistöjä, peliohjaimia tai muita laitteita</translation>
<translation id="4750185073185658673">Voit tarkistaa muutamia muita lupia puhelimellasi. Varmista, että puhelimen Bluetooth ja Wi-Fi ovat päällä.</translation>
@@ -3970,7 +3970,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys.</translation>
<translation id="4844633725025837809">Salasanat kannattaa salata turvallisuussyistä laitteella ennen niiden tallentamista Googlen Salasanojen ylläpitoon</translation>
<translation id="4846680374085650406">Noudatat järjestelmänvalvojan tätä asetusta koskevaa suositusta.</translation>
<translation id="4847902821209177679"><ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /> valittu, valitse albumeita (<ph name="TOPIC_SOURCE" />) painamalla Enter</translation>
-<translation id="4848191975108266266">Google Assistantin Ok Google</translation>
+<translation id="4848191975108266266">Google Assistantin Hey Google</translation>
<translation id="4849286518551984791">Asetettu yleisaika (Coordinated Universal Time, UTC/GMT)</translation>
<translation id="4849517651082200438">Älä asenna</translation>
<translation id="485053257961878904">Ilmoitusten synkronointia ei voitu ottaa käyttöön</translation>
@@ -5167,7 +5167,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="6059276912018042191">Viimeaikaiset Chrome-välilehdet</translation>
<translation id="6059652578941944813">Varmennehierarkia</translation>
<translation id="6063284707309177505">Luo QR-koodi</translation>
-<translation id="6063847492705284550"><ph name="BEGIN_BOLD" />Huom.<ph name="END_BOLD" /> Käyttäjän (<ph name="SUPERVISED_USER_NAME" />) henkilökohtaisiin tuloksiin voi olla mahdollista päästä käsiksi myös, jos hänen ääntään on nauhoitettu tai jonkun toisen ääni muistuttaa hänen ääntään. Jos haluat säästää virtaa, muuta käyttäjän <ph name="SUPERVISED_USER_NAME" /> Assistantin asetuksia niin, että "Ok Google" on käytössä vain, kun laite on kytketty virtalähteeseen.</translation>
+<translation id="6063847492705284550"><ph name="BEGIN_BOLD" />Huom.<ph name="END_BOLD" /> Käyttäjän (<ph name="SUPERVISED_USER_NAME" />) henkilökohtaisiin tuloksiin voi olla mahdollista päästä käsiksi myös, jos hänen ääntään on nauhoitettu tai jonkun toisen ääni muistuttaa hänen ääntään. Jos haluat säästää virtaa, muuta käyttäjän <ph name="SUPERVISED_USER_NAME" /> Assistantin asetuksia niin, että "Hey Google" on käytössä vain, kun laite on kytketty virtalähteeseen.</translation>
<translation id="6064217302520318294">Näytön lukitus</translation>
<translation id="6065289257230303064">Varmenteen kohdehakemiston attribuutit</translation>
<translation id="6066794465984119824">Tiivistettyä kuvaa ei ole määritetty</translation>
@@ -5701,7 +5701,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="6583328141350416497">Jatka latausta</translation>
<translation id="6584878029876017575">Microsoftin elinikäinen allekirjoitus</translation>
<translation id="6586099239452884121">Vierailijakäyttö</translation>
-<translation id="6586213706115310390">Käytä Assistantia sanomalla "Ok Google".</translation>
+<translation id="6586213706115310390">Käytä Assistantia sanomalla "Hey Google".</translation>
<translation id="6586451623538375658">Vaihda hiiren ykköspainiketta</translation>
<translation id="6587958707401001932">Valitse oletusasetus</translation>
<translation id="6588043302623806746">Käytä suojattua DNS:ää</translation>
@@ -5918,7 +5918,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="6808166974213191158">ChromeOS Flex järjestelmän näköistiedoston kirjoittaja</translation>
<translation id="6808193438228982088">Kettu</translation>
<translation id="6809470175540814047">Avaa incognito-ikkunassa</translation>
-<translation id="6809656734323672573">Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Ok Google" ja tunnistaa Voice Matchilla puhujaksi sinut.
+<translation id="6809656734323672573">Jos hyväksyt tämän, Google Assistant odottaa lepotilassa, kunnes se kuulee sanat "Hey Google" ja tunnistaa Voice Matchilla puhujaksi sinut.
<ph name="BR" />
Voice Matchin avulla Assistant osaa tunnistaa sinut ja erottaa sinut muista. Assistant luo tallenteista yksilöllisen äänimallin, joka tallennetaan vain laitteellesi. Äänimalli voidaan lähettää tilapäisesti Googlelle jotta äänesi voidaan tunnistaa paremmin.
<ph name="BR" />
@@ -5964,7 +5964,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="6842749380892715807">XML-sivustoluettelot ladattiin viimeksi <ph name="LAST_DATE_DOWNLOAD" />.</translation>
<translation id="6842868554183332230">Sivustot havaitsevat yleensä, kun käytät laitetta aktiivisesti ja määrittävät sen perusteella saatavuutesi chat-sovelluksissa</translation>
<translation id="6843264316370513305">Verkon virheenkorjaus</translation>
-<translation id="6843423766595476978">Ok Google on valmiina</translation>
+<translation id="6843423766595476978">Hey Google on valmiina</translation>
<translation id="6845038076637626672">Avaa suuressa koossa</translation>
<translation id="6846178040388691741"><ph name="EXTENSION_NAME" /> haluaa tulostaa tiedoston <ph name="FILE_NAME" /> tulostimella <ph name="PRINTER_NAME" />.</translation>
<translation id="6847125920277401289">Vapauta tilaa jatkaaksesi</translation>
@@ -6150,7 +6150,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="701080569351381435">Näytä lähdekoodi</translation>
<translation id="7014174261166285193">Asennus epäonnistui.</translation>
<translation id="7014480873681694324">Poista korostus</translation>
-<translation id="7017004637493394352">Sano ”Ok Google” uudelleen</translation>
+<translation id="7017004637493394352">Sano ”Hey Google” uudelleen</translation>
<translation id="7017219178341817193">Lisää uusi sivu</translation>
<translation id="7017354871202642555">Tilaa ei voi asettaa ikkunan asettamisen jälkeen.</translation>
<translation id="7018275672629230621">Lukea ja muokata selaushistoriaasi</translation>
@@ -6402,7 +6402,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="7298195798382681320">Suositus</translation>
<translation id="7299337219131431707">Ota vierailijaselaus käyttöön</translation>
<translation id="7299515639584427954">Vaihdetaanko tuetut linkit avaava oletussovellus?</translation>
-<translation id="7301470816294041580">Voit kysyä "Ok Google, what song is this?" tai "Ok Google, what's on my screen?"</translation>
+<translation id="7301470816294041580">Voit kysyä "Hey Google, what song is this?" tai "Hey Google, what's on my screen?"</translation>
<translation id="730289542559375723">{NUM_APPLICATIONS,plural, =1{Tämä sovellus saattaa estää Chromea toimimasta oikein}other{Nämä sovellukset saattavat estää Chromea toimimasta oikein}}</translation>
<translation id="7303281435234579599">Hups, jotain meni vikaan esittelytilan määrityksessä.</translation>
<translation id="7303900363563182677">Tämä sivu ei saa nähdä leikepöydälle kopioitua tekstiä tai kuvia.</translation>
@@ -6621,7 +6621,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="7515998400212163428">Android</translation>
<translation id="7516981202574715431"><ph name="APP_NAME" /> on keskeytetty</translation>
<translation id="7520766081042531487">Incognito-portaali: <ph name="SUBFRAME_SITE" /></translation>
-<translation id="7522255036471229694">Sano ”Ok Google”.</translation>
+<translation id="7522255036471229694">Sano ”Hey Google”.</translation>
<translation id="7523585675576642403">Nimeä profiili uudelleen</translation>
<translation id="7525067979554623046">Luo</translation>
<translation id="7525625923260515951">Kuuntele valittu teksti</translation>
@@ -6809,7 +6809,7 @@ Julkinen eksponentti (<ph name="PUBLIC_EXPONENT_NUM_BITS" /> bittiä):
<translation id="7690853182226561458">Lisää kansio...</translation>
<translation id="7691073721729883399">Kioskisovelluksen cryptohomea ei voitu ottaa käyttöön.</translation>
<translation id="7691077781194517083">Tätä suojausavainta ei voi nollata. Virhe: <ph name="ERROR_CODE" /></translation>
-<translation id="7691163173018300413">"Ok Google"</translation>
+<translation id="7691163173018300413">"Hey Google"</translation>
<translation id="7691698019618282776">Crostini-päivitys</translation>
<translation id="7694246789328885917">Korostustyökalu</translation>
<translation id="7696063401938172191"><ph name="PHONE_NAME" />:</translation>
@@ -6980,7 +6980,7 @@ Poista määritys painamalla määritettyä kytkintä tai näppäintä.</transla
<translation id="7850717413915978159"><ph name="BEGIN_PARAGRAPH1" />Antamalla ChromeOS-laitteiden lähettää raportteja automaattisesti voit auttaa meitä korjaamaan ja kehittämään ChromeOS:n ominaisuuksia. Raportteihin voi sisältyä esimerkiksi tietoja ChromeOS:n kaatumisista, käytetyistä ominaisuuksista ja tyypillisestä muistin käytöstä sekä Android-sovellusten diagnostiikka- ja käyttödataa. Kootusta datasta on hyötyä myös Googlen sovelluksille ja kumppaneille, esim. Android-kehittäjille.<ph name="END_PARAGRAPH1" />
<ph name="BEGIN_PARAGRAPH2" />Voit sallia tai estää raporttien lähettämisen milloin tahansa ChromeOS-laitteen asetuksissa. Jos olet verkkotunnuksen järjestelmänvalvoja, voit muuttaa asetusta hallintakonsolissa.<ph name="END_PARAGRAPH2" />
<ph name="BEGIN_PARAGRAPH3" />Jos Verkko ja sovellustoiminta asetus on päällä Google-tililläsi, Android-dataa voidaan tallentaa tilillesi. Voit nähdä dataa, poistaa sitä ja muuttaa tiliasetuksia osoitteessa account.google.com.<ph name="END_PARAGRAPH3" /></translation>
-<translation id="7851021205959621355"><ph name="BEGIN_BOLD" />Huom.<ph name="END_BOLD" /> Samanlaisella äänellä tai äänitteellä saattaa päästä henkilökohtaisiin tuloksiisi tai Assistantiisi. Jos haluat säästää virtaa, muuta Assistantin asetuksia niin, että "Ok Google" on käytössä vain, kun laite on kytkettynä virtalähteeseen.</translation>
+<translation id="7851021205959621355"><ph name="BEGIN_BOLD" />Huom.<ph name="END_BOLD" /> Samanlaisella äänellä tai äänitteellä saattaa päästä henkilökohtaisiin tuloksiisi tai Assistantiisi. Jos haluat säästää virtaa, muuta Assistantin asetuksia niin, että "Hey Google" on käytössä vain, kun laite on kytkettynä virtalähteeseen.</translation>
<translation id="7851457902707056880">Kirjautuminen on sallittu vain omistajatilillä. Käynnistä tietokone uudelleen ja kirjaudu omistajatilillä. Tietokone käynnistetään uudelleen 30 sekunnin kuluttua.</translation>
<translation id="7851716364080026749">Estä kameran ja mikrofonin käyttö aina</translation>
<translation id="7851720427268294554">IPP-jäsentäjä</translation>
@@ -8371,7 +8371,7 @@ Tallenna avaintiedosto suojattuun sijaintiin. Tarvitset sitä, jos haluat luoda
<translation id="936646668635477464">Kamera ja mikrofoni</translation>
<translation id="936801553271523408">Järjestelmän diagnostiikkatiedot</translation>
<translation id="93766956588638423">Korjaa laajennus</translation>
-<translation id="938568644810664664">Kokeile kysyä "Ok Google, what song is this?" tai "Ok Google, what's on my screen?"</translation>
+<translation id="938568644810664664">Kokeile kysyä "Hey Google, what song is this?" tai "Hey Google, what's on my screen?"</translation>
<translation id="938623846785894166">Epätavallinen tiedosto</translation>
<translation id="939401694733344652">Näitä tilejä ei käytetä Android-sovellusten kanssa tällä hetkellä. Jos valitset Android-sovelluksen kanssa käytettävän tilin, sitä voidaan käyttää myös muilla Android-sovelluksilla. Voit muokata Android-sovelluksen pääsyä valitsemalla <ph name="LINK_BEGIN" />Asetukset &gt; Tilit<ph name="LINK_END" />.</translation>
<translation id="939598580284253335">Anna tunnuslause</translation>
diff --git a/chrome/app/resources/generated_resources_km.xtb b/chrome/app/resources/generated_resources_km.xtb
index 29b9a409b0fc..822d3a841ecb 100644
--- a/chrome/app/resources/generated_resources_km.xtb
+++ b/chrome/app/resources/generated_resources_km.xtb
@@ -5000,7 +5000,7 @@
<translation id="5891688036610113830">បណ្ដាញ Wi-Fi ជា​អាទិភាព</translation>
<translation id="5895138241574237353">ចាប់ផ្តើមឡើងវិញ</translation>
<translation id="5895335062901455404">សកម្មភាព និង​ចំណូលចិត្ត​ដែលអ្នក​បានរក្សាទុក​នឹងអាចប្រើបាន​នៅលើរាល់​ឧបករណ៍ ChromeOS Flex នៅពេលអ្នក​ចូល​ដោយប្រើ​គណនី Google របស់អ្នក។ អ្នកអាចជ្រើសរើស​អ្វីដែលត្រូវធ្វើសមកាលកម្ម​នៅក្នុងការកំណត់។</translation>
-<translation id="5896436821193322561">កុំអនុញ្ញាត</translation>
+<translation id="5896436821193322561">មិនអនុញ្ញាត</translation>
<translation id="5900302528761731119">រូបថត Google ទម្រង់</translation>
<translation id="590036993063074298">ព័ត៌មានលម្អិតអំពីគុណភាពនៃការបញ្ចាំង</translation>
<translation id="5901069264981746702">ទិន្នន័យស្នាមម្រាមដៃ​របស់អ្នកត្រូវបាន​រក្សាទុកយ៉ាង​មានសុវត្ថិភាព និងមិនចេញពី <ph name="DEVICE_TYPE" /> របស់អ្នកឡើយ។ <ph name="LINK_BEGIN" />ស្វែងយល់បន្ថែម<ph name="LINK_END" /></translation>
diff --git a/chrome/app/resources/generated_resources_ml.xtb b/chrome/app/resources/generated_resources_ml.xtb
index 75308f5d91c0..e699d814127b 100644
--- a/chrome/app/resources/generated_resources_ml.xtb
+++ b/chrome/app/resources/generated_resources_ml.xtb
@@ -254,7 +254,7 @@
<translation id="124116460088058876">കൂടുതൽ ഭാഷകൾ</translation>
<translation id="1241753985463165747">നിർദ്ദേശിക്കപ്പെടുമ്പോൾ നിലവിലെ വെബ്‌സൈറ്റിലെ നിങ്ങളുടെ ഡാറ്റ മുഴുവൻ വായിച്ച് അതിൽ മാറ്റം വരുത്തുക</translation>
<translation id="1242633766021457174"><ph name="THIRD_PARTY_TOOL_NAME" />, നിങ്ങളുടെ ക്രമീകരണം റീസെറ്റ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു.</translation>
-<translation id="1243314992276662751">അപ്‌ലോഡുചെയ്യുക</translation>
+<translation id="1243314992276662751">അപ്‌ലോഡ് ചെയ്യുക</translation>
<translation id="1243436884219965846">പാസ്‌വേഡുകൾ അവലോകനം ചെയ്യൂ</translation>
<translation id="1244265436519979884">Linux പുനഃസ്ഥാപിക്കൽ നിലവിൽ പുരോഗതിയിലാണ്</translation>
<translation id="1244303850296295656">വിപുലീകരണ പിശക്</translation>
@@ -2663,7 +2663,7 @@
<translation id="3554493885489666172">നിങ്ങളുടെ ഉപകരണം മാനേജ് ചെയ്യുന്നത് <ph name="PROFILE_NAME" /> ആണ്. ഈ ഉപകരണത്തിലെ ഏത് പ്രൊഫൈലിലുള്ള ഡാറ്റയും അഡ്‌മിൻമാർക്ക് ആക്‌സസ് ചെയ്യാം.</translation>
<translation id="3555812735919707620">വിപുലീകരണം നീക്കംചെയ്യുക</translation>
<translation id="3556000484321257665">നിങ്ങളുടെ തിരയൽ യന്ത്രം <ph name="URL" /> എന്നതിലേക്ക് മാറ്റി.</translation>
-<translation id="3556433843310711081">നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്കുചെയ്യാൻ മാനേജർക്ക് കഴിയും</translation>
+<translation id="3556433843310711081">നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്ക് ചെയ്യാൻ മാനേജർക്ക് കഴിയും</translation>
<translation id="3557101512409028104">Family Link ഉപയോഗിച്ച് വെബ്സൈറ്റ് നിയന്ത്രണങ്ങളും സ്ക്രീൻ സമയ പരിധികളും സജ്ജീകരിക്കുക</translation>
<translation id="3559262020195162408">ഉപകരണത്തിൽ നയം ഇൻസ്‌റ്റാൾ ചെയ്യാനായില്ല.</translation>
<translation id="3559533181353831840">ഏകദേശം <ph name="TIME_LEFT" /> ശേഷിക്കുന്നു</translation>
@@ -4827,7 +4827,7 @@
<translation id="5728450728039149624">Smart Lock സ്ക്രീൻ ലോക്ക് ഓപ്ഷനുകൾ</translation>
<translation id="5729712731028706266">&amp;കാണുക</translation>
<translation id="5731247495086897348">ഒട്ടിക്കു&amp;കയും പോകുകയും ചെയ്യുക</translation>
-<translation id="5732392974455271431">നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്കുചെയ്യാൻ രക്ഷിതാക്കൾക്ക് കഴിയും</translation>
+<translation id="5732392974455271431">നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്ക് ചെയ്യാൻ രക്ഷിതാക്കൾക്ക് കഴിയും</translation>
<translation id="5734362860645681824">കമ്മ്യൂണിക്കേഷനുകൾ</translation>
<translation id="5734697361979786483">ഫയൽ പങ്കിടൽ ചേർക്കുക</translation>
<translation id="5736796278325406685">ശരിയായ ഉപയോക്തൃനാമം നൽകുക</translation>
@@ -6861,7 +6861,7 @@
<translation id="7753735457098489144">സ്‌റ്റോറേജ് സ്‌പെയ്‌സ് ഇല്ലാത്തതിനാൽ ഇൻസ്‌റ്റാൾ ചെയ്യാനായില്ല. ഇടം സൃഷ്‌ടിക്കാൻ, ഉപകരണ സ്റ്റോറേജിൽ നിന്ന് ഫയലുകൾ ഇല്ലാതാക്കുക.</translation>
<translation id="7754347746598978109">JavaScript ഉപയോഗിക്കാൻ അനുവദിക്കുന്നില്ല</translation>
<translation id="7754704193130578113">ഡൗൺലോഡ് ചെയ്യുന്നതിനു മുമ്പ് ഓരോ ഫയലും എവിടെ സംരക്ഷിക്കണമെന്ന് ചോദിക്കുക</translation>
-<translation id="7755287808199759310">നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്കുചെയ്യാൻ രക്ഷിതാവിന് കഴിയും</translation>
+<translation id="7755287808199759310">നിങ്ങൾക്ക് വേണ്ടി ഇത് അൺബ്ലോക്ക് ചെയ്യാൻ രക്ഷിതാവിന് കഴിയും</translation>
<translation id="7757592200364144203">ഉപകരണത്തിന്റെ പേര് മാറ്റുക</translation>
<translation id="7757739382819740102">സമീപത്തുള്ള കോൺടാക്റ്റുകൾക്ക് നിങ്ങളുമായി പങ്കിടാം. അനുമതി ആവശ്യമാണ്.</translation>
<translation id="7757787379047923882"><ph name="DEVICE_NAME" /> ഉപകരണത്തിൽ നിന്ന് പങ്കിട്ട ടെക്‌സ്റ്റ്</translation>
diff --git a/components/strings/components_strings_zu.xtb b/components/strings/components_strings_zu.xtb
index 81baebec6ab4..7070d0c76b70 100644
--- a/components/strings/components_strings_zu.xtb
+++ b/components/strings/components_strings_zu.xtb
@@ -1417,7 +1417,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum
<translation id="484671803914931257">Thola isaphulelo ku-<ph name="MERCHANT_NAME" /> nokwengeziwe</translation>
<translation id="4850886885716139402">Buka</translation>
<translation id="4852429274334674023">Amasistimu okusebenza</translation>
-<translation id="485316830061041779">Isi-German</translation>
+<translation id="485316830061041779">German</translation>
<translation id="4853901935952445031">Le syithi ngeke ikwazi ukusebenzisa i-U2F API ngemuva kuka-Febhuwari 2022. Uma ungumnikazi wesayithi, kufanele uyishintshe ukuze usebenzise i-API Yokufakazela Ubuqiniso ye-API.</translation>
<translation id="4854362297993841467">Le ndlela yokulethwa ayitholakali. Zama indlela ehlukile.</translation>
<translation id="4854853140771946034">Dala inothi elisha ngokushesha ku-Google Keep</translation>
@@ -1646,7 +1646,7 @@ Lokhu uma kungenjalo kuzovinjelwa izilungiselelo zakho zobumfihlo. Lokhu kuzovum
<translation id="5457113250005438886">Ayivumelekile</translation>
<translation id="5458150163479425638">{CONTACT,plural, =0{<ph name="CONTACT_PREVIEW" />}=1{<ph name="CONTACT_PREVIEW" /> nongu-<ph name="NUMBER_OF_ADDITIONAL_CONTACTS" /> ngaphezulu}one{<ph name="CONTACT_PREVIEW" /> nongu-<ph name="NUMBER_OF_ADDITIONAL_CONTACTS" /> ngaphezulu}other{<ph name="CONTACT_PREVIEW" /> nongu-<ph name="NUMBER_OF_ADDITIONAL_CONTACTS" /> ngaphezulu}}</translation>
<translation id="5463625433003343978">Ithola amadivayisi...</translation>
-<translation id="5469868506864199649">Isi-Italian</translation>
+<translation id="5469868506864199649">Italian</translation>
<translation id="5470230812924696184">Ubunjiniyela bamabhuloho</translation>
<translation id="5470861586879999274">&amp;Yenza futhi ukuhlela</translation>
<translation id="5471337644440862957">Awama-movie wehlaya</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_hy.xtb b/ui/chromeos/translations/ui_chromeos_strings_hy.xtb
index 9265335e765c..80b91e20064a 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_hy.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_hy.xtb
@@ -121,7 +121,7 @@
<translation id="1995337122023280937">Անցնել ֆայլի տեղադրություն</translation>
<translation id="2001796770603320721">Կառավարել Drive-ում</translation>
<translation id="2009067268969781306">Ֆորմատավորման արդյունքում կրիչի վրա պահված բոլոր տվյալները կջնջվեն: Այս գործողությունը հնարավոր չէ հետարկել:</translation>
-<translation id="2025955442973426285">տիգրինյա</translation>
+<translation id="2025955442973426285">թիգրինյա</translation>
<translation id="2028997212275086731">RAR արխիվ</translation>
<translation id="2036414735548252477">LZMA սեղմված tar-արխիվ</translation>
<translation id="2037845485764049925">ռուսերեն</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_ml.xtb b/ui/chromeos/translations/ui_chromeos_strings_ml.xtb
index 16f4b63d0683..089a3df8bdc9 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_ml.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_ml.xtb
@@ -32,7 +32,7 @@
<translation id="1209796539517632982">യാന്ത്രിക നാമ സെർവറുകൾ</translation>
<translation id="1210831758834677569">ലാവോ</translation>
<translation id="1223825810409523901">Chrome വിപുലീകരണം</translation>
-<translation id="1243314992276662751">അപ്‌ലോഡുചെയ്യുക</translation>
+<translation id="1243314992276662751">അപ്‌ലോഡ് ചെയ്യുക</translation>
<translation id="1249250836236328755">വിഭാഗം</translation>
<translation id="1254593899333212300">നേരിട്ടുള്ള ഇന്‍റര്‍നെറ്റ് കണക്ഷന്‍</translation>
<translation id="1272293450992660632">പിൻ മൂല്യങ്ങൾ പൊരുത്തപ്പെടുന്നില്ല.</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb
index 474eda5c24ca..0f262a4231f8 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_zu.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_zu.xtb
@@ -57,7 +57,7 @@
<translation id="1439919885608649279">Umuntu onezimbali</translation>
<translation id="1471718551822868769">Isi-Slovak</translation>
<translation id="1474339897586437869">I-"<ph name="FILENAME" />" ayizange ilayishwe. Asikho isikhala esanele esikhululekile ku-Google Drayivu yakho.</translation>
-<translation id="1482884275703521657">Isi-Finnish</translation>
+<translation id="1482884275703521657">Finnish</translation>
<translation id="148466539719134488">I-Swiss</translation>
<translation id="1497522201463361063">Ayikwazi ukuqamba kabusha i-"<ph name="FILE_NAME" />". <ph name="ERROR_MESSAGE" /></translation>
<translation id="1499943022354839699">English (US) enekhibhodi ye-Dvorak</translation>
@@ -72,7 +72,7 @@
<translation id="158849752021629804">Idinga inethiwekhi yasekhaya</translation>
<translation id="1589128298353575783"><ph name="NUMBER_OF_PB" /> PB</translation>
<translation id="1620510694547887537">Ikhamela</translation>
-<translation id="162175252992296058">Isi-Portuguese nge-US International keyboard</translation>
+<translation id="162175252992296058">Portuguese nge-US International keyboard</translation>
<translation id="1629521517399325891">Isitifiketi somsebenzisi asitholakali ukufakazela ubuqiniso inethiwekhi.</translation>
<translation id="1641780993263690097">Chinese Pinyin</translation>
<translation id="1646019627374511909">Yenza amafayela angu-<ph name="NUMBER_OF_ITEMS" /> atholakale ngokungaxhunyiwe kwi-inthanethi</translation>
@@ -87,12 +87,12 @@
<translation id="1722487484194605434">Izipha izinto ezingu-<ph name="NUMBER_OF_ITEMS" />...</translation>
<translation id="1722687688096767818">Ingeza Iphrofayela...</translation>
<translation id="1726100011689679555">Amagama wamasevisi</translation>
-<translation id="1729953886957086472">Isi-German (Germany)</translation>
+<translation id="1729953886957086472">German (Germany)</translation>
<translation id="1730235522912993863">Chinese Cangjie</translation>
<translation id="1731889557567069540">izinto ezingu-<ph name="NUMBER_OF_ITEMS" /> zikopishiwe.</translation>
<translation id="174173592514158117">Bonisa onke amafolda e-Google Play</translation>
<translation id="1742316578210444689">Ukugugulwa kwamaletha kwesi-Hebrew</translation>
-<translation id="1747761757048858544">Isi-Dutch (I-Netherlands)</translation>
+<translation id="1747761757048858544">Dutch (I-Netherlands)</translation>
<translation id="174937106936716857">Inani lokubalwa kwefayela</translation>
<translation id="1773212559869067373">Isitifiketi sokuqinisekisa sinqatshelwe endaweni</translation>
<translation id="1775381402323441512">Ulwazi lwevidiyo</translation>
@@ -114,7 +114,7 @@
<translation id="1924372192547904021">Kufomethwe i-<ph name="DRIVE_NAME" /></translation>
<translation id="1931134289871235022">Isi-Slovak</translation>
<translation id="1933345018156373194">Ukuhambisa kuhlulekile, iphutha elingalindelekile: <ph name="ERROR_MESSAGE" /></translation>
-<translation id="1936717151811561466">Isi-Finnish</translation>
+<translation id="1936717151811561466">Finnish</translation>
<translation id="1942765061641586207">Ukulungiswa kwesithombe</translation>
<translation id="1972984168337863910">Nweba amaphaneli wempendulo yamafayela</translation>
<translation id="1984456723671657197">Lolu hlobo lwefayela alusekelwa. <ph name="BEGIN_LINK_HELP" />Funda kabanzi<ph name="END_LINK_HELP" /> ngokuvula amafayela ku-Chrome OS.</translation>
@@ -140,7 +140,7 @@
<translation id="2142680004883808240">Isi-Russian esinekhibhodi ye-Phonetic YaZHert</translation>
<translation id="2143778271340628265">Ukulungiselelwa okwenziwa ngesandla kommeleli</translation>
<translation id="2163152940313951844">Inhlamvu engavumelekile: <ph name="CHARACTER_NAME" /></translation>
-<translation id="2184934335987813305">Isi-Portuguese nge-US International PC keyboard</translation>
+<translation id="2184934335987813305">Portuguese nge-US International PC keyboard</translation>
<translation id="2198315389084035571">isi-Sipmlified Chinese</translation>
<translation id="2208158072373999562">Ingobo yomlando yeziphu</translation>
<translation id="22085916256174561">Korean</translation>
@@ -177,7 +177,7 @@
<translation id="2467267713099745100"><ph name="NETWORK_TYPE" /> inethiwekhi, valiwe</translation>
<translation id="2468402215065996499">I-Tamagotchi</translation>
<translation id="2470939964922472929">Iphinikhodi engalungile ifakwe izikhathi eziningi kakhulu. Ukusetha Iphinikhodi entsha, faka ukhiye we-Personal Unblocking Key (PUK) onamadijithi ayi-8 onikezwe inkampani yakho yenethiwekhi.</translation>
-<translation id="2500392669976258912">Isi-Gujarati Phonetic</translation>
+<translation id="2500392669976258912">Gujarati Phonetic</translation>
<translation id="2515586267016047495">I-Alt</translation>
<translation id="2517472476991765520">Skena</translation>
<translation id="2534155362429831547"><ph name="NUMBER_OF_ITEMS" /> izinto ezisusiwe</translation>
@@ -215,7 +215,7 @@
<translation id="2843806747483486897">Shintsha okuzenzakalelayo...</translation>
<translation id="2850124913210091882">Yenza isipele</translation>
<translation id="2873951654529031587">Udoti</translation>
-<translation id="288024221176729610">Isi-Czech</translation>
+<translation id="288024221176729610">Czech</translation>
<translation id="2887525882758501333">Idokhumenti ye-PDF</translation>
<translation id="2888807692577297075">Azikho izinto ezifana ne-&lt;b&gt;"<ph name="SEARCH_STRING" />"&lt;/b&gt;</translation>
<translation id="2894654529758326923">Ulwazi</translation>
@@ -251,7 +251,7 @@
<translation id="3188257591659621405">Amafayela ami</translation>
<translation id="3197563288998582412">I-UK Dvorak</translation>
<translation id="3202131003361292969">Indlela</translation>
-<translation id="3205852408225871810">Isi-Portuguese (Brazil)</translation>
+<translation id="3205852408225871810">Portuguese (Brazil)</translation>
<translation id="3224239078034945833">Izilimi eziningi ze-Canadian</translation>
<translation id="3236289833370040187">Ubunikazi buzodluliselwa ku-<ph name="DESTINATION_DOMAIN" />.</translation>
<translation id="3241720467332021590">Irish</translation>
@@ -279,7 +279,7 @@
<translation id="3382143449143186018">Nepali ngekhibhodi ye-InScript</translation>
<translation id="338691029516748599">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="SECURITY_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, kuphethwe umlawuli wakho, xhuma</translation>
<translation id="3408072735282270043">Yenza kusebenze, i-<ph name="NETWORK_NAME" /></translation>
-<translation id="3408236822532681288">Isi-German (Germany) esinekhibhodi ye-Neo 2</translation>
+<translation id="3408236822532681288">German (Germany) esinekhibhodi ye-Neo 2</translation>
<translation id="3414856743105198592">Ukufometha imidiya engasuswa kuzosula yonke idatha. Ingabe ufisa ukuqhubeka?</translation>
<translation id="3437801641691368414">Isikhathi okudalwe ngaso</translation>
<translation id="343907260260897561">Ikhamera esheshayo</translation>
@@ -291,7 +291,7 @@
<translation id="3486821258960016770">Mongolian</translation>
<translation id="3495304270784461826"><ph name="COUNT" /> amaphutha.</translation>
<translation id="3509680540198371098">Inethiwkehi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="SECURITY_STATUS" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, imininingwane</translation>
-<translation id="3522708245912499433">Isi-Portuguese</translation>
+<translation id="3522708245912499433">Portuguese</translation>
<translation id="3524311639100184459">Isexwayiso: Lamafayela awesikhashana futhi angase asuswe ngokuzenzekelayo ukukhulula isikhala sediski. <ph name="BEGIN_LINK" />Funda kabanzi<ph name="END_LINK" /></translation>
<translation id="3527085408025491307">Ifolda</translation>
<translation id="3549797760399244642">Hamba ku-drive.google.com...</translation>
@@ -333,7 +333,7 @@
<translation id="3830674330436234648">Akukho ukudlala okutholakalayo</translation>
<translation id="383652340667548381">Isi-Serbian</translation>
<translation id="385051799172605136">Emuva</translation>
-<translation id="3855472144336161447">Isi-German Neo 2</translation>
+<translation id="3855472144336161447">German Neo 2</translation>
<translation id="3858860766373142691">Igama</translation>
<translation id="386548886866354912">Pakisha nge-<ph name="EXTENSION_NAME" /></translation>
<translation id="3866249974567520381">Incazelo</translation>
@@ -412,13 +412,13 @@
<translation id="4603392156942865207">Ikopisha i-<ph name="FILE_NAME" /> ku-<ph name="FOLDER_NAME" /></translation>
<translation id="4631887759990505102">Umculi</translation>
<translation id="4642769377300286600">Ifaka iphrofayela leselula, Inethiwekhi engu-<ph name="NETWORK_INDEX" /> kwangu-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="NETWORK_PROVIDER_NAME" /></translation>
-<translation id="4646813851450205600">Isi-Czech esinekhibhodi ye-Qwerty</translation>
+<translation id="4646813851450205600">Czech esinekhibhodi ye-Qwerty</translation>
<translation id="4656293982926141856">Le khompyutha</translation>
<translation id="4656777537938206294">Yenza amafayela atholakala ngokungaxhunyiwe kwi-inthanethi</translation>
<translation id="4658782175094886150">Umuntu okwisthwathwa</translation>
<translation id="4669606053856530811">Amalungu e-'<ph name="SOURCE_NAME" />' azolahlekelwa ukufinyelela ngaphandle kokuthi lezi zinto zabiwe nabo.</translation>
<translation id="467809019005607715">Google Amaslayidi</translation>
-<translation id="4690246192099372265">Isi-Swedish</translation>
+<translation id="4690246192099372265">Swedish</translation>
<translation id="4693155481716051732">I-Sushi</translation>
<translation id="4694604912444486114">Inkawu</translation>
<translation id="469612310041132144">Chinese Esisheshayo</translation>
@@ -433,7 +433,7 @@
<translation id="4737050008115666127">Ukufika</translation>
<translation id="4747271164117300400"> Macedonian</translation>
<translation id="4759238208242260848">Ukulanda</translation>
-<translation id="4779041693283480986">Isi-Portuguese (Portugal)</translation>
+<translation id="4779041693283480986">Portuguese (Portugal)</translation>
<translation id="4779136857077979611">I-Onigiri</translation>
<translation id="4784330909746505604">Iphrezentheshini ye-PowerPoint</translation>
<translation id="4788401404269709922"><ph name="NUMBER_OF_KB" /> KB</translation>
@@ -445,7 +445,7 @@
<translation id="4839847978919684242"><ph name="SELCTED_FILES_COUNT" /> izinto ezikhethiwe</translation>
<translation id="4843566743023903107">Ama-Chromebase</translation>
<translation id="4850886885716139402">Buka</translation>
-<translation id="485316830061041779">Isi-German</translation>
+<translation id="485316830061041779">German</translation>
<translation id="4867079195717347957">Chofoza ukuze uhlunge ikholomu ngendlela eyehlayo.</translation>
<translation id="4873265419374180291"><ph name="NUMBER_OF_BYTES" /> bytes</translation>
<translation id="4880214202172289027">Isilayida sevolumu</translation>
@@ -478,11 +478,11 @@
<translation id="5081517858322016911"><ph name="TOTAL_FILE_SIZE" /> wamafayela uzosulwa</translation>
<translation id="508423945471810158">Ihambisa izinto ezi-<ph name="NUMBER_OF_ITEMS" /> ku-<ph name="FOLDER_NAME" /></translation>
<translation id="509429900233858213">Kuvele iphutha.</translation>
-<translation id="5098629044894065541">Isi-Hebrew</translation>
+<translation id="5098629044894065541">Hebrew</translation>
<translation id="5109254780565519649">Kuvele iphutha. Ezinye zezinto kungenzeka azibuyiselwanga.</translation>
<translation id="5110329002213341433">English (Canada)</translation>
<translation id="5123433949759960244">I-Basketball</translation>
-<translation id="5129662217315786329">Isi-Polish</translation>
+<translation id="5129662217315786329">Polish</translation>
<translation id="5144820558584035333">Isethi ye-Hangul 3 (390)</translation>
<translation id="5145331109270917438">Idethi elungiswe ngayo</translation>
<translation id="515594325917491223">I-Chess</translation>
@@ -528,7 +528,7 @@
<translation id="5438282218546237410">Ayikho imiphumela ye-<ph name="SEARCH_TERM" />.</translation>
<translation id="5449551289610225147">Iphasiwedi engavumelekile</translation>
<translation id="5463231940765244860">Faka</translation>
-<translation id="5469868506864199649">Isi-Italian</translation>
+<translation id="5469868506864199649">Italian</translation>
<translation id="5473333559083690127">Phinda ufake iphinikhodi entsha</translation>
<translation id="5489067830765222292">Latvian</translation>
<translation id="5489965683297092283">Isihlungi esithi <ph name="FILTER_NAME" /> sivaliwe.</translation>
@@ -554,11 +554,11 @@
<translation id="5691596662111998220">Iphutha, i-<ph name="FILE_NAME" /> ayisekho.</translation>
<translation id="5698411045597658393">I-<ph name="NETWORK_NAME" />, Vula</translation>
<translation id="5700087501958648444">Ulwazi lomsindo</translation>
-<translation id="5724172041621205163">Isi-Thai esinekhibhodi ye-Pattachote</translation>
+<translation id="5724172041621205163">Thai esinekhibhodi ye-Pattachote</translation>
<translation id="5731409020711461763">1 isithombe esisha</translation>
<translation id="5752453871435543420">Isipele samafu we-Chrome OS</translation>
<translation id="5756666464756035725">I-Hungarian QWERTY</translation>
-<translation id="5763377084591234761">Isi-German (Switzerland)</translation>
+<translation id="5763377084591234761">German (Switzerland)</translation>
<translation id="5769519078756170258">Umsingathi noma isizinda esizokhishwa</translation>
<translation id="5775750595919327203">Isi-Urdu</translation>
<translation id="5776325638577448643">Susa futhi ufomethe</translation>
@@ -581,7 +581,7 @@
<translation id="5911887972742538906">Kuvele iphutha phakathi nokufakwa kohlelo lwakho lokusebenza lwe-Linux.</translation>
<translation id="5912396950572065471">Ifomethi</translation>
<translation id="5913638992615760742">Ukusebenza kwekhophi kuhlulekile, iphutha elingalindelekile: <ph name="ERROR_MESSAGE" /></translation>
-<translation id="5926082595146149752">Isi-Dutch (Netherlands) nge-US International PC keyboard</translation>
+<translation id="5926082595146149752">Dutch (Netherlands) nge-US International PC keyboard</translation>
<translation id="5932901536148835538">I-Chromebit</translation>
<translation id="5955954492236143329"><ph name="NUMBER_OF_ITEMS" /> izinto</translation>
<translation id="5957366693331451795">Ama-Chromebox</translation>
@@ -614,10 +614,10 @@
<translation id="6199801702437275229">Ilindele ulwazi lesikhala...</translation>
<translation id="6205710420833115353">Eminye imisebenzi ithatha isikhathi eside kunokulindelekile. Ingabe ufuna ukuyikhansela?</translation>
<translation id="6220423280121890987">Isi-Phunjabi</translation>
-<translation id="6224240818060029162">Isi-Danish</translation>
+<translation id="6224240818060029162">Danish</translation>
<translation id="6224253798271602650">Ifomethi <ph name="DRIVE_NAME" /></translation>
<translation id="6227235786875481728">Leli fayela alikwazanga ukudlalwa.</translation>
-<translation id="6241349547798190358">Isi-Dutch (Belgium)</translation>
+<translation id="6241349547798190358">Dutch (Belgium)</translation>
<translation id="6248400709929739064">Nika amandla imibhalo engezansi</translation>
<translation id="6267547857941397424">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="PHONE_NAME" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, Ibhethri lefoni <ph name="BATTERY_STATUS" />%, xhuma</translation>
<translation id="6269630227984243955">Malay</translation>
@@ -703,7 +703,7 @@
<translation id="6976795442547527108">Ibhubezi</translation>
<translation id="6978611942794658017">Leli fayela lidizayinelwe i-PC esebenzisa isofthiwe ye-Windows. Lokhu akuhambisani nedivayisi yakho esebenzisa i-Chrome OS. Sicela useshe Isitolo Sewebhu se-Chrome ukuze uthole uhlelo lokusebenza lokungena esikhundleni olufanele.</translation>
<translation id="6979158407327259162">I-Google Drayivu</translation>
-<translation id="6989942356279143254">Isi-Swedish</translation>
+<translation id="6989942356279143254">Swedish</translation>
<translation id="6990081529015358884">Usuphelelwe yisikhala</translation>
<translation id="6998711733709403587"><ph name="SELCTED_FOLDERS_COUNT" /> amafolda akhethiwe</translation>
<translation id="7012943028104619157"><ph name="ROOT_TITLE" /> (<ph name="ROOT_SUMMARY" />)</translation>
@@ -712,7 +712,7 @@
<translation id="7037472120706603960">Isi-Tamil (Ukuguqulwa kwamaletha)</translation>
<translation id="7040138676081995583">Vula nge...</translation>
<translation id="7048024426273850086">Inethiwekhi ye-<ph name="NETWORK_INDEX" /> kwangu-<ph name="NETWORK_COUNT" />, <ph name="PHONE_NAME" />, <ph name="PROVIDER_NAME" />, Amandla Esignali <ph name="SIGNAL_STRENGTH" />%, Ibhethri Lefoni <ph name="BATTERY_STATUS" />%, Xhuma</translation>
-<translation id="7075931588889865715">Isi-Thai esinekhibhodi ye-TIS 820-2531</translation>
+<translation id="7075931588889865715">Thai esinekhibhodi ye-TIS 820-2531</translation>
<translation id="708278670402572152">Nqamula ukuze unike amandla ukuskena</translation>
<translation id="7086590977277044826">Isi-Tamil esinekhibhodi ye-InScript</translation>
<translation id="7103992300314999525"> Macedonian</translation>
@@ -736,13 +736,13 @@
<translation id="7294063083760278948">Ukuguqulwa kwamaletha ngesi-Telugu</translation>
<translation id="7295662345261934369">Yabelana nabanye</translation>
<translation id="7297443947353982503">Igama lomsebenzisi/iphasiwedi ayilungile noma i-EAP-auth yehlulekile</translation>
-<translation id="7309413087278791451">Isi-German (Belgium)</translation>
+<translation id="7309413087278791451">German (Belgium)</translation>
<translation id="7339898014177206373">Iwindi elisha</translation>
<translation id="7343393116438664539">Isi-Vietnamese Telex</translation>
<translation id="7359359531237882347">Ukukopisha izinto ezingu-<ph name="NUMBER_OF_ITEMS" />...</translation>
<translation id="7375951387215729722">Uhlu lwefayela luhlungwe nge-<ph name="COLUMN_NAME" /> nge-oda eyehlayo.</translation>
<translation id="7402503521691663770">Amadivayisi we-ChromeOS Flex</translation>
-<translation id="7408870451288633753">Isi-Czech</translation>
+<translation id="7408870451288633753">Czech</translation>
<translation id="7417453074306512035">Ikhibhodi ye-Ethiopic</translation>
<translation id="7417705661718309329">Imephu ye-Google</translation>
<translation id="7460898608667578234">Isi-Ukrainian</translation>
@@ -760,7 +760,7 @@
<translation id="7544853251252956727">Shova</translation>
<translation id="7547009467130558110">Iteki</translation>
<translation id="7547780573915868306">isi-Lithuanian</translation>
-<translation id="7547811415869834682">Isi-Dutch</translation>
+<translation id="7547811415869834682">Dutch</translation>
<translation id="7551643184018910560">Phina kushelufu</translation>
<translation id="7553492409867692754">Nika izinhlelo zokusebenza ze-Linux imvume yokufinyelela amafayela kufolda ye-<ph name="FOLDER_NAME" /></translation>
<translation id="7575645593344061397">Ibuyisela i-"<ph name="FILENAME" />"...</translation>
@@ -794,8 +794,8 @@
<translation id="7799329977874311193">Idokhumenti ye-HTML</translation>
<translation id="7801354353640549019">Ama-Chromebook</translation>
<translation id="7805768142964895445">Isimo</translation>
-<translation id="7806708061868529807">Isi-Hebrew</translation>
-<translation id="78104721049218340">Isi-Thai esinekhibhodi ye-Kedmanee</translation>
+<translation id="7806708061868529807">Hebrew</translation>
+<translation id="78104721049218340">Thai esinekhibhodi ye-Kedmanee</translation>
<translation id="7821462174190887129"><ph name="FILE_COUNT" /> itholakele.
<ph name="LINE_BREAK1" />
Isikhala sakho se-Google Drayivu asisikhulu ngokwanele. U-<ph name="FILE_SIZE" /> ngaphezulu uyadingeka.
@@ -808,8 +808,8 @@
<translation id="7847617962681804761">Iphinikhodi iyadingeka ukuze usebenzise idatha yeselula</translation>
<translation id="7853966320808728790">I-French BÉPO</translation>
<translation id="7857117644404132472">Engeza okuhlukile</translation>
-<translation id="7868774406711971383">Isi-Polish</translation>
-<translation id="7874321682039004450">Isi-Filipino</translation>
+<translation id="7868774406711971383">Polish</translation>
+<translation id="7874321682039004450">Filipino</translation>
<translation id="7881969471599061635">Khubaza imibhalo engezansi</translation>
<translation id="78946041517601018">Amadrayivu abiwayo</translation>
<translation id="7908793776359722643">Ukufometha ingxenye kuzosula yonke idatha egcinwe kuyo. Lesi senzo asikwazi ukuhlehliswa.</translation>
@@ -893,7 +893,7 @@
<translation id="8540608333167683902">Inethiwekhi <ph name="NETWORK_INDEX" /> ye-<ph name="NETWORK_COUNT" />, <ph name="NETWORK_NAME" />, <ph name="CONNECTION_STATUS" />, amandla esignali <ph name="SIGNAL_STRENGTH" />%, imininingwane</translation>
<translation id="8545476925160229291">English(US)</translation>
<translation id="854655314928502177">I-URL yokutholakala kommeleli ozenzakalelayo wewebhu</translation>
-<translation id="8549186985808798022">Isi-Italian</translation>
+<translation id="8549186985808798022">Italian</translation>
<translation id="8551494947769799688">Latvian</translation>
<translation id="8560515948038859357">Isi-Cantonese</translation>
<translation id="8561206103590473338">Indlovu</translation>
@@ -932,7 +932,7 @@
<translation id="8900820606136623064">Hungarian</translation>
<translation id="8903931173357132290">Thola iziqu</translation>
<translation id="8912078710089354287">Inja enyakazisa umsila</translation>
-<translation id="8919081441417203123">Isi-Danish</translation>
+<translation id="8919081441417203123">Danish</translation>
<translation id="8965697826696209160">Asikho isikhala esanele.</translation>
<translation id="8970501467542182729">Leli fayela lidizayinelwe ikhompuyutha esebenzisa isofthiwe ye-Macintosh. Lokhu akuhambelani nedivayisi yakho esebenzisa i-Chrome OS. <ph name="BEGIN_LINK_HELP" />Funda kabanzi<ph name="END_LINK_HELP" /> ngokuvula amafayela ku-Chrome OS.</translation>
<translation id="8997962250644902079">Chinese (Traditional) Pinyin</translation>
diff --git a/ui/strings/translations/ui_strings_ml.xtb b/ui/strings/translations/ui_strings_ml.xtb
index 57b083b88175..1d6805b8907c 100644
--- a/ui/strings/translations/ui_strings_ml.xtb
+++ b/ui/strings/translations/ui_strings_ml.xtb
@@ -6,7 +6,7 @@
<translation id="1127811143501539442">{DAYS,plural, =1{ഒരു ദിവസം മുമ്പ്}other{# ദിവസം മുമ്പ്}}</translation>
<translation id="1156623771253174079">{SECONDS,plural, =1{ഒരു മിനിറ്റിന് മുമ്പ്}other{# മിനിറ്റ് മുമ്പ്}}</translation>
<translation id="1169783199079129864">{MINUTES,plural, =1{ 1 മീറ്റര്‍}other{# മീറ്റർ}}</translation>
-<translation id="1243314992276662751">അപ്‌ലോഡുചെയ്യുക</translation>
+<translation id="1243314992276662751">അപ്‌ലോഡ് ചെയ്യുക</translation>
<translation id="1266864766717917324"><ph name="CONTENT_TYPE" /> പങ്കിടാനായില്ല</translation>
<translation id="1269641567813814718">Win</translation>
<translation id="1291104554099683393">ചെറിയ ഭാഗങ്ങളായി ടെക്‌സ്‌റ്റ് പങ്കിടാൻ ശ്രമിക്കൂ.</translation>
--
2.37.0

View File

@ -0,0 +1,57 @@
From ccc523864d7c822d2fbc5ffa5ffb92441d8d03c0 Mon Sep 17 00:00:00 2001
From: Ben Pastene <bpastene@chromium.org>
Date: Thu, 23 Jun 2022 18:23:48 +0000
Subject: [PATCH 36/59] 5005: infra: Add the root vpython spec files to
orchestrator runtime deps
Some merge scripts import six. When preventing tools/build's venv from
propagating into their execution, they fail with import errors, eg:
https://logs.chromium.org/logs/chromium/led/infra-try-recipes-tester_chops-service-accounts.iam.gserviceaccount.com/87eaf62ee4e951d34e812ec2f066e106325201c793155d01c8e6ab39ffb58a0e/+/u/angle_unittests__with_patch__on_Ubuntu-18.04/Merge_script_log
This is because the orchestrator doesn't have chromium's root vpython
spec files, and so have no way of importing six. So this throws the root
specs into the bundle that the orchestrator fetches since it's very
possible that merge/collect scripts will pop-up in the future that need
other non-standard libs present in the root spec files.
(cherry picked from commit c263d8d4c6e6639e328b8b818e1ba038b2159807)
Bug: 1326517
Change-Id: I8c42fcfcc29c977b7c31fc58f03256b30f844a01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3718050
Reviewed-by: Stephanie Kim <kimstephanie@google.com>
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1016890}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721582
Cr-Commit-Position: refs/branch-heads/5005@{#1195}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
infra/orchestrator/BUILD.gn | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/infra/orchestrator/BUILD.gn b/infra/orchestrator/BUILD.gn
index 624de2e75eb3..b2488e07b978 100644
--- a/infra/orchestrator/BUILD.gn
+++ b/infra/orchestrator/BUILD.gn
@@ -18,8 +18,15 @@ group("orchestrator_all") {
":standard_isolated_script_merge_py",
]
- # Test specs the Orchestrator needs to trigger swarming tests
- data = [ "//testing/buildbot/*.json" ]
+ data = [
+ # Various merge/collect scripts will likely need a venv specified in
+ # the root vpython spec files.
+ "//.vpython",
+ "//.vpython3",
+
+ # Test specs the Orchestrator needs to trigger swarming tests
+ "//testing/buildbot/*.json",
+ ]
# coverage tool for the Orchestrator to merge and output coverage data
if (use_clang_coverage) {
--
2.37.0

View File

@ -0,0 +1,28 @@
From 035949396fb58fe3d690f6e6f2bd2ac020554faf Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Fri, 24 Jun 2022 01:00:37 +0000
Subject: [PATCH 37/59] Incrementing VERSION to 102.0.5005.139
Change-Id: I328ea7e8c903db76166895af4cb90a578f2a0592
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3722416
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1196}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index a63b8dbbec13..68428cc298bc 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=138
+PATCH=139
--
2.37.0

View File

@ -0,0 +1,28 @@
From e11498cece444b8f37363fd08322e87429d79e1c Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sat, 25 Jun 2022 01:00:30 +0000
Subject: [PATCH 38/59] Incrementing VERSION to 102.0.5005.140
Change-Id: Ie76b68333f90b75b8ddcb541e3b0015b169e4a86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3724132
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1197}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 68428cc298bc..4bf645c073de 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=139
+PATCH=140
--
2.37.0

View File

@ -0,0 +1,101 @@
From b1ffae104b7ed5ba78885ad1be9607ffc450fe2e Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Sat, 25 Jun 2022 14:46:50 +0000
Subject: [PATCH 39/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I671e7b0066f2e8e7694516ecb1c1f19352e3c857
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3722269
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1198}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_pt-PT.xtb | 2 +-
chrome/app/resources/generated_resources_te.xtb | 4 ++--
.../strings/translations/android_chrome_strings_te.xtb | 6 +++---
components/strings/components_strings_bs.xtb | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ash/strings/ash_strings_pt-PT.xtb b/ash/strings/ash_strings_pt-PT.xtb
index c47907a293be..0475f638819c 100644
--- a/ash/strings/ash_strings_pt-PT.xtb
+++ b/ash/strings/ash_strings_pt-PT.xtb
@@ -684,7 +684,7 @@ Eis alguns exemplos do que pode experimentar para começar.</translation>
<ph name="NOTIFICATION_2" />,
<ph name="NUM_OTHER_NOTIFICATION" /></translation>
<translation id="5003993274120026347">Frase seguinte</translation>
-<translation id="5030687792513154421">O tempo terminou</translation>
+<translation id="5030687792513154421">Acabou o tempo</translation>
<translation id="5033299697334913360">Clique em qualquer local para capturar o ecrã inteiro.</translation>
<translation id="5035236842988137213">O dispositivo <ph name="DEVICE_NAME" /> estabeleceu ligação a um novo telemóvel.</translation>
<translation id="5035389544768382859">Confirme a configuração do ecrã</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index 8af2cc506d63..65684cdb50e1 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -38,7 +38,7 @@
<translation id="1039337018183941703">ఫైల్ చెల్లదు లేదా పాడైంది</translation>
<translation id="1041175011127912238">ఈ పేజీ ప్రతిస్పందించడం లేదు</translation>
<translation id="1041263367839475438">అందుబాటులో ఉన్న పరికరాలు</translation>
-<translation id="1042174272890264476">మీ కంప్యూటర్‌‍లో కూడా <ph name="SHORT_PRODUCT_NAME" /> యొక్క అంతర్గత RLZ లైబ్రరీ ఉంటుంది. RLZ సెర్చ్‌లను మరియు నిర్దిష్ట ప్రమోషనల్ ప్రచారం ద్వారా ఉపయోగించబడిన <ph name="SHORT_PRODUCT_NAME" /> వినియోగాన్ని లెక్కించడానికి, ప్రత్యేకం కానటువంటి, వ్యక్తిగతంగా గుర్తించలేని ట్యాగ్‌ను సమర్పిస్తుంది. ఈ లేబుళ్లు కొన్నిసార్లు <ph name="PRODUCT_NAME" />లోని Google శోధన ప్రశ్నలలో కనిపిస్తాయి.</translation>
+<translation id="1042174272890264476">మీ కంప్యూటర్‌‍లో కూడా <ph name="SHORT_PRODUCT_NAME" /> యొక్క అంతర్గత RLZ లైబ్రరీ ఉంటుంది. RLZ సెర్చ్‌లను మరియు నిర్దిష్ట ప్రమోషనల్ ప్రచారం ద్వారా ఉపయోగించబడిన <ph name="SHORT_PRODUCT_NAME" /> వినియోగాన్ని లెక్కించడానికి, ప్రత్యేకం కానటువంటి, వ్యక్తిగతంగా గుర్తించలేని ట్యాగ్‌ను సమర్పిస్తుంది. ఈ లేబుళ్లు కొన్నిసార్లు <ph name="PRODUCT_NAME" />లోని Google Search ప్రశ్నలలో కనిపిస్తాయి.</translation>
<translation id="1043505821207197890">ఏదో తప్పు జరిగింది. Linux పాక్షికంగా మాత్రమే అప్‌గ్రేడ్ అయి ఉండవచ్చు. మరింత సమాచారం కోసం లాగ్స్‌ను రివ్యూ చేయండి. Files &gt; నా ఫైల్స్ &gt; <ph name="LOG_FILE" /> అనే సెట్టింగ్‌లో లాగ్స్ సేవ్ చేయబడ్డాయి</translation>
<translation id="1043818413152647937">అలాగే, ఈ యాప్‌ల నుండి డేటాను క్లియర్ చేయాలా?</translation>
<translation id="1043824690776631483">ఈ సైట్‌కు వెళ్లడానికి మీకు అనుమతి అవసరం. ఇందులో అనుచితమైన కంటెంట్ ఉండవచ్చు.</translation>
@@ -6307,7 +6307,7 @@
<translation id="7193051357671784796">మీ సంస్థ ద్వారా ఈ యాప్ జోడించబడింది. యాప్‌ను పునఃప్రారంభించడం ద్వారా దీని ఇన్‌స్టాలేషన్‌ను పూర్తి చేయండి.</translation>
<translation id="7193374945610105795"><ph name="ORIGIN" /> కోసం పాస్‌వర్డ్‌లు సేవ్ చేయబడలేదు</translation>
<translation id="7196913789568937443">Google Driveకు బ్యాకప్ చేయండి. ఏ సమయంలో అయినా సులభంగా మీ డేటాని పునరుద్ధరించండి లేదా పరికరాన్ని మార్చండి. ఈ బ్యాకప్‌లో యాప్ డేటా ఉంటుంది. బ్యాకప్‌లు Googleకి అప్‌లోడ్ చేయబడతాయి మరియు మీ Google ఖాతా పాస్‌వర్డ్‌ని ఉపయోగించి ఎన్‌క్రిప్ట్ చేయబడతాయి. <ph name="BEGIN_LINK1" />మరింత తెలుసుకోండి<ph name="END_LINK1" /></translation>
-<translation id="7197190419934240522">మీరు బ్రౌజ్ చేసే ప్రతిసారి Google శోధన మరియు Google స్మార్ట్‌లను పొందండి</translation>
+<translation id="7197190419934240522">మీరు బ్రౌజ్ చేసే ప్రతిసారి Google Search మరియు Google స్మార్ట్‌లను పొందండి</translation>
<translation id="719791532916917144">కీబోర్డ్ షార్ట్‌కట్</translation>
<translation id="7198503619164954386">మీరు ఎంటర్ప్రైజ్-ఎన్‌రోల్ చేసిన పరికరంలో ఉండాలి</translation>
<translation id="7199158086730159431">సహా&amp;యం పొందండి</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
index 657f92070e7e..8b0bd7668111 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
@@ -201,7 +201,7 @@
<translation id="2096012225669085171">అన్ని పరికరాలలో సింక్ చేయండి మరియు వ్యక్తిగతీకరించండి</translation>
<translation id="2100273922101894616">ఆటోమేటిక్ సైన్-ఇన్</translation>
<translation id="2100314319871056947">వచనాన్ని చిన్న భాగాలుగా చేసి షేర్ చేయడానికి ప్రయత్నించండి</translation>
-<translation id="2109711654079915747">పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google శోధనకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు.
+<translation id="2109711654079915747">పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google Searchకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు.
ఏదైనా పదంపై ట్యాప్ చేసి, దానిని వెతకండి. మీ శోధనను మెరుగుపరచడానికి, మరిన్ని ఎక్కువ లేదా తక్కువ పదాలను ఎంచుకునేందుకు తాకి &amp; అలాగే నొక్కి ఉంచండి. మీ శోధనను ఎడిట్ చేయడానికి, ప్యానెల్‌ను తెరిచి, చిహ్నంపై ట్యాప్ చేయడం ద్వారా కొత్త ట్యాబ్‌లో తెరిచి, శోధన పెట్టెలో మీ మార్పులు చేయండి.</translation>
<translation id="2111511281910874386">పేజీకి వెళ్లండి</translation>
@@ -260,7 +260,7 @@
<translation id="2433507940547922241">కనిపించే తీరు</translation>
<translation id="2435457462613246316">పాస్‌వర్డ్‌ను చూపించు</translation>
<translation id="2450083983707403292">మీరు <ph name="FILE_NAME" /> డౌన్‌లోడ్‌ని మళ్లీ ప్రారంభించాలనుకుంటున్నారా?</translation>
-<translation id="2450907520913474542">పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google శోధనకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు.
+<translation id="2450907520913474542">పేజీ వదిలిపెట్టకుండానే వెబ్‌సైట్‌లలోని అంశాల గురించి తెలుసుకోండి. 'వెతకడానికి తాకండి' అనే ఫీచర్ ద్వారా, ఏదైనా ఒక పదాన్ని, దానికి సంబంధించిన సందర్భాన్ని Google Searchకు పంపవచ్చు. దీని వల్ల, ఆ పదానికి సంబంధించిన నిర్వచనాలు, ఫోటోలు, శోధన ఫలితాలు, ఇతర వివరాలు పొందవచ్చు.
ఏదైనా పదంపై తాకి &amp; అలాగే నొక్కి ఉంచడం ద్వారా, దానిని వెతకండి. మీ శోధనను మెరుగుపరచడానికి, మరిన్ని లేదా తక్కువ పదాలను ఎంచుకోండి. మీ శోధనను ఎడిట్ చేయడానికి, ప్యానెల్‌ను తెరిచి, చిహ్నంపై ట్యాప్ చేయడం ద్వారా కొత్త ట్యాబ్‌లో తెరిచి, శోధన పెట్టెలో మీ మార్పులు చేయండి.</translation>
<translation id="2453860139492968684">ముగించు</translation>
@@ -1305,7 +1305,7 @@
<translation id="8127542551745560481">హోమ్ పేజీని ఎడిట్ చేయండి</translation>
<translation id="8130309322784422030">మీ స్టోర్ చేయబడిన సైన్ ఇన్ సమాచారం గడువు ముగిసి ఉండవచ్చు</translation>
<translation id="813082847718468539">సైట్ సమాచారాన్ని చూడండి</translation>
-<translation id="8137558756159375272">'వెతకడానికి తాకండి' ఫీచర్, ఎంచుకున్న పదాన్ని మరియు ప్రస్తుత పేజీని సంబంధిత సందర్భంగా Google శోధనకు పంపుతుంది. మీరు <ph name="BEGIN_LINK" />సెట్టింగ్‌లు<ph name="END_LINK" />లో దీనిని ఆఫ్ చేయవచ్చు.</translation>
+<translation id="8137558756159375272">'వెతకడానికి తాకండి' ఫీచర్, ఎంచుకున్న పదాన్ని మరియు ప్రస్తుత పేజీని సంబంధిత సందర్భంగా Google Searchకు పంపుతుంది. మీరు <ph name="BEGIN_LINK" />సెట్టింగ్‌లు<ph name="END_LINK" />లో దీనిని ఆఫ్ చేయవచ్చు.</translation>
<translation id="8153351135626613369">సపోర్ట్ చేసే వెబ్‌సైట్‌లలో మీకు సాయం చేయగలదు అని తనకు తానుగా గుర్తించినప్పుడు Assistant మీకు కనిపిస్తుంది</translation>
<translation id="8156139159503939589">మీరు ఏ భాషలను చదవగలరు?</translation>
<translation id="8168435359814927499">కంటెంట్</translation>
diff --git a/components/strings/components_strings_bs.xtb b/components/strings/components_strings_bs.xtb
index 58f9812b7b3a..9faa55d99f8f 100644
--- a/components/strings/components_strings_bs.xtb
+++ b/components/strings/components_strings_bs.xtb
@@ -769,7 +769,7 @@ To će u suprotnom biti blokirano prema vašim postavkama privatnosti. Ovo će o
<translation id="3029752078111257850">Vijesti iz svijeta</translation>
<translation id="3037605927509011580">Oh, ne!</translation>
<translation id="3041612393474885105">Informacije o potvrdi</translation>
-<translation id="305162504811187366">Historija Chrome udaljenog računara, uključujući vremenske oznake, host računare i ID-jeve sesija klijenta</translation>
+<translation id="305162504811187366">Historija Chrome udaljenog računara, uključujući vremenske oznake, host računare i ID-ove sesija klijenta</translation>
<translation id="3060227939791841287">C9 (omotnica)</translation>
<translation id="3061707000357573562">Usluga za zakrpe</translation>
<translation id="306573536155379004">Igra je počela.</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 2a66348c7b114c77befec67d09f7c51bc90481b0 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sun, 26 Jun 2022 01:00:46 +0000
Subject: [PATCH 40/59] Incrementing VERSION to 102.0.5005.141
Change-Id: I1a2244a2a320c1da6d8a7b015ba0e0e8db376acc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3723310
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1199}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 4bf645c073de..dcc62d12b2fe 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=140
+PATCH=141
--
2.37.0

View File

@ -0,0 +1,28 @@
From c449c4553089b1e88bb24d31684952641135f667 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Mon, 27 Jun 2022 01:00:35 +0000
Subject: [PATCH 41/59] Incrementing VERSION to 102.0.5005.142
Change-Id: Ic20be63d5fcc729e4839732ad7f4ca10244ca906
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3721306
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1200}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index dcc62d12b2fe..a69a3990b617 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=141
+PATCH=142
--
2.37.0

View File

@ -0,0 +1,46 @@
From cfe07affad708cf7e70decd86bb3cca64e9fca86 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Mon, 27 Jun 2022 14:21:01 +0000
Subject: [PATCH 42/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I17782c02f17621fa514cfb29abee2836213415b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3726410
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1201}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/generated_resources_ne.xtb | 2 +-
chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/app/resources/generated_resources_ne.xtb b/chrome/app/resources/generated_resources_ne.xtb
index 3b97345b7229..7f5558886721 100644
--- a/chrome/app/resources/generated_resources_ne.xtb
+++ b/chrome/app/resources/generated_resources_ne.xtb
@@ -6698,7 +6698,7 @@
<translation id="7614260613810441905">कुनै साइटले तपाईंको डिभाइसका फाइल वा फोल्डरहरू सम्पादन गर्न खोज्दा सोध्नुहोस् (सिफारिस गरिएको)</translation>
<translation id="761530003705945209">Google ड्राइभमा ब्याकअप गर्नुहोस् जुनसुकै बेला सजिलैसँग आफ्नो डेटा पुनर्स्थापना गर्नुहोस् वा यन्त्र बदल्नुहोस्। तपाईंको ब्याकअपमा एपको डेटा समावेश हुन्छ। तपाईंका ब्याकअपहरू Google मा अपलोड गरी तपाईंको Google खाताको पासवर्ड प्रयोग गरेर इन्क्रिप्ट गरिन्छन्।</translation>
<translation id="7615365294369022248">खाता थप्ने क्रममा कुनै त्रुटि भयो</translation>
-<translation id="7616214729753637086">यन्त्र दर्ता गर्दै...</translation>
+<translation id="7616214729753637086">डिभाइस दर्ता गरिँदै छ...</translation>
<translation id="7617263010641145920">Play Store अन गर्नुहोस्</translation>
<translation id="7617366389578322136">"<ph name="DEVICE_NAME" />" मा जडान गरिँदै</translation>
<translation id="7617648809369507487">आवाज नआउने म्यासेजिङ प्रयोग गर्नुहोस्</translation>
diff --git a/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb b/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb
index 0cf012125d68..fc7eb723b99f 100644
--- a/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb
+++ b/chrome/credential_provider/gaiacp/strings/gaia_resources_my.xtb
@@ -7,7 +7,7 @@
<translation id="2515346402363002066">သတ်မှတ်ပေးထားသည့်အချိန် ကုန်သွားပါပြီ။ သင့်အလုပ်သုံးအကောင့်နှင့် လက်မှတ်ထိုးဝင်ပါ။</translation>
<translation id="2549902055700841962">သင့်အလုပ်သုံး အကောင့်သို့ လက်မှတ်ထိုးဝင်၍ မရပါ။ သင့်စီမံခန့်ခွဲသူထံ ဆက်သွယ်ပါ။</translation>
<translation id="2566603360883977759">ဤအီးမေးလ်ဖြင့် လက်မှတ်ထိုးဝင်ခွင့်မပြုပါ။ အလုပ် (သို့) ကျောင်းအတွက် သင်အသုံးပြုသောအကောင့်ကို ပြန်စမ်းကြည့်ပါ။ လက်မှတ်ထိုးဝင်၍မရသေးပါက သင်၏စီမံခန့်ခွဲသူထံ ဆက်သွယ်ပါ။</translation>
-<translation id="2844349213149998955">ဤစက်ပေါ်တွင် ကိုယ်ရေးကိုယ်တာအကောင့်နှင့် လက်မှတ်ထိုးဝင်ခြင်းကို ခွင့်မပြုပါ။ အလုပ်သုံး အကောင့်နှင့် လက်မှတ်ထိုးဝင်ပါ။</translation>
+<translation id="2844349213149998955">ဤစက်ပေါ်တွင် ကိုယ်ပိုင်အကောင့်ဖြင့် လက်မှတ်ထိုးဝင်ခြင်းကို ခွင့်မပြုပါ။ အလုပ်သုံး အကောင့်ဖြင့် ဝင်ပါ။</translation>
<translation id="3217145568844727893">သင့်လက်ရှိ Windows စကားဝှက် မထည့်ဘဲ ရှေ့ဆက်ပါက ဤစက်ပေါ်ရှိဒေတာများ အပြီးဆုံးရှုံးသွားနိုင်သည်။</translation>
<translation id="3306357053520292004">ဤကွန်ပျူတာပေါ်ရှိ အသုံးပြုသူတစ်ဦးကို ဤအကောင့်သုံး၍ ထည့်ထားပြီး ဖြစ်ပါသည်။ အခြားအကောင့်တစ်ခုဖြင့် လက်မှတ်ထိုးဝင်ရောက်ပါ။</translation>
<translation id="3355053591933237049">သင့်စက်ကို အင်တာနက်ချိတ်ဆက်ထားခြင်း ရှိမရှိ စစ်ဆေးပြီး ထပ်စမ်းကြည့်ပါ</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 48449d6d4fe931000cc37681a3f797169e74c5d9 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Tue, 28 Jun 2022 01:00:24 +0000
Subject: [PATCH 43/59] Incrementing VERSION to 102.0.5005.143
Change-Id: I0045565f8b8db576541a4a3630cf6ff7db5415a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3731448
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1202}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index a69a3990b617..915e8754e191 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=142
+PATCH=143
--
2.37.0

View File

@ -0,0 +1,57 @@
From 7d8cce15d329617b717e4b48fc15054f6c8a2bc2 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
Date: Tue, 28 Jun 2022 02:29:02 +0000
Subject: [PATCH 44/59] testing: fix check_static_initializers.py for python3
for M102
(cherry picked from commit dce7a1bfd410fbeb4e17fc6562c150f5dd81310e)
Bug: 1333950
Change-Id: I876378a3ccdbb795c64172555766c027d8259f99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3689103
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1011772}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3713705
Cr-Commit-Position: refs/branch-heads/5005@{#1203}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
testing/scripts/check_static_initializers.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/testing/scripts/check_static_initializers.py b/testing/scripts/check_static_initializers.py
index 3afd112883b5..d5351e749254 100755
--- a/testing/scripts/check_static_initializers.py
+++ b/testing/scripts/check_static_initializers.py
@@ -64,7 +64,7 @@ COVERAGE_BUILD_FALLBACK_EXPECTED_MAC_SI_COUNT = 4
def run_process(command):
- p = subprocess.Popen(command, stdout=subprocess.PIPE)
+ p = subprocess.Popen(command, stdout=subprocess.PIPE, universal_newlines=True)
stdout = p.communicate()[0]
if p.returncode != 0:
raise Exception(
@@ -205,7 +205,7 @@ def main_run(args):
if sys.platform.startswith('darwin'):
rc = main_mac(src_dir,
allow_coverage_initializer = '--allow-coverage-initializer' in args.args)
- elif sys.platform == 'linux2':
+ elif sys.platform.startswith('linux'):
is_chromeos = 'buildername' in args.properties and \
'chromeos' in args.properties['buildername']
rc = main_linux(src_dir, is_chromeos)
@@ -222,7 +222,7 @@ def main_run(args):
def main_compile_targets(args):
if sys.platform.startswith('darwin'):
compile_targets = ['chrome']
- elif sys.platform == 'linux2':
+ elif sys.platform.startswith('linux'):
compile_targets = ['chrome', 'nacl_helper', 'nacl_helper_bootstrap']
else:
compile_targets = []
--
2.37.0

View File

@ -0,0 +1,81 @@
From ffa3ed225452998f8de5cdde235f3ba0a6400d83 Mon Sep 17 00:00:00 2001
From: Yuki Shiino <yukishiino@chromium.org>
Date: Tue, 28 Jun 2022 05:11:12 +0000
Subject: [PATCH 45/59] sheriff: Disable QuarantineMacTest.*
(cherry picked from commit b9fd9cf1ba3fb180e4c94dc98016066f4f876fa5)
Bug: 1334495
Change-Id: I300191c2cdf9303e71e680846e0b6568fe0cd6c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3692655
Owners-Override: Yuki Shiino <yukishiino@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1011837}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3708693
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Owners-Override: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#1204}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../quarantine/quarantine_mac_unittest.mm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/components/services/quarantine/quarantine_mac_unittest.mm b/components/services/quarantine/quarantine_mac_unittest.mm
index c7358a3ddfff..36572f572f6a 100644
--- a/components/services/quarantine/quarantine_mac_unittest.mm
+++ b/components/services/quarantine/quarantine_mac_unittest.mm
@@ -68,7 +68,8 @@ class QuarantineMacTest : public testing::Test {
base::scoped_nsobject<NSURL> file_url_;
};
-TEST_F(QuarantineMacTest, CheckMetadataSetCorrectly) {
+// TODO(crbug.com/1334495): Enable this test.
+TEST_F(QuarantineMacTest, DISABLED_CheckMetadataSetCorrectly) {
QuarantineFile(
test_file_, source_url_, referrer_url_, "",
base::BindOnce(&CheckQuarantineResult, QuarantineFileResult::OK));
@@ -76,7 +77,8 @@ TEST_F(QuarantineMacTest, CheckMetadataSetCorrectly) {
EXPECT_TRUE(IsFileQuarantined(test_file_, source_url_, referrer_url_));
}
-TEST_F(QuarantineMacTest, SetMetadataMultipleTimes) {
+// TODO(crbug.com/1334495): Enable this test.
+TEST_F(QuarantineMacTest, DISABLED_SetMetadataMultipleTimes) {
GURL dummy_url("http://www.dummy.example.com");
QuarantineFile(
test_file_, source_url_, referrer_url_, "",
@@ -97,7 +99,8 @@ TEST_F(QuarantineMacTest, IsFileQuarantined_NoAnnotationsOnFile) {
EXPECT_FALSE(IsFileQuarantined(test_file_, GURL(), GURL()));
}
-TEST_F(QuarantineMacTest, IsFileQuarantined_SourceUrlOnly) {
+// TODO(crbug.com/1334495): Enable this test.
+TEST_F(QuarantineMacTest, DISABLED_IsFileQuarantined_SourceUrlOnly) {
QuarantineFile(
test_file_, source_url_, GURL(), std::string(),
base::BindOnce(&CheckQuarantineResult, QuarantineFileResult::OK));
@@ -108,7 +111,8 @@ TEST_F(QuarantineMacTest, IsFileQuarantined_SourceUrlOnly) {
EXPECT_FALSE(IsFileQuarantined(test_file_, referrer_url_, GURL()));
}
-TEST_F(QuarantineMacTest, IsFileQuarantined_FullMetadata) {
+// TODO(crbug.com/1334495): Enable this test.
+TEST_F(QuarantineMacTest, DISABLED_IsFileQuarantined_FullMetadata) {
QuarantineFile(
test_file_, source_url_, referrer_url_, std::string(),
base::BindOnce(&CheckQuarantineResult, QuarantineFileResult::OK));
@@ -121,7 +125,8 @@ TEST_F(QuarantineMacTest, IsFileQuarantined_FullMetadata) {
EXPECT_FALSE(IsFileQuarantined(test_file_, referrer_url_, referrer_url_));
}
-TEST_F(QuarantineMacTest, IsFileQuarantined_Sanitize) {
+// TODO(crbug.com/1334495): Enable this test.
+TEST_F(QuarantineMacTest, DISABLED_IsFileQuarantined_Sanitize) {
GURL host_url{"https://user:pass@example.com/foo/bar?x#y"};
GURL host_url_clean{"https://example.com/foo/bar?x#y"};
GURL referrer_url{"https://user:pass@example.com/foo/index?x#y"};
--
2.37.0

View File

@ -0,0 +1,274 @@
From 363e0eca3560faf7d01c41c81fa622c840b705fb Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Tue, 28 Jun 2022 14:37:25 +0000
Subject: [PATCH 46/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: Ib7225417cd733aad7e0379456f5c1d83215d5b19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3731031
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#1205}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_de.xtb | 2 +-
.../app/resources/generated_resources_mr.xtb | 2 +-
.../resources/generated_resources_pt-PT.xtb | 18 +++++++++---------
.../app/resources/generated_resources_te.xtb | 2 +-
.../strings/accessibility_strings_pt-PT.xtb | 18 +++++++++---------
.../policy/resources/policy_templates_de.xtb | 2 +-
components/strings/components_strings_mr.xtb | 2 +-
components/strings/components_strings_te.xtb | 2 +-
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/ash/strings/ash_strings_de.xtb b/ash/strings/ash_strings_de.xtb
index 3298a08b2472..ecd143d7e28a 100644
--- a/ash/strings/ash_strings_de.xtb
+++ b/ash/strings/ash_strings_de.xtb
@@ -1207,7 +1207,7 @@ Neuinstallation</translation>
<translation id="8351131234907093545">Notiz erstellen</translation>
<translation id="8364673525741149932">Shelf Party ein-/ausschalten. <ph name="STATE_TEXT" /></translation>
<translation id="8371779926711439835">Weiter um einen Buchstaben</translation>
-<translation id="8371991222807690464">Die Leistung von Peripheriegeräten kann im Gastmodus eingeschränkt sein</translation>
+<translation id="8371991222807690464">Die Leistung des Peripheriegeräts kann im Gastmodus eingeschränkt sein</translation>
<translation id="8375916635258623388"><ph name="DEVICE_NAME" /> und dein Smartphone werden automatisch miteinander verbunden</translation>
<translation id="8380784334203145311">Gute Nacht,</translation>
<translation id="8382715499079447151">Spionageschutz</translation>
diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb
index 765298e60f1b..0d2076903033 100644
--- a/chrome/app/resources/generated_resources_mr.xtb
+++ b/chrome/app/resources/generated_resources_mr.xtb
@@ -2719,7 +2719,7 @@
<translation id="360180734785106144">नवीन वैशिष्ट्ये उपलब्ध होताच क्षणी ते ऑफर करते</translation>
<translation id="3602290021589620013">पूर्वावलोकन</translation>
<translation id="3602870520245633055">प्रिंट आणि स्कॅन करा</translation>
-<translation id="3603622770190368340">नेटवर्क सर्टिफिकेट प्राप्त करा</translation>
+<translation id="3603622770190368340">नेटवर्क सर्टिफिकेट मिळवा</translation>
<translation id="3604713164406837697">वॉलपेपर बदला</translation>
<translation id="3605780360466892872">बटनडाउन</translation>
<translation id="3608576286259426129">वापरकर्ता इमेज पूर्वावलोकन</translation>
diff --git a/chrome/app/resources/generated_resources_pt-PT.xtb b/chrome/app/resources/generated_resources_pt-PT.xtb
index b2d1427a5ddc..b5c662e463fc 100644
--- a/chrome/app/resources/generated_resources_pt-PT.xtb
+++ b/chrome/app/resources/generated_resources_pt-PT.xtb
@@ -13,7 +13,7 @@
<translation id="1009476156254802388">Localização do <ph name="WEB_DRIVE" /></translation>
<translation id="1010498023906173788">Este separador está associado a uma porta de série.</translation>
<translation id="1010833424573920260">{NUM_PAGES,plural, =1{Página sem resposta}other{Páginas sem resposta}}</translation>
-<translation id="1011355516189274711">Volume da síntese de voz</translation>
+<translation id="1011355516189274711">Volume da conversão de texto em voz</translation>
<translation id="1012794136286421601">Os seus ficheiros de Docs, Folhas, Slides e Desenhos estão a ser sincronizados. Abra a app Google Drive para aceder aos ficheiros online ou offline.</translation>
<translation id="1012876632442809908">Dispositivo USB-C (porta frontal)</translation>
<translation id="1015041505466489552">TrackPoint</translation>
@@ -435,7 +435,7 @@
<translation id="1426410128494586442">Sim</translation>
<translation id="142655739075382478">A app <ph name="APP_NAME" /> está bloqueada</translation>
<translation id="1426870617281699524">Clique em Tentar novamente e aceite o pedido no computador.</translation>
-<translation id="1427179946227469514">Tom da síntese de voz</translation>
+<translation id="1427179946227469514">Tom da conversão de texto em voz</translation>
<translation id="1427269577154060167">País</translation>
<translation id="142758023928848008">Ativar as teclas aderentes (para executar atalhos de teclado escrevendo-os sequencialmente)</translation>
<translation id="142765311413773645">A licença da app <ph name="APP_NAME" /> expirou</translation>
@@ -529,7 +529,7 @@ As autorizações que já concedeu às apps podem aplicar-se a esta conta. Pode
<translation id="1521774566618522728">Ativo hoje</translation>
<translation id="152234381334907219">Nunca guardado</translation>
<translation id="1523279371236772909">Visto no mês passado</translation>
-<translation id="1523978563989812243">Motores da síntese de voz</translation>
+<translation id="1523978563989812243">Motores da conversão de texto em voz</translation>
<translation id="1524430321211440688">Teclado</translation>
<translation id="1524563461097350801">Não, Obrigado</translation>
<translation id="1525740877599838384">Utilizar apenas Wi-Fi para determinar a localização</translation>
@@ -810,7 +810,7 @@ As autorizações que já concedeu às apps podem aplicar-se a esta conta. Pode
<translation id="1768278914020124551">Ups! Ocorreu um problema ao contactar o servidor de início de sessão. Verifique a sua ligação de rede e o nome do domínio, e tente novamente.</translation>
<translation id="1769104665586091481">Abrir Link Numa Nova &amp;Janela</translation>
<translation id="177053719077591686">Faça uma cópia de segurança das apps Android para o Google Drive.</translation>
-<translation id="177336675152937177">Dados de aplicações alojadas</translation>
+<translation id="177336675152937177">Dados de apps alojadas</translation>
<translation id="1775706469381199282">Não permitir que os sites utilizem JavaScript</translation>
<translation id="1776712937009046120">Adicionar utilizador</translation>
<translation id="1776883657531386793"><ph name="OID" />: <ph name="INFO" /></translation>
@@ -2788,7 +2788,7 @@ Pretende pará-lo?</translation>
<translation id="3678156199662914018">Extensão: <ph name="EXTENSION_NAME" /></translation>
<translation id="3678188444105291936">As páginas visualizadas nesta janela não serão apresentadas no histórico do navegador nem no histórico de pesquisas e não deixarão outros vestígios, como cookies, no computador depois de terminar sessão. Os ficheiros transferidos e os marcadores criados não serão preservados.</translation>
<translation id="368019053277764111">Abra a pesquisa no painel lateral</translation>
-<translation id="3680683624079082902">Voz da síntese de voz</translation>
+<translation id="3680683624079082902">Voz da conversão de texto em voz</translation>
<translation id="3681311097828166361">Obrigado pelo seu feedback. Neste modo, está offline, pelo que o seu relatório será enviado mais tarde.</translation>
<translation id="3682824389861648626">Limite de movimentos</translation>
<translation id="3683524264665795342">Pedido de Partilha de Ecrã de <ph name="APP_NAME" /></translation>
@@ -4563,7 +4563,7 @@ Pode atribuir vários interruptores a esta ação.</translation>
<translation id="5468173180030470402">À procura de partilhas de ficheiros…</translation>
<translation id="5469852975082458401">Pode navegar pelas páginas com um cursor de texto. Prima F7 para desativar esta opção.</translation>
<translation id="5470735824776589490">É necessário reiniciar antes de ser possível repor o dispositivo com o Powerwash. <ph name="LINK_BEGIN" />Saber mais<ph name="LINK_END" /></translation>
-<translation id="5471768120198416576">Olá! Sou a sua voz para a síntese de voz.</translation>
+<translation id="5471768120198416576">Olá! Sou a sua voz para a conversão de texto em voz.</translation>
<translation id="5472627187093107397">Guardar palavras-passe para este site</translation>
<translation id="5473075389972733037">IBM</translation>
<translation id="5473099001878321374">Ao continuar, aceita que este dispositivo também pode transferir e instalar automaticamente atualizações e apps da Google, do operador da criança e do fabricante deste dispositivo, possivelmente através de dados móveis. Algumas destas apps podem oferecer compras na app.</translation>
@@ -5526,7 +5526,7 @@ Certifique-se de que não revela informações confidenciais.</translation>
<translation id="6419524191360800346">Está disponível uma atualização para a versão Debian 11 (Bullseye).</translation>
<translation id="6419546358665792306">Carregar expandida</translation>
<translation id="642469772702851743">Este dispositivo (SN: <ph name="SERIAL_NUMBER" />) foi bloqueado pelo proprietário.</translation>
-<translation id="6425556984042222041">Taxa da síntese de voz</translation>
+<translation id="6425556984042222041">Taxa da conversão de texto em voz</translation>
<translation id="6426200009596957090">Abrir as definições do ChromeVox</translation>
<translation id="642729974267661262">Sem autorização para reproduzir som</translation>
<translation id="6429384232893414837">Atualizar erro</translation>
@@ -5740,7 +5740,7 @@ Certifique-se de que não revela informações confidenciais.</translation>
<translation id="6635362468090274700">Ninguém conseguirá partilhar consigo enquanto não se tornar visível.<ph name="BR" /><ph name="BR" />Para se tornar temporariamente visível, abra a área de estado e, em seguida, ative a Visibilidade na proximidade.</translation>
<translation id="6635674640674343739">Não é possível estabelecer ligação à rede. Verifique a ligação de rede e tente novamente.</translation>
<translation id="6635944431854494329">O proprietário pode controlar esta funcionalidade em Definições &gt; Avançadas &gt; Enviar automaticamente dados de diagnóstico e de utilização para a Google.</translation>
-<translation id="6635956300022133031">Selecionar e personalizar as vozes para a síntese de voz.</translation>
+<translation id="6635956300022133031">Selecionar e personalizar as vozes para a conversão de texto em voz.</translation>
<translation id="6636623428211296678">Explore mais definições abaixo ou conclua agora</translation>
<translation id="6639554308659482635">Memória SQLite</translation>
<translation id="6640268266988685324">Separador aberto</translation>
@@ -6374,7 +6374,7 @@ Certifique-se de que não revela informações confidenciais.</translation>
<translation id="727441411541283857"><ph name="PERCENTAGE" />% <ph name="TIME" /> até ficar completa</translation>
<translation id="727952162645687754">Erro de transferência</translation>
<translation id="7280041992884344566">Ocorreu um erro enquanto o Chrome procurava software prejudicial.</translation>
-<translation id="7280649757394340890">Definições de voz para a síntese de voz</translation>
+<translation id="7280649757394340890">Definições de voz para a conversão de texto em voz</translation>
<translation id="7280877790564589615">Autorização solicitada</translation>
<translation id="7282547042039404307">Suave</translation>
<translation id="7282992757463864530">Barra de informações</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index 65684cdb50e1..a810b57ffadf 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -5636,7 +5636,7 @@
<ph name="EVENT_NAME" /></translation>
<translation id="6519689855001245063">అర్హతను చెక్ చేస్తోంది</translation>
<translation id="6520087076882753524">మీరు Google పాస్‌వర్డ్ మేనేజర్‌లో సేవ్ చేసిన పాస్‌వర్డ్‌లను చూడవచ్చు, మేనేజ్ చేయవచ్చు</translation>
-<translation id="6520876759015997832"><ph name="LIST_SIZE" /> శోధన ఫలితం <ph name="LIST_POSITION" />: <ph name="SEARCH_RESULT_TEXT" />. విభాగానికి నావిగేట్ చేయడానికి ఎంటర్ నొక్కండి.</translation>
+<translation id="6520876759015997832"><ph name="LIST_SIZE" /> సెర్చ్ ఫలితం <ph name="LIST_POSITION" />: <ph name="SEARCH_RESULT_TEXT" />. విభాగానికి నావిగేట్ చేయడానికి ఎంటర్ నొక్కండి.</translation>
<translation id="6521214596282732365">సైట్‌లు సాధారణంగా మీ ఫాంట్‌లను ఉపయోగించుకుంటాయి, తద్వారా ఆన్‌లైన్ డిజైన్, గ్రాఫిక్స్ టూల్స్‌తో మీరు అధిక క్వాలిటీ గల కంటెంట్‌ను క్రియేట్ చేయవచ్చు</translation>
<translation id="6523303810310758032">మీరు బ్రౌజింగ్ హిస్టరీ — మొత్తాన్ని లేదా ఒక నిర్దిష్ట సైట్‌కు సంబంధించిన బ్రౌజింగ్ హిస్టరీని తొలగించినప్పుడు — అనుబంధించి ఉన్న అంచనా సమాచారాన్ని కూడా మీరు తొలగిస్తారు. <ph name="BEGIN_LINK" />మీ బ్రౌజింగ్ హిస్టరీని<ph name="END_LINK" /> చూడండి</translation>
<translation id="6524735478670290456">మేము ఈ డేటాను ఎలా ఉపయోగిస్తాము:</translation>
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb
index 5173e0310f25..75f1605d0d03 100644
--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb
+++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-PT.xtb
@@ -51,7 +51,7 @@
<translation id="1246424317317450637">Negrito</translation>
<translation id="1251750620252348585">Título de nível 6 seguinte</translation>
<translation id="1268366246392928616">Não existe nenhuma expressão matemática anterior.</translation>
-<translation id="1273314450961659276">Definições da síntese de voz</translation>
+<translation id="1273314450961659276">Definições da conversão de texto em voz</translation>
<translation id="1275718070701477396">Linha selecionada</translation>
<translation id="1284576163386164372">Pode sempre ver tutoriais ao abrir os menus com um toque de quatro dedos. Em seguida, ative o tutorial na secção "ChromeVox".</translation>
<translation id="1291286136605998134">Botão ativar/desativar</translation>
@@ -198,7 +198,7 @@
<translation id="2329324941084714723">Painel de separadores</translation>
<translation id="2347456970887948350">Um link</translation>
<translation id="2365384324219615024">Também pode premir Enter para ativar itens. Por exemplo, pode utilizar a tecla Enter para enviar texto num formulário. Para continuar, prima Enter.</translation>
-<translation id="2381733276052567791">Ativar ou desativar a síntese de voz</translation>
+<translation id="2381733276052567791">Ativar ou desativar a conversão de texto em voz</translation>
<translation id="2390264819538553347">Para avançar, prima Enter. Para retroceder, prima a tecla de retrocesso.</translation>
<translation id="2398579267367951220">Escreva para pesquisar a página. Prima Enter para avançar para o resultado, as setas para cima ou para baixo para procurar resultados, continue a escrever para alterar a sua pesquisa ou prima Escape para cancelar.</translation>
<translation id="240709722712693803">Azul-violeta</translation>
@@ -219,7 +219,7 @@
<translation id="2471138580042810658">Título 6</translation>
<translation id="248982282205370495">{COUNT,plural, =1{asterisco}other{# asteriscos}}</translation>
<translation id="2490721194269245365">Castanho rosado</translation>
-<translation id="249330843868392562">Abrir definições da síntese de voz</translation>
+<translation id="249330843868392562">Abrir definições da conversão de texto em voz</translation>
<translation id="2497706219848005458">Amarelo-esverdeado</translation>
<translation id="2523609930580546572">Tutorial do ChromeVox</translation>
<translation id="2525706221823668172">Atalhos de teclado do Chromebook</translation>
@@ -656,7 +656,7 @@
<translation id="5452267669091857717">Não existe nenhum cabeçalho de nível 1 seguinte.</translation>
<translation id="5455441614648621694">Complementar</translation>
<translation id="5462510922370980473">Lista de páginas</translation>
-<translation id="5471768120198416576">Olá! Sou a sua voz para a síntese de voz.</translation>
+<translation id="5471768120198416576">Olá! Sou a sua voz para a conversão de texto em voz.</translation>
<translation id="5495517933067991341">Teclas essenciais: Shift</translation>
<translation id="549602578321198708">Palavra</translation>
<translation id="5513242761114685513">Menu de contexto</translation>
@@ -705,7 +705,7 @@
<translation id="5748623122140342504">Título de nível 5 anterior</translation>
<translation id="5760594853119905566">Apêndice</translation>
<translation id="5761219715606611783">Muito bem! Aprendeu as noções básicas acerca do toque do ChromeVox. Pode voltar a assistir ao tutorial ou sair do mesmo com os botões abaixo.</translation>
-<translation id="5776001898637896684">Extensão de síntese de voz Google Enhanced Network</translation>
+<translation id="5776001898637896684">Extensão de conversão de texto em voz Google Enhanced Network</translation>
<translation id="5805940204952508776">Tocar com dois dedos</translation>
<translation id="5819072574982403430">Item de árvore</translation>
<translation id="5822819874379903994">Azul-turquesa escuro</translation>
@@ -723,7 +723,7 @@
<translation id="5876817486144482042">Diminuir volume de voz</translation>
<translation id="5878206664863390311">Prima a tecla de pesquisa + seta para a direita ou tecla de pesquisa + seta para a esquerda para procurar tópicos</translation>
<translation id="5878908838135392163">Azul-pólvora</translation>
-<translation id="588108970619830498">Reponha as definições da síntese de voz para os valores predefinidos.</translation>
+<translation id="588108970619830498">Reponha as definições da conversão de texto em voz para os valores predefinidos.</translation>
<translation id="5891934789323004067">Tabela</translation>
<translation id="5899860758576822363">Reproduzir num volume mais baixo quando o ChromeVox estiver a falar</translation>
<translation id="5901630391730855834">Amarelo</translation>
@@ -902,7 +902,7 @@
<translation id="7244947685630430863">Não existe nenhum gráfico anterior.</translation>
<translation id="7248671827512403053">Aplicação</translation>
<translation id="725969808843520477">Botão de opção seguinte</translation>
-<translation id="7261612856573623172">Voz da síntese de voz do sistema</translation>
+<translation id="7261612856573623172">Voz da conversão de texto em voz do sistema</translation>
<translation id="7269119382257320590">Sem pontuação</translation>
<translation id="7271278495464744706">Ativar descrições detalhadas</translation>
<translation id="7273174640290488576">Em branco</translation>
@@ -960,7 +960,7 @@
<translation id="7668307052366682650">{COUNT,plural, =1{hora}other{horas}}</translation>
<translation id="7674576868851035240">Link seguinte</translation>
<translation id="7674768236845044097">mark</translation>
-<translation id="7676847077928500578">Repor definições da síntese de voz</translation>
+<translation id="7676847077928500578">Repor definições da conversão de texto em voz</translation>
<translation id="7684431668231950609">Editar texto, entrada de URL</translation>
<translation id="7685589220304187312">tlbar</translation>
<translation id="7693840228159394336">Botão de opção anterior</translation>
@@ -1057,7 +1057,7 @@
<translation id="831207808878314375">Definição</translation>
<translation id="8313653172105209786">dir</translation>
<translation id="8316881042119029234">Renda antiga</translation>
-<translation id="8324974933005349667">Personalizar as definições da síntese de voz</translation>
+<translation id="8324974933005349667">Personalizar as definições da conversão de texto em voz</translation>
<translation id="8326783648485765113">Verde-relva</translation>
<translation id="8345569862449483843">{COUNT,plural, =1{libra}other{# sinais de libra}}</translation>
<translation id="8378855320830505539">Região</translation>
diff --git a/components/policy/resources/policy_templates_de.xtb b/components/policy/resources/policy_templates_de.xtb
index feae20418efb..e3cdc43623fa 100644
--- a/components/policy/resources/policy_templates_de.xtb
+++ b/components/policy/resources/policy_templates_de.xtb
@@ -6255,7 +6255,7 @@ werden abgelehnt.</translation>
Bei Ursprüngen, die durch die hier angegebenen Muster nicht abgedeckt sind, kommt entweder der globale Standardwert der Richtlinie „<ph name="INSECURE_PRIVATE_NETWORK_REQUESTS_ALLOWED_POLICY_NAME" />“, sofern konfiguriert, oder die persönliche Konfiguration des Nutzers zum Einsatz.
Weitere Informationen zu gültigen URL-Mustern findest du unter https://cloud.google.com/docs/chrome-enterprise/policies/url-patterns.</translation>
-<translation id="7906983682927840536">Keepalive-Dauer beim Herunterfahren abrufen</translation>
+<translation id="7906983682927840536">Fetch-Keepalive-Dauer beim Herunterfahren</translation>
<translation id="7908384265697653397">Zeitraum in Tagen, nach dem der Nutzer abgemeldet wird, wenn die Version von <ph name="PRODUCT_OS_NAME" /> niedriger ist als der angegebene <ph name="CHROMEOS_VERSION_PROPERTY_NAME" />-Wert.</translation>
<translation id="7912255076272890813">Zulässige App- bzw. Erweiterungstypen konfigurieren</translation>
<translation id="791267408364877739">Sicherheitswarnungen anzeigen, wenn potenziell schädliche Befehlszeilen-Flags verwendet werden</translation>
diff --git a/components/strings/components_strings_mr.xtb b/components/strings/components_strings_mr.xtb
index 4d28b6c9f60b..b41b739d4c8c 100644
--- a/components/strings/components_strings_mr.xtb
+++ b/components/strings/components_strings_mr.xtb
@@ -918,7 +918,7 @@
<translation id="3443726618221119081">Juuro-Ku-Kai</translation>
<translation id="3447661539832366887">या डिव्हाइसच्या मालकाने डायनासोर गेम बंद केला आहे.</translation>
<translation id="3447884698081792621">सर्टिफिकेट दाखवा (<ph name="ISSUER" /> ने जारी केलेले)</translation>
-<translation id="3452404311384756672">मध्यंतर प्राप्त करा:</translation>
+<translation id="3452404311384756672">मध्यंतर मिळवा:</translation>
<translation id="3453962258458347894">किती वेळा पुन्हा प्रयत्न केले</translation>
<translation id="3454555520521576458">आकार बदलण्यायोग्य</translation>
<translation id="3456231139987291353">Number-11 (Envelope)</translation>
diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb
index 4c6638f9b39e..27f1afd0deae 100644
--- a/components/strings/components_strings_te.xtb
+++ b/components/strings/components_strings_te.xtb
@@ -2298,7 +2298,7 @@
<translation id="7365596969960773405"><ph name="MANAGE_ADDRESSES_FOCUSED_FRIENDLY_MATCH_TEXT" />, Chrome సెట్టింగ్‌లలో అడ్రస్‌లను జోడించడానికి, మేనేజ్ చేయడానికి 'Tab'ను నొక్కి, ఆపై 'Enter'ను నొక్కండి</translation>
<translation id="7365849542400970216">మీ పరికరాన్ని ఎలా ఉపయోగించాలో తెలుసుకోవాలనుకుంటున్నారా?</translation>
<translation id="7366362069757178916">పేమెంట్ హ్యాండ్లర్‌లు</translation>
-<translation id="7372973238305370288">శోధన ఫలితం</translation>
+<translation id="7372973238305370288">సెర్చ్ ఫలితం</translation>
<translation id="7374461526650987610">ప్రోటోకాల్ నిర్వాహకులు</translation>
<translation id="7374733840632556089">మీ పరికరంలో మీరు లేదా మరొకరు ఇన్‌స్టాల్ చేసిన సర్టిఫికేట్ కారణంగా ఈ సమస్య తలెత్తుతుంది. నెట్‌వర్క్‌లను పర్యవేక్షించడానికి మరియు అడ్డగించడానికి సర్టిఫికెట్ ఉపయోగించబడుతుంది, ఇది Chrome ద్వారా విశ్వసించబడదు. పర్యవేక్షణ కోసం కొన్ని చట్టబద్ధమైన కేసులు ఉన్నప్పటికీ, పాఠశాల లేదా కంపెనీ నెట్‌వర్క్‌లో మాదిరిగా, మీరు దీన్ని ఆపలేక పోయినప్పటికీ, ఇది జరుగుతున్నట్లు మీకు తెలుసని Chrome నిర్ధారించుకోవాలనుకుంటుంది. వెబ్‌ను యాక్సెస్ చేసే ఏదైనా బ్రౌజర్ లేదా యాప్‌లో పర్యవేక్షణ జరగవచ్చు.</translation>
<translation id="7375818412732305729">ఫైల్‌ను జోడించినప్పుడు</translation>
--
2.37.0

View File

@ -0,0 +1,106 @@
From 394e7eb51ff0cdd3c240e8d10d9fb08adfbe60c9 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
Date: Tue, 28 Jun 2022 17:22:43 +0000
Subject: [PATCH 47/59] migrate metrics_python_tests to python3 for M102
This cherry pick includes additional fix for L235 in common.py.
(cherry picked from commit a1b9cfb94303fcbaae90a5def1991d3724b0bdb4)
Bug: 1287214
Change-Id: I68b680617d2e7aa3ccc23375e2eaaa113779d7c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3689318
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1011049}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3711081
Cr-Commit-Position: refs/branch-heads/5005@{#1206}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
testing/scripts/common.py | 6 +++---
testing/scripts/metrics_python_tests.py | 4 ++--
tools/variations/fieldtrial_to_struct.py | 2 +-
tools/variations/fieldtrial_util.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/testing/scripts/common.py b/testing/scripts/common.py
index 4965f8f58ba0..995fb9688e83 100644
--- a/testing/scripts/common.py
+++ b/testing/scripts/common.py
@@ -208,7 +208,7 @@ def parse_common_test_results(json_results, test_separator='/'):
def convert_trie_to_flat_paths(trie, prefix=None):
# Also see blinkpy.web_tests.layout_package.json_results_generator
result = {}
- for name, data in trie.iteritems():
+ for name, data in trie.items():
if prefix:
name = prefix + test_separator + name
if len(data) and not 'actual' in data and not 'expected' in data:
@@ -232,7 +232,7 @@ def parse_common_test_results(json_results, test_separator='/'):
passing_statuses = ('PASS', 'SLOW', 'NEEDSREBASELINE')
for test, result in convert_trie_to_flat_paths(
- json_results['tests']).iteritems():
+ json_results['tests']).items():
key = 'unexpected_' if result.get('is_unexpected') else ''
data = result['actual']
actual_results = data.split()
@@ -291,7 +291,7 @@ def get_gtest_summary_passes(output):
mapping = {}
for cur_iteration_data in output.get('per_iteration_data', []):
- for test_fullname, results in cur_iteration_data.iteritems():
+ for test_fullname, results in cur_iteration_data.items():
# Results is a list with one entry per test try. Last one is the final
# result.
last_result = results[-1]
diff --git a/testing/scripts/metrics_python_tests.py b/testing/scripts/metrics_python_tests.py
index 70770f41b56e..41db12a37b12 100755
--- a/testing/scripts/metrics_python_tests.py
+++ b/testing/scripts/metrics_python_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
# Copyright 2021 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -15,7 +15,7 @@ import common
def main_run(args):
with common.temporary_file() as tempfile_path:
- rc = common.run_command(['vpython',
+ rc = common.run_command(['vpython3',
os.path.join(common.SRC_DIR, 'testing', 'test_env.py'),
os.path.join(common.SRC_DIR, 'tools', 'metrics',
'metrics_python_tests.py'),
diff --git a/tools/variations/fieldtrial_to_struct.py b/tools/variations/fieldtrial_to_struct.py
index 9ecf38974795..3c90ff9fea5a 100755
--- a/tools/variations/fieldtrial_to_struct.py
+++ b/tools/variations/fieldtrial_to_struct.py
@@ -76,7 +76,7 @@ def _LoadFieldTrialConfig(filename, platforms, invert):
def _ConvertOverrideUIStrings(override_ui_strings):
"""Converts override_ui_strings to formatted dicts."""
overrides = []
- for ui_string, override in override_ui_strings.iteritems():
+ for ui_string, override in override_ui_strings.items():
overrides.append({
'name_hash': generate_ui_string_overrider.HashName(ui_string),
'value': override
diff --git a/tools/variations/fieldtrial_util.py b/tools/variations/fieldtrial_util.py
index ac0b9f54292f..284bcb5899c8 100644
--- a/tools/variations/fieldtrial_util.py
+++ b/tools/variations/fieldtrial_util.py
@@ -31,7 +31,7 @@ def _FindDuplicates(entries):
duplicates.add(entry)
else:
seen.add(entry)
- return duplicates
+ return sorted(duplicates)
def _CheckForDuplicateFeatures(enable_features, disable_features):
enable_features = [f.split('<')[0] for f in enable_features]
--
2.37.0

View File

@ -0,0 +1,28 @@
From 19d4541ceec6c61cd3bd08fd278e581405e4670a Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Wed, 29 Jun 2022 01:00:35 +0000
Subject: [PATCH 49/59] Incrementing VERSION to 102.0.5005.144
Change-Id: I4ddfb72f2b40983b5e57923433184f7466bbc0b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3732614
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1208}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 915e8754e191..ea7e63ff5099 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=143
+PATCH=144
--
2.37.0

View File

@ -0,0 +1,348 @@
From b3d9ead9f7dc9567fab1461dbb888cf924ee9062 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Wed, 29 Jun 2022 14:28:46 +0000
Subject: [PATCH 50/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I9b6be6fee2205db4a5aa0fc442bee884fa3a1ff2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3735342
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1209}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/chromium_strings_te.xtb | 6 +++---
chrome/app/resources/generated_resources_hi.xtb | 2 +-
chrome/app/resources/generated_resources_hy.xtb | 2 +-
chrome/app/resources/generated_resources_te.xtb | 16 ++++++++--------
.../app/resources/google_chrome_strings_te.xtb | 6 +++---
.../strings/accessibility_strings_hy.xtb | 2 +-
.../strings/accessibility_strings_te.xtb | 4 ++--
.../translations/android_chrome_strings_hy.xtb | 2 +-
.../translations/android_chrome_strings_te.xtb | 2 +-
components/strings/components_strings_hy.xtb | 4 ++--
components/strings/components_strings_te.xtb | 12 ++++++------
.../translations/ui_chromeos_strings_te.xtb | 2 +-
12 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/chrome/app/resources/chromium_strings_te.xtb b/chrome/app/resources/chromium_strings_te.xtb
index 60311af40a97..6cd93063385f 100644
--- a/chrome/app/resources/chromium_strings_te.xtb
+++ b/chrome/app/resources/chromium_strings_te.xtb
@@ -105,7 +105,7 @@
<translation id="3830894615770080216">ChromiumOS సిస్టమ్</translation>
<translation id="3848258323044014972"><ph name="PAGE_TITLE" /> - Chromium</translation>
<translation id="386822487697155367">ChromiumOSతో సహాయాన్ని పొందండి</translation>
-<translation id="388648406173476553">Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి.</translation>
+<translation id="388648406173476553">Chromiumను అనుకూలంగా మార్చండి మరియు నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి.</translation>
<translation id="3889543394854987837">Chromiumను తెరిచి, బ్రౌజింగ్‌ను ప్రారంభించడానికి మీ పేరును క్లిక్ చేయండి.</translation>
<translation id="390528597099634151"><ph name="EXISTING_USER" /> ఇప్పటికే ఈ Chromium ప్రొఫైల్‌కు సైన్ ఇన్ చేశారు. మీరు బ్రౌజ్ చేసిన వాటిని విడిగా ఉంచడానికి, Chromium మీ కోసం మీ సొంత ప్రొఫైల్‌ను క్రియేట్ చేయగలదు.</translation>
<translation id="3945058413678539331">పాస్‌వర్డ్‌లను కాపీ చేయడానికి Chromium ప్రయత్నిస్తోంది. దీన్ని అనుమతించడానికి మీ Windows పాస్‌వర్డ్‌ను టైప్ చేయండి.</translation>
@@ -124,7 +124,7 @@
<translation id="439358628917130594">మీరు ఈ పరికరాన్ని ఉపయోగించడానికి ముందు సర్వీస్ నియమాలను చదివి, అంగీకరించాలని <ph name="MANAGER" /> కోరుతోంది. ఈ నియమాలు ChromiumOS నియమాలను విస్తరింపజేయవు, సవరించవు లేదా పరిమితం చేయవు.</translation>
<translation id="4407044323746248786">ఏదేమైనా Chromium నుండి నిష్క్రమించాలా?</translation>
<translation id="4415566066719264597">బ్యాక్‌గ్రౌండ్‌లో అమలయ్యేందుకు Chromiumని అనుమతించండి</translation>
-<translation id="4423735387467980091">Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి</translation>
+<translation id="4423735387467980091">Chromiumను అనుకూలంగా మార్చండి మరియు నియంత్రించండి</translation>
<translation id="4427306783828095590">ఫిషింగ్, అలాగే మాల్‌వేర్‌ను బ్లాక్ చేయడానికి మెరుగుపరచిన రక్షణ మరింత చేయగలదు</translation>
<translation id="4440114195512068100">మీ పరికరం అప్‌డేట్ అయ్యి ఉందో లేదో చూడటానికి, <ph name="LINK_BEGIN" />ChromiumOS సెట్టింగ్‌లు<ph name="LINK_END" /> ఆప్షన్‌కు వెళ్లండి</translation>
<translation id="452711251841752011">Chromiumకు స్వాగతం; కొత్త బ్రౌజర్ విండో తెరవబడింది</translation>
@@ -181,7 +181,7 @@
<translation id="6072279588547424923">Chromiumకు <ph name="EXTENSION_NAME" /> జోడించబడింది</translation>
<translation id="608006075545470555">ఈ బ్రౌజర్‌కు వర్క్ ప్రొఫైల్‌ను జోడించండి</translation>
<translation id="608189560609172163">సైన్ ఇన్ చేయడంలో ఎర్రర్ కారణంగా Chromium మీ డేటాను సింక్ చేయలేకపోయింది.</translation>
-<translation id="6096348254544841612">Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది.</translation>
+<translation id="6096348254544841612">Chromiumను అనుకూలంగా మార్చండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది.</translation>
<translation id="6120345080069858279">Chromium ఈ పాస్‌వర్డ్‌ను మీ Google ఖాతాలో సేవ్ చేస్తుంది. మీరు దీనిని గుర్తుంచుకోవాల్సిన అవసరం లేదు.</translation>
<translation id="6129621093834146363"><ph name="FILE_NAME" /> హానికరం, కావున Chromium దాన్ని బ్లాక్ చేసింది.</translation>
<translation id="6134968993075716475">సురక్షిత బ్రౌజింగ్ ఆఫ్ చేయబడింది. దాన్ని ఆన్ చేయమని Chromium సిఫార్సు చేస్తోంది.</translation>
diff --git a/chrome/app/resources/generated_resources_hi.xtb b/chrome/app/resources/generated_resources_hi.xtb
index 2f6119a1b1d2..cf6ff3a75c3c 100644
--- a/chrome/app/resources/generated_resources_hi.xtb
+++ b/chrome/app/resources/generated_resources_hi.xtb
@@ -7282,7 +7282,7 @@
<translation id="8133676275609324831">खोजकर्ता में &amp;दिखाएं</translation>
<translation id="8135557862853121765"><ph name="NUM_KILOBYTES" />k</translation>
<translation id="8136269678443988272">आपने जो पिन डाले हैं, वे बेमेल हैं</translation>
-<translation id="8137559199583651773">एक्सटेंशन प्रबंधित करें</translation>
+<translation id="8137559199583651773">एक्सटेंशन मैनेज करें</translation>
<translation id="8138082791834443598">वैकल्पिक — इस डिवाइस के साथ जोड़ी जाने वाली नई जानकारी डालें या मौजूदा जानकारी को अपडेट करें.</translation>
<translation id="8138217203226449454">क्या आपका मतलब खोज की सुविधा देने वाली कंपनी बदलने से था?</translation>
<translation id="8138997515734480534"><ph name="VM_NAME" /> की स्थिति</translation>
diff --git a/chrome/app/resources/generated_resources_hy.xtb b/chrome/app/resources/generated_resources_hy.xtb
index 29de27efcc0b..12042eeafec4 100644
--- a/chrome/app/resources/generated_resources_hy.xtb
+++ b/chrome/app/resources/generated_resources_hy.xtb
@@ -2509,7 +2509,7 @@
<translation id="3409785640040772790">Քարտեզներ</translation>
<translation id="3412265149091626468">Jump to Selection</translation>
<translation id="3413122095806433232">Հավաստագրման կենտրոնի թողարկողներ՝ <ph name="LOCATION" /></translation>
-<translation id="3414952576877147120">Չափը՝</translation>
+<translation id="3414952576877147120">Չափսը՝</translation>
<translation id="3414966631182382431">Ձեր <ph name="BEGIN_LINK" />դիտարկիչը կառավարվում է<ph name="END_LINK" /> <ph name="MANAGER" />-ի կողմից</translation>
<translation id="341589277604221596">Կենդանի ենթագրեր <ph name="LANGUAGE" /></translation>
<translation id="3416468988018290825">Միշտ ցույց տալ ամբողջական URL-ները</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index a810b57ffadf..ccce07a85680 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -1384,7 +1384,7 @@
<translation id="2299941608784654630">debugd ద్వారా సేకరించబడిన అన్ని లాగ్ ఫైళ్లను వేరుగా ఆర్కైవ్ లాగా చేర్చండి.</translation>
<translation id="2300214399009193026">PCIe</translation>
<translation id="2300332192655962933">సైట్‌లో ఫైల్ అందుబాటులో లేదు</translation>
-<translation id="2300383962156589922"><ph name="APP_NAME" />ను అనుకూలీకరించండి మరియు నియంత్రించండి</translation>
+<translation id="2300383962156589922"><ph name="APP_NAME" />ను అనుకూలంగా మార్చండి మరియు నియంత్రించండి</translation>
<translation id="2301382460326681002">ఎక్స్‌టెన్ష‌న్‌ మూలం డైరెక్టరీ చెల్లదు.</translation>
<translation id="2301402091755573488">షేర్ చేసిన ట్యాబ్</translation>
<translation id="2302342861452486996"><ph name="BEGIN_H3" />డీబగ్గింగ్ ఫీచర్‌లు<ph name="END_H3" />
@@ -1513,7 +1513,7 @@
<translation id="2390782873446084770">Wi-Fi సింక్</translation>
<translation id="2391419135980381625">ప్రామాణిక ఫాంట్</translation>
<translation id="2392163307141705938"><ph name="IDS_SHORT_PRODUCT_NAME" /> కోసం మీ తల్లి/తండ్రి సెట్ చేసిన సమయ పరిమితిని మీరు చేరుకున్నారు.</translation>
-<translation id="2392369802118427583">సక్రియం చేయి</translation>
+<translation id="2392369802118427583">యాక్టివేట్ చేయండి</translation>
<translation id="2393136602862631930">మీ Chromebookలో <ph name="APP_NAME" />ను సెటప్ చేయండి</translation>
<translation id="2393313392064891208">Google ChromeOS Flex నియమాల కంటెంట్‌లు</translation>
<translation id="2395616325548404795">మీ <ph name="DEVICE_TYPE" /> ఎంటర్‌ప్రైజ్ నిర్వహణ కోసం విజయవంతంగా నమోదు చేయబడింది, కానీ దాని లక్షణ మరియు స్థాన సమాచారాన్ని పంపడంలో విఫలమైంది. దయచేసి ఈ పరికరం కోసం ఈ సమాచారాన్ని మీ నిర్వాహక కన్సోల్ నుండి మాన్యువల్‌గా నమోదు చేయండి.</translation>
@@ -2091,7 +2091,7 @@
<translation id="2941696810925320401">మీ స్క్రీన్‌లలో అదనపు డాక్యుమెంట్‌లను లేదా ఫుల్ స్క్రీన్ కంటెంట్‌ను చూపడానికి సైట్‌లు సాధారణంగా విండోలను తెరిచి, ఉంచుతాయి</translation>
<translation id="2942279350258725020">Android Messages</translation>
<translation id="2942560570858569904">వేచి ఉంది...</translation>
-<translation id="2942581856830209953">ఈ పేజీని అనుకూలీకరించండి</translation>
+<translation id="2942581856830209953">ఈ పేజీని అనుకూలంగా మార్చండి</translation>
<translation id="2944060181911631861">వినియోగం &amp; విశ్లేషణల డేటాను పంపండి. సమస్య విశ్లేషణ, పరికరం, యాప్ వినియోగ డేటాను Googleకి ఆటోమేటిక్‌గా పంపడం ద్వారా మీ Android అనుభవాన్ని మెరుగుపరచడంలో సహాయపడండి. ఇది సిస్టమ్, యాప్ స్థిరత్వానికి, అలాగే ఇతర మెరుగుదలలకు సహాయపడుతుంది. కొంత సముదాయ డేటా కూడా Google యాప్‌లకు, అలాగే Android డెవలపర్‌ల లాంటి భాగస్వాములకు సహాయపడుతుంది. మీ అదనపు వెబ్ &amp; యాప్ యాక్టివిటీ సెట్టింగ్‌ను ఆన్ చేసినట్లయితే, ఈ డేటా మీ Google ఖాతాలో సేవ్ చేయబడవచ్చు. <ph name="BEGIN_LINK1" />మరింత తెలుసుకోండి<ph name="END_LINK1" /></translation>
<translation id="2946054015403765210">ఫైల్స్‌కు వెళ్లండి</translation>
<translation id="2946119680249604491">కనెక్షన్‌ని జోడించండి</translation>
@@ -5753,7 +5753,7 @@
<translation id="6635362468090274700">మీరు మీ సమీప షేరింగ్ విజిబిలిటీ సెట్టింగ్‌ను 'కనిపించు'కు సెట్ చేసేంత వరకు మీతో ఎవరూ షేర్ చేయలేరు.<ph name="BR" /><ph name="BR" />మీ సెట్టింగ్‌ను తాత్కాలికంగా 'కనిపించు'గా ఉంచడానికి స్టేటస్ ప్రాంతాన్ని తెరిచి, ఆపై సమీప విజిబిలిటీని ఆన్ చేయండి.</translation>
<translation id="6635674640674343739">నెట్‌వర్క్ కనెక్షన్‌ను ఏర్పాటు చేయడం సాధ్యపడలేదు. మీ నెట్‌వర్క్ కనెక్షన్‌ను చెక్ చేసి, మళ్లీ ట్రై చేయండి.</translation>
<translation id="6635944431854494329">యజమాని ఈ ఫీచర్‌ను, సెట్టింగ్‌లు &gt; అధునాతనం &gt; సమస్య విశ్లేషణ, వినియోగ డేటాను ఆటోమేటిక్‌గా Googleకు పంపు ఎంపిక ద్వారా నియంత్రించవచ్చు.</translation>
-<translation id="6635956300022133031">వచనం-నుండి-ప్రసంగం వాయిస్‌లను ఎంచుకోండి మరియు అనుకూలీకరించండి</translation>
+<translation id="6635956300022133031">వచనం-నుండి-ప్రసంగం వాయిస్‌లను ఎంచుకోండి మరియు అనుకూలంగా మార్చండి</translation>
<translation id="6636623428211296678">కింద మరిన్ని సెట్టింగ్‌లను అన్వేషించండి లేదా ఇప్పుడే పూర్తి చేయండి</translation>
<translation id="6639554308659482635">SQLite మెమరీ</translation>
<translation id="6640268266988685324">తెరిచి ఉన్న ట్యాబ్</translation>
@@ -6337,7 +6337,7 @@
<translation id="7227458944009118910">కింద లిస్ట్ చేయబడిన యాప్‌లు ప్రోటోకాల్ లింక్‌లను కూడా హ్యాండిల్ చేయగలవు. ఇతర యాప్‌లు అనుమతి కోసం అడుగుతాయి.</translation>
<translation id="7228523857728654909">స్క్రీన్ లాక్ మరియు సైన్ ఇన్</translation>
<translation id="7230222852462421043">&amp;విండోను రీస్టోర్ చేయండి</translation>
-<translation id="7230787553283372882">మీ వచన పరిమాణాన్ని అనుకూలీకరించండి</translation>
+<translation id="7230787553283372882">మీ వచన పరిమాణాన్ని అనుకూలంగా మార్చండి</translation>
<translation id="7231260028442989757">మీ ఫోన్ నోటిఫికేషన్‌లను చూడండి, విస్మరించండి, వాటికి రిప్లయి చేయండి</translation>
<translation id="7232750842195536390">పేరు మార్చడం విఫలమైంది</translation>
<translation id="723343421145275488"><ph name="VISUAL_SEARCH_PROVIDER" /> ఇమేజ్ సెర్చ్</translation>
@@ -7424,7 +7424,7 @@
<ph name="BEGIN_PARAGRAPH4" />అదనంగా మీ చిన్నారి కోసం వెబ్ &amp; యాప్ యాక్టివిటీ సెట్టింగ్‌ను ఆన్ చేసినట్లయితే, ఈ డేటా వారి Google ఖాతాలో నిల్వ చేయబడవచ్చు. ఈ సెట్టింగ్‌ల గురించి, వీటిని సర్దుబాటు చేయడం గురించి families.google.comలో మరింత తెలుసుకోండి.<ph name="END_PARAGRAPH4" /></translation>
<translation id="826905130698769948">చెల్లని క్లయింట్ సర్టిఫికెట్</translation>
<translation id="827097179112817503">హోమ్ బటన్‌ను చూపు</translation>
-<translation id="8271268254812352141">మీరు టెక్స్ట్‌ను కుడి క్లిక్ చేసినప్పుడు లేదా తాకి, నొక్కి ఉంచినప్పుడు నిర్వచనాలు, అనువాదాలు, లేదా యూనిట్ మార్పిడులను పొందండి. <ph name="LINK_BEGIN" />వెబ్‌సైట్ భాషల<ph name="LINK_END" />లో అనువాద భాషలను అనుకూలీకరించండి.</translation>
+<translation id="8271268254812352141">మీరు టెక్స్ట్‌ను కుడి క్లిక్ చేసినప్పుడు లేదా తాకి, నొక్కి ఉంచినప్పుడు నిర్వచనాలు, అనువాదాలు, లేదా యూనిట్ మార్పిడులను పొందండి. <ph name="LINK_BEGIN" />వెబ్‌సైట్ భాషల<ph name="LINK_END" />లో అనువాద భాషలను అనుకూలంగా మార్చండి.</translation>
<translation id="8271379370373330993">తల్లిదండ్రులారా, తర్వాత కొన్ని దశలు మీ కోసం. ఖాతాను సెటప్ చేసిన తర్వాత మీరు <ph name="DEVICE_TYPE" />ను చిన్నారికి తిరిగి ఇవ్వవచ్చు.</translation>
<translation id="8272194309885535896">చిత్రాన్ని డౌన్‌లోడ్ చేయి</translation>
<translation id="8272443605911821513">"మరిన్ని సాధనాలు" మెనూలోని ఎక్స్‌టెన్షన్‌లను క్లిక్ చేయడం ద్వారా మీ ఎక్స్‌టెన్షన్‌లను నిర్వహించండి.</translation>
@@ -7672,7 +7672,7 @@
<translation id="8543556556237226809">ప్రశ్నలు ఏమైనా ఉన్నాయా? మీ ప్రొఫైల్‌ను పర్యవేక్షించే వ్యక్తిని సంప్రదించండి.</translation>
<translation id="8546186510985480118">పరికరంలో తక్కువ స్థలం ఉంది</translation>
<translation id="8546306075665861288">చిత్రం కాష్</translation>
-<translation id="8546930481464505581">టచ్ బార్‌ని అనుకూలీకరించండి</translation>
+<translation id="8546930481464505581">టచ్ బార్‌ని అనుకూలంగా మార్చండి</translation>
<translation id="8547013269961688403">ఫుల్-స్క్రీన్‌ మాగ్నిఫయర్‌ను ప్రారంభించండి</translation>
<translation id="85486688517848470">ఎగువ-అడ్డు వరుసలోని కీల ప్రవర్తనను మార్చడానికి శోధన కీని నొక్కి ఉంచండి</translation>
<translation id="8549316893834449916">మీ Chromebookకు సైన్ ఇన్ చేయడానికి మీరు మీ Google ఖాతాను ఉపయోగిస్తారు Gmail, Drive, YouTube మరిన్నింటి కోసం మీరు ఉపయోగించే అదే ఖాతా.</translation>
@@ -8106,7 +8106,7 @@
<translation id="89720367119469899">ఎస్కేప్</translation>
<translation id="8972513834460200407">దయచేసి Google సర్వర్‌ల నుండి డౌన్‌లోడ్‌లను ఫైర్‌వాల్ బ్లాక్ చేయడం లేదని నిర్ధారించుకోవడానికి మీ నెట్‌వర్క్ నిర్వాహకుడిని సంప్రదించండి.</translation>
<translation id="8973557916016709913">జూమ్ స్థాయిని తీసివేయి</translation>
-<translation id="8973596347849323817">మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ చేయగల ఫీచర్లను సెట్టింగ్స్‌లో తర్వాత మార్చవచ్చు.</translation>
+<translation id="8973596347849323817">మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలంగా మార్చవచ్చు. ఈ యాక్సెస్ చేయగల ఫీచర్లను సెట్టింగ్స్‌లో తర్వాత మార్చవచ్చు.</translation>
<translation id="897414447285476047">కనెక్షన్ సమస్య కారణంగా గమ్యస్థాన ఫైల్ సంపూర్ణంగా లేదు.</translation>
<translation id="897525204902889653">క్వారెంటైన్ సేవ</translation>
<translation id="8975396729541388937">మీరు అందుకునే ఇమెయిల్‌లలోని లింక్‌ను క్లిక్ చేయడం ద్వారా ఎప్పుడైనా సబ్‌స్క్రిప్షన్‌ను తీసివేయవచ్చు.</translation>
diff --git a/chrome/app/resources/google_chrome_strings_te.xtb b/chrome/app/resources/google_chrome_strings_te.xtb
index 04519bc7b312..6945de13ae9e 100644
--- a/chrome/app/resources/google_chrome_strings_te.xtb
+++ b/chrome/app/resources/google_chrome_strings_te.xtb
@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="te">
<translation id="1001534784610492198">ఇన్‌స్టాలర్ ఆర్కైవ్ పాడైంది లేదా చెల్లదు. దయచేసి Google Chromeను మ‌ళ్లీ డౌన్‌లోడ్ చేయండి.</translation>
-<translation id="102763973188675173">Google Chromeను అనుకూలీకరించండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది.</translation>
+<translation id="102763973188675173">Google Chromeను అనుకూలంగా మార్చండి మరియు నియంత్రించండి. అప్‌డేట్ అందుబాటులో ఉంది.</translation>
<translation id="1051826050538111504">మీ కంప్యూటర్‌లో మీ భద్రతకు హాని కలిగించే సాఫ్ట్‌వేర్‌ ఉంది. మీ బ్రౌజర్‌ని మళ్లీ సాధారణంగా పని చేసేలా చేయడానికి Chrome దానిని తీసివేసి, మీ సెట్టింగ్‌లను పునరుద్ధరించి, ఎక్స్‌టెన్షన్‌లను నిలిపివేయగలదు.</translation>
<translation id="1065672644894730302">మీ ప్రాధాన్యతలు చదవబడలేవు. కొన్ని లక్షణాలు అందుబాటులో ఉండకపోవచ్చు మరియు ప్రాధాన్యతలకు మార్పులు సేవ్ చేయబడకపోవచ్చు.</translation>
<translation id="1088300314857992706"><ph name="USER_EMAIL_ADDRESS" /> మునుపు Chromeని ఉపయోగించింది</translation>
@@ -148,7 +148,7 @@
<translation id="3889417619312448367">Google Chromeను అన్‌ఇన్‌స్టాల్ చేయండి</translation>
<translation id="4035053306113201399">అప్‌డేట్‌ను వర్తింపచేయడానికి ChromeOSను రీస్టార్ట్ చేయాలి.</translation>
<translation id="4050175100176540509">ముఖ్యమైన భద్రతా మెరుగుదలలు మరియు కొత్త ఫీచర్‌లు తాజా వెర్షన్‌లో అందుబాటులో ఉన్నాయి.</translation>
-<translation id="4053720452172726777">Google Chromeను అనుకూలీకరించండి మరియు నియంత్రించండి</translation>
+<translation id="4053720452172726777">Google Chromeను అనుకూలంగా మార్చండి మరియు నియంత్రించండి</translation>
<translation id="4106587138345390261">Chrome మీ సమాచారాన్ని తక్కువగా ఉపయోగిస్తూ అదే బ్రౌజింగ్ అనుభవాన్ని అందించడానికి సైట్‌లను అనుమతించే కొత్త ఫీచర్‌ల కోసం అన్వేషిస్తోంది</translation>
<translation id="4110895483821904099">మీ కొత్త Chrome ప్రొఫైల్‍ని సెట్ అప్ చేయండి</translation>
<translation id="4147555960264124640">మీరు నిర్వహించబడే ఖాతాతో సైన్ ఇన్ చేస్తున్నారు. దీని నిర్వాహకునికి మీ Google Chrome ప్రొఫైల్‌పై నియంత్రణను అందిస్తున్నారు. మీ యాప్‌లు, బుక్‌మార్క్‌లు, చరిత్ర, పాస్‌వర్డ్‌లు, ఇతర సెట్టింగ్‌ల వంటి మీ Chrome డేటా శాశ్వతంగా <ph name="USER_NAME" />కు అనుబంధించబడుతుంది. మీరు Google ఖాతాల డ్యాష్‌బోర్డ్ ద్వారా ఈ డేటాను తొలగించవచ్చు. కానీ ఈ డేటాను మరో ఖాతాతో అనుబంధించలేరు. <ph name="LEARN_MORE" /></translation>
@@ -213,7 +213,7 @@
<translation id="5566025111015594046">Google Chrome (mDNS-In)</translation>
<translation id="565744775970812598"><ph name="FILE_NAME" /> హానికరం కావచ్చు, కావున Chrome దాన్ని బ్లాక్ చేసింది.</translation>
<translation id="5678190148303298925">{COUNT,plural, =0{ఈ అప్‌డేట్‌ను వర్తింపజేయడం కోసం మీరు Chromeను పునఃప్రారంభించాలని మీ నిర్వాహకుడు కోరుతున్నారు}=1{ఈ అప్‌డేట్‌ను వర్తింపజేయడం కోసం మీరు Chromeను పునఃప్రారంభించాలని మీ నిర్వాహకుడు కోరుతున్నారు. మీ అజ్ఞాత విండో మళ్లీ తెరవబడదు.}other{ఈ అప్‌డేట్‌ను వర్తింపజేయడం కోసం మీరు Chromeను పునఃప్రారంభించాలని మీ నిర్వాహకుడు కోరుతున్నారు. మీ # అజ్ఞాత విండోలు మళ్లీ తెరవబడవు.}}</translation>
-<translation id="5686916850681061684">Google Chromeను అనుకూలీకరించండి, నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి.</translation>
+<translation id="5686916850681061684">Google Chromeను అనుకూలంగా మార్చండి, నియంత్రించండి. మీరు గమనించాల్సిన విషయం ఒకటి ఉంది - వివరాల కోసం క్లిక్ చేయండి.</translation>
<translation id="5690427481109656848">Google LLC</translation>
<translation id="5715063361988620182">{SECONDS,plural, =1{Google Chrome 1 సెకనులో పునఃప్రారంభమవుతుంది}other{Google Chrome # సెకన్లలో పునఃప్రారంభమవుతుంది}}</translation>
<translation id="5727531838415286053">Chrome ర్యాండమ్‌గా మిమ్మల్ని యాక్టివ్‌గా ఉన్న ఒక ట్రయల్‌లో ఉంచినట్లయితే, మీ బ్రౌజింగ్ హిస్టరీ మీరు చూసే యాడ్‌లను, దిగువున అంచనా వేసిన ఆసక్తులపై ప్రభావం చూపుతుంది. మీ గోప్యతను రక్షించడానికి, Chrome ప్రతి నెలా దశల వారీగా మీ ఆసక్తులను తొలగిస్తుంది. ఆసక్తులు మీరు తీసివేస్తే మినహా, రిఫ్రెష్ అవుతూనే ఉంటాయి.</translation>
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb
index 04475afeca6a..e9c14d42d529 100644
--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb
+++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_hy.xtb
@@ -145,7 +145,7 @@
<translation id="1903683160884433981">Միջին գարնանային կանաչ</translation>
<translation id="1905379170753160525">Ցույց տալ վերնագրերի ցանկը</translation>
<translation id="1913761808037590218">#ed</translation>
-<translation id="1914424852593176649">Չափը՝ <ph name="FONT_SIZE" /></translation>
+<translation id="1914424852593176649">Չափսը՝ <ph name="FONT_SIZE" /></translation>
<translation id="1914635379910604678">համադրություն՝ <ph name="DOT" /></translation>
<translation id="1923956950274750765">Միջին խոլորձագույն</translation>
<translation id="1928932365747995741">Նախորդ խմբագրելի տեքստային դաշտ չկա</translation>
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb
index ff870ab0ced5..0e0e58bdf2ef 100644
--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb
+++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_te.xtb
@@ -299,7 +299,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి,
<translation id="2988364959384217951">సూచన: మీరు ఈ ట్యుటోరియల్‌ను నిష్క్రమించాలనుకుంటే కుడి నుండి ఎడమ వైపునకు రెండు వేళ్లతో స్వైప్ చేయండి.</translation>
<translation id="2998131015536248178">మునుపటి అక్షరం</translation>
<translation id="2999559350546931576">స్వర స్థాయి తగ్గించండి</translation>
-<translation id="3009352964623081324">Search + O, తర్వాత S. వాయిస్‌లను ఇన్‌స్టాల్, మేనేజ్ చేయడానికి, అనుకూలీకరించడానికి ఉపయోగించండి.</translation>
+<translation id="3009352964623081324">Search + O, తర్వాత S. వాయిస్‌లను ఇన్‌స్టాల్, మేనేజ్ చేయడానికి, అనుకూలంగా మార్చడానికి ఉపయోగించండి.</translation>
<translation id="3014130421870723208">@ed 8dot</translation>
<translation id="3030432017085518523">మెనూ అంశం రేడియో బటన్</translation>
<translation id="3037392361165431467">{COUNT,plural, =1{సంగ్రాహక గుర్తు}other{# సంగ్రాహక గుర్తులు}}</translation>
@@ -652,7 +652,7 @@ Chrome బ్రౌజర్ మెనూను తెరవడానికి,
<translation id="5420259671171615858">మెనూలలో వెతకండి</translation>
<translation id="5435274640623994081">ఇయర్‌కాన్ లాగింగ్‌ను ప్రారంభించు</translation>
<translation id="5436105723448703439">{COUNT,plural, =1{న్యూన గుర్తు}other{# న్యూన గుర్తులు}}</translation>
-<translation id="5444587279251314700">(సక్రియంగా ఉంది)</translation>
+<translation id="5444587279251314700">(యాక్టివ్‌గా ఉంది)</translation>
<translation id="5451268436205074266">చుక్కలు <ph name="DOT" /></translation>
<translation id="5452267669091857717">తర్వాత స్థాయి 1 శీర్షిక లేదు</translation>
<translation id="5455441614648621694">బహుమానపూర్వకం</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb
index 6663afcb91f4..49deb5d99c82 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb
@@ -450,7 +450,7 @@
<translation id="3391512812407811893">Privacy Sandbox-ի փորձնական տարբերակներ</translation>
<translation id="3398320232533725830">Բացել էջանիշների կառավարիչը</translation>
<translation id="3407392651057365886">Նախաբեռնվում են ավելի շատ էջեր։ Նախաբեռնումը կարող է կատարվել Google-ի սերվերների կողմից այլ կայքերի հարցումով։</translation>
-<translation id="3414952576877147120">Չափը՝</translation>
+<translation id="3414952576877147120">Չափսը՝</translation>
<translation id="3421726884497337397">Ընտրեք, թե երբ պետք է կողմնակի քուքիները արգելափակվեն</translation>
<translation id="3428747202529429621">Ապահովում է ձեր անվտանգությունը Chrome-ում և Google հավելվածներում, երբ մտել եք ձեր հաշիվ</translation>
<translation id="3429160811076349561">Փորձնական գործառույթներն անջատված են</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
index 8b0bd7668111..67bd8de6300c 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
@@ -636,7 +636,7 @@
<translation id="4558311620361989323">వెబ్‌పేజీ షార్ట్‌క‌ట్‌లు</translation>
<translation id="4561730552726921821">రిజిస్ట్రేషన్ విజయవంతమైంది</translation>
<translation id="4561979708150884304">కనెక్షన్ లేదు</translation>
-<translation id="4562008740775511591">Chrome తగిన ఆటోమేటిక్ సెట్టింగ్‌లను అందిస్తుంది, కానీ మీరు మీ బ్రౌజింగ్ అలవాట్లకు తగినట్లుగా మీరు దీన్ని అనుకూలీకరించవచ్చు</translation>
+<translation id="4562008740775511591">Chrome తగిన ఆటోమేటిక్ సెట్టింగ్‌లను అందిస్తుంది, కానీ మీరు మీ బ్రౌజింగ్ అలవాట్లకు తగినట్లుగా మీరు దీన్ని అనుకూలంగా మార్చవచ్చు</translation>
<translation id="4565377596337484307">పాస్‌వర్డ్‌ను దాచిపెట్టు</translation>
<translation id="4572422548854449519">నిర్వాహిత ఖాతాకు సైన్ ఇన్ చేయండి</translation>
<translation id="4576892426230499203">మరొక వెరిఫికేషన్ ఆప్షన్‌ను ట్రై చేయండి</translation>
diff --git a/components/strings/components_strings_hy.xtb b/components/strings/components_strings_hy.xtb
index 5047d682da0c..a3210464e997 100644
--- a/components/strings/components_strings_hy.xtb
+++ b/components/strings/components_strings_hy.xtb
@@ -901,7 +901,7 @@
<translation id="3402261774528610252">Կապը, որի միջոցով բեռնվել է այս կայքը, օգտագործում է TLS-ի 1.0 կամ 1.1 տարբերակները, որոնք հնացած են և չեն աջակցվի ապագայում։ Անջատվելուց հետո այցելուները այլևս չեն կարողանա դիտել այս կայքը։ Սերվերը պետք է ակտիվացնի TLS-ի 1.2 կամ ավելի բարձր տարբերակ։</translation>
<translation id="3405664148539009465">Հարմարեցնել տառատեսակները</translation>
<translation id="3409896703495473338">Կառավարել անվտանգության կարգավորումները</translation>
-<translation id="3414952576877147120">Չափը՝</translation>
+<translation id="3414952576877147120">Չափսը՝</translation>
<translation id="3417660076059365994">Ձեր վերբեռնած կամ կցած ֆայլերը ուղարկվում են Google Cloud կամ գործընկեր կազմակերպություններին՝ վերլուծության նպատակով։ Օրինակ, դրանցում կարող է ստուգվել խիստ անձնական տվյալների կամ վնասագրերի առկայությունը։</translation>
<translation id="3422248202833853650">Փակեք մյուս ծրագրերը՝ տարածք ազատելու համար:</translation>
<translation id="3422472998109090673"><ph name="HOST_NAME" />-ը ներկայումս անհասանելի է:</translation>
@@ -1460,7 +1460,7 @@
<translation id="4955242332710481440">A5-Extra</translation>
<translation id="4958444002117714549">Ընդարձակել ցանկը</translation>
<translation id="4964505745997821360">Առողջության ապահովագրություն</translation>
-<translation id="4968522289500246572">Այս հավելվածը նախատեսված է բջջային սարքերի համար։ Չափը փոխելուց հետո հավելվածը կարող է սխալներով աշխատել։</translation>
+<translation id="4968522289500246572">Այս հավելվածը նախատեսված է բջջային սարքերի համար։ Չափսը փոխելուց հետո հավելվածը կարող է սխալներով աշխատել։</translation>
<translation id="4969341057194253438">Ջնջել տեսագրությունը
</translation>
<translation id="4973922308112707173">Երկու անցք վերևում</translation>
diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb
index 27f1afd0deae..b6930dce3e96 100644
--- a/components/strings/components_strings_te.xtb
+++ b/components/strings/components_strings_te.xtb
@@ -834,7 +834,7 @@
<translation id="3229041911291329567">మీ పరికరం, బ్రౌజర్‌ల వెర్షన్ సమాచారం</translation>
<translation id="323107829343500871"><ph name="CREDIT_CARD" /> కార్డ్ CVCని నమోదు చేయండి</translation>
<translation id="3234666976984236645">ఈ సైట్‌లో ఎప్పుడూ ముఖ్యమైన కంటెంట్‌ను గుర్తించు</translation>
-<translation id="3240683217920639535"><ph name="MANAGE_CHROME_THEMES_FOCUSED_FRIENDLY_MATCH_TEXT" />, మీ బ్రౌజర్ రూపాన్ని అనుకూలీకరించడానికి 'Tab'ను నొక్కి, ఆపై 'Enter'ను నొక్కండి</translation>
+<translation id="3240683217920639535"><ph name="MANAGE_CHROME_THEMES_FOCUSED_FRIENDLY_MATCH_TEXT" />, మీ బ్రౌజర్ రూపాన్ని అనుకూలంగా మార్చడానికి 'Tab'ను నొక్కి, ఆపై 'Enter'ను నొక్కండి</translation>
<translation id="3240791268468473923">సురక్షితమైన పేమెంట్ ఆధారానికి సంబంధించిన మ్యాచ్ అయ్యే ఆధారాల షీట్ ఏదీ తెరవబడలేదు</translation>
<translation id="324180406144491771">“<ph name="HOST_NAME" />” లింక్‌లు బ్లాక్ చేయబడ్డాయి</translation>
<translation id="3248611290851046188">మీకు యాడ్‌లను చూపడానికి ఇతర సైట్‌లు ఉపయోగించగల ఆసక్తులను ఈ సైట్ నిర్వచిస్తుంది. మీకు మరింత సందర్భోచితమైన యాడ్‌లను చూపడానికి ఈ సైట్ మీ ఆసక్తులను Chrome నుండి కూడా పొందుతుంది.</translation>
@@ -1132,7 +1132,7 @@
<translation id="4089152113577680600">ట్రే 14</translation>
<translation id="4098354747657067197">ముందున్న సైట్ మోసపూరితమైనది</translation>
<translation id="4099048595830172239">గోప్యమైన కంటెంట్ కనిపిస్తునప్పుడు, మీ స్క్రీన్‌ను <ph name="APPLICATION_TITLE" />తో షేర్ చేయడాన్ని అడ్మినిస్ట్రేటర్ పాలసీ సిఫార్సు చేయదు:</translation>
-<translation id="4099391883283080991"><ph name="CUSTOMIZE_CHROME_FONTS_FOCUSED_FRIENDLY_MATCH_TEXT" />, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలీకరించడానికి Tabను నొక్కి, ఆపై Enterను నొక్కండి</translation>
+<translation id="4099391883283080991"><ph name="CUSTOMIZE_CHROME_FONTS_FOCUSED_FRIENDLY_MATCH_TEXT" />, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలంగా మార్చడానికి Tabను నొక్కి, ఆపై Enterను నొక్కండి</translation>
<translation id="4101413244023615925">టెక్స్ట్, గ్రాఫిక్స్</translation>
<translation id="410148943680000050">డెస్క్‌టాప్ పబ్లిషింగ్</translation>
<translation id="4103249731201008433">పరికరం క్రమ సంఖ్య చెల్లదు</translation>
@@ -1621,7 +1621,7 @@
<translation id="5340250774223869109">యాప్ బ్లాక్ చేయబడింది</translation>
<translation id="534295439873310000">NFC పరికరాలు</translation>
<translation id="5344579389779391559">ఈ పేజీ మీకు డబ్బు ఛార్జీ చేయడానికి ప్రయత్నించవచ్చు</translation>
-<translation id="5347645913823149105">'Chromeలో ఫాంట్‌లను అనుకూలీకరించండి' బటన్, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలీకరించడానికి Enterను నొక్కండి</translation>
+<translation id="5347645913823149105">'Chromeలో ఫాంట్‌లను అనుకూలంగా మార్చండి' బటన్, Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలంగా మార్చడానికి Enterను నొక్కండి</translation>
<translation id="5355557959165512791"><ph name="SITE" /> యొక్క ప్రమాణపత్రం రద్దు చేయబడినందున మీరు ప్రస్తుతం దీన్ని సందర్శించలేరు. నెట్‌వర్క్ లోపాలు మరియు దాడులు సాధారణంగా తాత్కాలికమే, కనుక ఈ పేజీ తర్వాత పని చేయవచ్చు.</translation>
<translation id="5356837363448394805">ఎర్రబారిన ముఖం</translation>
<translation id="5357848622083956825">విజువల్ ఆర్ట్ &amp; డిజైన్</translation>
@@ -2464,7 +2464,7 @@
<translation id="7740996059027112821">ప్రామాణికం</translation>
<translation id="77424286611022110">ఈ సైట్ అనుచితమైన లేదా తప్పుదారి పట్టించే యాడ్‌లను చూపుతుంది. <ph name="LEARN_MORE_LINK_TEXT" /></translation>
<translation id="774634243536837715">హానికరమైన కంటెంట్ బ్లాక్ చేయబడింది.</translation>
-<translation id="7751971323486164747">Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలీకరించండి</translation>
+<translation id="7751971323486164747">Chromeలో ఫాంట్ సైజ్‌లను, టైప్‌ఫేస్‌లను అనుకూలంగా మార్చండి</translation>
<translation id="7752995774971033316">నిర్వహించడం లేదు</translation>
<translation id="7755624218968747854">ప్రైమరీ రోల్</translation>
<translation id="7757555340166475417">డాయ్-పా-కాయ్</translation>
@@ -2595,7 +2595,7 @@
<translation id="8116925261070264013">మ్యూట్ చేసినవి</translation>
<translation id="8118489163946903409">పేమెంట్ ఆప్షన్‌</translation>
<translation id="8123046743443732598">డెస్క్‌టాప్ కంప్యూటర్‌లు</translation>
-<translation id="8124639700796374294">'Chromeను అనుకూలీకరించండి' బటన్, మీ బ్రౌజర్ రూపాన్ని అనుకూలీకరించడానికి 'Enter'ను నొక్కండి</translation>
+<translation id="8124639700796374294">'Chromeను అనుకూలంగా మార్చండి' బటన్, మీ బ్రౌజర్ రూపాన్ని అనుకూలంగా మార్చడానికి 'Enter'ను నొక్కండి</translation>
<translation id="8126056688005753476">అడ్వెంచర్ ట్రావెల్</translation>
<translation id="8127301229239896662">మీ కంప్యూటర్ లేదా నెట్‌వర్క్‌లో "<ph name="SOFTWARE_NAME" />" సరిగ్గా ఇన్‌స్టాల్ కాలేదు. ఈ సమస్యను పరిష్కరించమని మీ IT నిర్వాహకులను కోరండి.</translation>
<translation id="8131740175452115882">నిర్ధారించు</translation>
@@ -2834,7 +2834,7 @@
<translation id="8870413625673593573">ఇటీవల మూసివేసినవి</translation>
<translation id="8870494189203302833">ఒకే క్రమంలో ఉన్న ఫేస్ డౌన్</translation>
<translation id="8870700989640064057">గోప్యమైన ఫైల్‌ను ప్రింట్ చేయాలా?</translation>
-<translation id="8871553383647848643">మీ బ్రౌజర్ రూపాన్ని అనుకూలీకరించండి</translation>
+<translation id="8871553383647848643">మీ బ్రౌజర్ రూపాన్ని అనుకూలంగా మార్చండి</translation>
<translation id="8874824191258364635">చెల్లుబాటు అయ్యే కార్డ్ నంబర్‌ను నమోదు చేయండి</translation>
<translation id="8876033571432926051">సరదా గేమ్‌లు</translation>
<translation id="8877780815363510165">చేపలు పట్టడం</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_te.xtb b/ui/chromeos/translations/ui_chromeos_strings_te.xtb
index 99a921b42aa5..7093b4618657 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_te.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_te.xtb
@@ -166,7 +166,7 @@
<translation id="2378075407703503998"><ph name="SELCTED_FILE_COUNT" /> ఫైళ్లు ఎంచుకోబడ్డాయి</translation>
<translation id="2387458720915042159">ప్రాక్సీ కనెక్షన్ రకం</translation>
<translation id="2389832672041313158">బర్మీస్/మయన్మార్</translation>
-<translation id="2392369802118427583">సక్రియం చేయి</translation>
+<translation id="2392369802118427583">యాక్టివేట్ చేయండి</translation>
<translation id="240770291734945588"><ph name="SPACE_AVAILABLE" /> అందుబాటులో ఉంది</translation>
<translation id="2425665904502185219">మొత్తం ఫైల్ పరిమాణం</translation>
<translation id="2428749644083375155"><ph name="NUMBER_OF_ITEMS" /> ఐటెమ్‌లను <ph name="FOLDER_NAME" />కు కాపీ చేస్తోంది</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From fb7ed04a21de2cc9d55e005130acc00b4bf5b238 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Thu, 30 Jun 2022 01:00:51 +0000
Subject: [PATCH 51/59] Incrementing VERSION to 102.0.5005.145
Change-Id: Idbdf4eb7c9ccb83bb8bd1f61c0fa42af164014fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3736004
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1210}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index ea7e63ff5099..48b95fdd910e 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=144
+PATCH=145
--
2.37.0

View File

@ -0,0 +1,33 @@
From 4d069862995f5b414fa3a06c4fd2b71e16defc26 Mon Sep 17 00:00:00 2001
From: Sorin Jianu <sorin@chromium.org>
Date: Thu, 30 Jun 2022 03:34:17 +0000
Subject: [PATCH 52/59] Disable IntegrationTest.SelfUpdateFromOldReal in M102.
Bug: 1340482
Change-Id: I1dc7d99a84880867c3afca5281edd80f0d41d4ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3732396
Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#1211}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/updater/test/integration_tests.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/updater/test/integration_tests.cc b/chrome/updater/test/integration_tests.cc
index d2d02dd04e7b..ca176f6016cc 100644
--- a/chrome/updater/test/integration_tests.cc
+++ b/chrome/updater/test/integration_tests.cc
@@ -620,7 +620,8 @@ TEST_F(IntegrationTest, UnregisterUnownedApp) {
#if BUILDFLAG(CHROMIUM_BRANDING) || BUILDFLAG(GOOGLE_CHROME_BRANDING)
// TODO(crbug.com/1268555): Even on Windows, component builds do not work.
#if !defined(COMPONENT_BUILD)
-TEST_F(IntegrationTest, SelfUpdateFromOldReal) {
+// TODO(crbug.com/1340482) - disable the test on branches because it is flaky.
+TEST_F(IntegrationTest, DISABLED_SelfUpdateFromOldReal) {
ScopedServer test_server(test_commands_);
// TODO(crbug.com/1308856): Current versions of the updater do not send an
--
2.37.0

View File

@ -0,0 +1,28 @@
From f200497260f693b91282be927a5f66454153e1ee Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Fri, 1 Jul 2022 01:00:32 +0000
Subject: [PATCH 54/59] Incrementing VERSION to 102.0.5005.146
Change-Id: I2d9fd202320097c93f848856867637a3c12c036d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3739526
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1213}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 48b95fdd910e..77a1b84df510 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=145
+PATCH=146
--
2.37.0

View File

@ -0,0 +1,106 @@
From a27b8ff1869802e8d34afae11ff52e0271077db4 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Fri, 1 Jul 2022 14:09:34 +0000
Subject: [PATCH 55/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: I57bfdaabcbb5987d43fa117e818a0e9669877525
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3738937
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Mason <benmason@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1214}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/app/resources/generated_resources_es-419.xtb | 2 +-
chrome/app/resources/generated_resources_fa.xtb | 4 ++--
components/strings/components_strings_fa.xtb | 4 ++--
remoting/resources/remoting_strings_fa.xtb | 2 +-
ui/chromeos/translations/ui_chromeos_strings_fa.xtb | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb
index dd4a406234dd..ee73f2dda753 100644
--- a/chrome/app/resources/generated_resources_es-419.xtb
+++ b/chrome/app/resources/generated_resources_es-419.xtb
@@ -8321,7 +8321,7 @@ Mantén el archivo de clave en un lugar seguro. Debes crear las nuevas versiones
<translation id="9199503643457729322">Haz clic para salir de la Guía de privacidad.</translation>
<translation id="9200339982498053969"><ph name="ORIGIN" /> podrá editar los archivos de la carpeta <ph name="FOLDERNAME" /></translation>
<translation id="920045321358709304">Buscar en <ph name="SEARCH_ENGINE" /></translation>
-<translation id="9201023452444595544">Se borrarán los datos sin conexión</translation>
+<translation id="9201023452444595544">Se borrarán los datos sin conexión.</translation>
<translation id="9201117361710210082">Visto anteriormente</translation>
<translation id="9201220332032049474">Opciones de bloqueo de pantalla</translation>
<translation id="9201842707396338580">Se produjo un error. Comunícate con el administrador o el propietario de tu dispositivo. Código de error: <ph name="ERROR_CODE" />.</translation>
diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb
index 262eccfeac75..79d3b99cca6e 100644
--- a/chrome/app/resources/generated_resources_fa.xtb
+++ b/chrome/app/resources/generated_resources_fa.xtb
@@ -9,7 +9,7 @@
<translation id="1005333234656240382">‏اشکال‌زدایی ADB (پل اشکال‌زدایی Android) فعال شود؟</translation>
<translation id="1006873397406093306">این افزونه می‌تواند داده‌هایتان را در سایت‌ها بخواند و تغییر دهد. می‌توانید سایت‌هایی را که این افزونه به آن‌ها دسترسی دارد کنترل کنید.</translation>
<translation id="1008186147501209563">صادرکردن نشانک‌ها</translation>
-<translation id="1008557486741366299">اکنون نه</translation>
+<translation id="1008557486741366299">حالا نه</translation>
<translation id="1009476156254802388">مکان <ph name="WEB_DRIVE" /></translation>
<translation id="1010498023906173788">این برگه به درگاه سریال متصل است.</translation>
<translation id="1010833424573920260">{NUM_PAGES,plural, =1{صفحه غیرپاسخگو}one{صفحه‌های غیرپاسخگو}other{صفحه‌های غیرپاسخگو}}</translation>
@@ -2601,7 +2601,7 @@
<translation id="3476303763173086583">‏داده‌های استفاده و عیب‌یابی را ارسال کنید. با ارسال خودکار داده‌های عیب‌یابی و داده‌های استفاده از دستگاه و برنامه به Google به بهبود تجربه Android خود کمک کنید. این داده‌ها برای شناسایی فرزندتان استفاده نخواهند شد و به بهبود پایداری سیستم و برنامه و موارد دیگر کمک خواهد کرد. بعضی داده‌های انبوهشی نیز به برنامه‌ها و شرکای Google (مانند برنامه‌نویس‌های Android) کمک می‌کند. این <ph name="BEGIN_LINK1" />تنظیم<ph name="END_LINK1" /> توسط مالک اعمال می‌شود. ممکن است مالک انتخاب کند داده‌های استفاده و عیب‌یابی این دستگاه به Google ارسال شود. اگر تنظیم «فعالیت وب و برنامه» تکمیلی برای فرزندتان روشن باشد، ممکن است این داده‌ها در حساب Google او ذخیره شود. <ph name="BEGIN_LINK2" />بیشتر بدانید<ph name="END_LINK2" /></translation>
<translation id="347670947055184738">وای! سیستم نتوانست خط‌مشی را برای دستگاهتان واکشی کند.</translation>
<translation id="347785443197175480">همچنان دسترسی به دوربین و میکروفون شما، توسط <ph name="HOST" /> مجاز باشد</translation>
-<translation id="3479552764303398839">اکنون نه</translation>
+<translation id="3479552764303398839">حالا نه</translation>
<translation id="3479685872808224578">سرور چاپ شناسایی نشد. لطفاً نشانی را بررسی و دوباره امتحان کنید.</translation>
<translation id="3480612136143976912">اندازه و سبک زیرنویس ناشنوایان را برای «زیرنویس ناشنوایان زنده» سفارشی می‌کند. برخی از برنامه‌ها و سایت‌ها نیز از این تنظیم استفاده خواهند کرد.</translation>
<translation id="3480827850068960424"><ph name="NUM" /> برگه پیدا شد</translation>
diff --git a/components/strings/components_strings_fa.xtb b/components/strings/components_strings_fa.xtb
index e7cb75762bb5..c4333102aae1 100644
--- a/components/strings/components_strings_fa.xtb
+++ b/components/strings/components_strings_fa.xtb
@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="fa">
<translation id="1003222766972176318">یادآوری: پیشنهاد ذخیره‌شده دردسترس است</translation>
-<translation id="1008557486741366299">اکنون نه</translation>
+<translation id="1008557486741366299">حالا نه</translation>
<translation id="100957008357583611">از مکان شما استفاده شود؟</translation>
<translation id="1010200102790553230">بار کردن صفحه در فرصتی دیگر</translation>
<translation id="1011206368273183593">درحال آماده‌سازی فایل‌ها</translation>
@@ -930,7 +930,7 @@
<translation id="3468054117417088249"><ph name="TAB_SWITCH_SUFFIX" />، اکنون باز است، برای جابه‌جا شدن به برگه باز، ابتدا دکمه Tab سپس Enter را فشار دهید</translation>
<translation id="3470563864795286535"><ph name="CLOSE_INCOGNITO_WINDOWS_FOCUSED_FRIENDLY_MATCH_TEXT" />؛ برای بستن همه پنجره‌های ناشناسی که درحال‌حاضر باز هستند، کلید «جهش» و سپس «ورود» را فشار دهید</translation>
<translation id="3477679029130949506">فهرست فیلم و ساعات کار سینما</translation>
-<translation id="3479552764303398839">اکنون نه</translation>
+<translation id="3479552764303398839">حالا نه</translation>
<translation id="3484560055331845446">‏ممکن است دسترسی به حساب Google را از دست بدهید. Chrome توصیه می‌کند اکنون گذرواژه‌تان را تغییر دهید. از شما خواسته می‌شود به سیستم وارد شوید.</translation>
<translation id="3487845404393360112">سینی ۴</translation>
<translation id="3495081129428749620">یافتن در صفحه
diff --git a/remoting/resources/remoting_strings_fa.xtb b/remoting/resources/remoting_strings_fa.xtb
index 50c5d11d21b9..746856700b26 100644
--- a/remoting/resources/remoting_strings_fa.xtb
+++ b/remoting/resources/remoting_strings_fa.xtb
@@ -2,7 +2,7 @@
<!DOCTYPE translationbundle>
<translationbundle lang="fa">
<translation id="1002108253973310084">نسخه ناسازگار پروتکل شناسایی شد. لطفاً مطمئن شوید جدیدترین نسخه نرم‌افزار روی هر دو رایانه نصب شده است و دوباره امتحان کنید.</translation>
-<translation id="1008557486741366299">اکنون نه</translation>
+<translation id="1008557486741366299">حالا نه</translation>
<translation id="1201402288615127009">بعدی</translation>
<translation id="1297009705180977556">خطا در اتصال به <ph name="HOSTNAME" /></translation>
<translation id="1450760146488584666">شئ درخواست شده وجود ندارد.</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_fa.xtb b/ui/chromeos/translations/ui_chromeos_strings_fa.xtb
index 2d8ce99bd8f5..859bf5d213ba 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_fa.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_fa.xtb
@@ -287,7 +287,7 @@
<translation id="3466147780910026086">در حال اسکن دستگاه رسانه شما...</translation>
<translation id="3468522857997926824"><ph name="FILE_COUNT" /> عکس در <ph name="BEGIN_LINK" />Google Drive<ph name="END_LINK" /> پشتیبان گرفته شدند</translation>
<translation id="3475447146579922140">‏صفحه‌گسترده Google</translation>
-<translation id="3479552764303398839">اکنون نه</translation>
+<translation id="3479552764303398839">حالا نه</translation>
<translation id="3486821258960016770">مغولی</translation>
<translation id="3495304270784461826"><ph name="COUNT" /> خطا.</translation>
<translation id="3509680540198371098">شبکه <ph name="NETWORK_INDEX" /> از <ph name="NETWORK_COUNT" />، <ph name="NETWORK_NAME" />، <ph name="SECURITY_STATUS" />، <ph name="CONNECTION_STATUS" />، قدرت سیگنال <ph name="SIGNAL_STRENGTH" />٪، جزئیات</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 391fb1a5e453329543f2f332e5974766cd5014a3 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sat, 2 Jul 2022 01:01:07 +0000
Subject: [PATCH 56/59] Incrementing VERSION to 102.0.5005.147
Change-Id: I14fb873b1b7c28ba9671cadd20eba07df8273899
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3741368
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1215}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 77a1b84df510..1e243e1ad602 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=146
+PATCH=147
--
2.37.0

View File

@ -0,0 +1,420 @@
From 635e11ea23feab7857e247cfc97bf6c31d5b3232 Mon Sep 17 00:00:00 2001
From: Ben Mason <benmason@google.com>
Date: Sat, 2 Jul 2022 14:46:02 +0000
Subject: [PATCH 57/59] Updating XTBs based on .GRDs from branch 5005
Change-Id: Iae0d7ba2d623eb48253bf9f4c0ae7256374d5f6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3738372
Auto-Submit: Ben Mason <benmason@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1216}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
ash/strings/ash_strings_mn.xtb | 4 +--
chrome/app/resources/chromium_strings_te.xtb | 2 +-
.../app/resources/generated_resources_ky.xtb | 2 +-
.../app/resources/generated_resources_mn.xtb | 2 +-
.../app/resources/generated_resources_te.xtb | 16 +++++------
.../resources/generated_resources_zh-CN.xtb | 2 +-
.../resources/google_chrome_strings_te.xtb | 2 +-
.../strings/accessibility_strings_ml.xtb | 8 +++---
components/strings/components_strings_te.xtb | 28 +++++++++----------
.../app/strings/resources/ios_strings_ml.xtb | 6 ++--
.../strings/resources/ios_strings_zh-CN.xtb | 2 +-
.../translations/ui_chromeos_strings_te.xtb | 2 +-
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/ash/strings/ash_strings_mn.xtb b/ash/strings/ash_strings_mn.xtb
index 18ea3f5ec598..eb78743a3d1d 100644
--- a/ash/strings/ash_strings_mn.xtb
+++ b/ash/strings/ash_strings_mn.xtb
@@ -7,7 +7,7 @@
<translation id="1014111206066007277">Дэлгэцийн видео бичлэгийн хэрэгсэл</translation>
<translation id="1024261588257374085">Хэсэгчилсэн дэлгэцийн агшныг сонгосон</translation>
<translation id="1024364763893396229">Өөрийн <ph name="NAME" />-г хадгалах уу?</translation>
-<translation id="1032891413405719768">Мэдрэгч үзэгний батерей бага байна</translation>
+<translation id="1032891413405719768">Мэдрэгч үзэгний батарей бага байна</translation>
<translation id="1036073649888683237">Мэдэгдлүүдийг удирдахын тулд Тохиргоо руу очно уу</translation>
<translation id="1036672894875463507">Би танд өдрийн турш туслахад бэлэн Google Туслах тань байна!
Эхлүүлэхийн тулд та эдгээр зүйлээс хийж үзэх боломжтой.</translation>
@@ -668,7 +668,7 @@
<translation id="4890408602550914571">Таны утас ойролцоо бөгөөд Bluetooth-г нь асаасан эсэхийг шалгана уу.</translation>
<translation id="4895488851634969361">Цэнэг дүүрсэн байна.</translation>
<translation id="490375751687810070">Босоо</translation>
-<translation id="490788395437447240">Батерей <ph name="BATTERY_PERCENTAGE" />%</translation>
+<translation id="490788395437447240">Батарей <ph name="BATTERY_PERCENTAGE" />%</translation>
<translation id="4917385247580444890">Хүчтэй</translation>
<translation id="4918086044614829423">Хүлээн зөвшөөрөх</translation>
<translation id="4925542575807923399">Энэ хаягийг хариуцсан ажилтан нь олон хаягаар зэрэг нэвтрэх тохиолдолд зөвхөн энэ хаягаар түрүүлж нэвтэрсний дараагаар бусад хаягт нэвтрэх боломжтой байхаар тохируулсан байна.</translation>
diff --git a/chrome/app/resources/chromium_strings_te.xtb b/chrome/app/resources/chromium_strings_te.xtb
index 6cd93063385f..2488072014b7 100644
--- a/chrome/app/resources/chromium_strings_te.xtb
+++ b/chrome/app/resources/chromium_strings_te.xtb
@@ -36,7 +36,7 @@
<translation id="2008474315282236005">ఇది ఈ పరికరం నుండి 1 అంశాన్ని తొలగిస్తుంది. మీ డేటాను తర్వాత తిరిగి పొందడానికి, Chromiumకు <ph name="USER_EMAIL" /> లాగా సైన్ ఇన్ చేయండి.</translation>
<translation id="2020032459870799438">డేటా ఉల్లంఘనల నుండి, ఇతర భద్రతా సమస్యల నుండి మీ ఇతర పాస్‌వర్డ్‌లు సురక్షితంగా ఉన్నాయో లేదో చెక్ చేయడానికి, <ph name="BEGIN_LINK" />Chromiumకు సైన్ ఇన్ చేయండి<ph name="END_LINK" />.</translation>
<translation id="2049376729098081731">Google సర్వీస్‌లలో మరింత వ్యక్తిగతీకరించిన అనుభవం కోసం Chromium హిస్టరీని చేర్చాలో, లేదో ఎంచుకోండి</translation>
-<translation id="2174178932569897599">Chromiumను అనుకూలంగా మార్చు</translation>
+<translation id="2174178932569897599">Chromiumను అనుకూలంగా మార్చండి</translation>
<translation id="2185166961232948079">Chromium - నెట్‌వర్క్ సైన్ ఇన్ - <ph name="PAGE_TITLE" /></translation>
<translation id="2241627712206172106">మీరు కంప్యూటర్‌ను షేర్‌ చేస్తే, స్నేహితులు, కుటుంబ సభ్యులు విడివిడిగా బ్రౌజ్ చేయవచ్చు. Chromiumను వారికి నచ్చిన రీతిలో సెటప్ చేసుకోవచ్చు.</translation>
<translation id="2313870531055795960">Chromiumలో స్టోర్ చేయబడిన సురక్షితం కాని సైట్‌ల లిస్ట్‌తో కూడిన URLలను చెక్ చేస్తుంది. ఏదైనా సైట్ మీ పాస్‌వర్డ్‌ను దొంగిలించే ప్రయత్నం చేసినా, లేదంటే ఏదైనా హానికరమైన ఫైల్‌ను మీరు డౌన్‌లోడ్ చేసినా, సదరు URLలను, ఆయా పేజీల కంటెంట్‌లోని కొన్ని భాగాలను కూడా Chromium, 'సురక్షిత బ్రౌజింగ్'కు పంపవచ్చు.</translation>
diff --git a/chrome/app/resources/generated_resources_ky.xtb b/chrome/app/resources/generated_resources_ky.xtb
index 47ae70643bb0..715404a4a6d7 100644
--- a/chrome/app/resources/generated_resources_ky.xtb
+++ b/chrome/app/resources/generated_resources_ky.xtb
@@ -6862,7 +6862,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
<translation id="7742558784808143689"><ph name="SITE_NAME" />, анын астындагы бардык сайттардагы, ошондой эле орнотулган колдонмолордогу сайтка тиешелүү маалыматтар жана уруксаттар тазалансынбы?</translation>
<translation id="7742706086992565332">Айрым сайттардын көрүнүшүн чоңойтуу же кичирейтүү функциясын колдоно аласыз</translation>
<translation id="7742879569460013116">Шилтемени төмөнкү менен бөлүшүү:</translation>
-<translation id="774377079771918250">Кайда сакталаарын тандаңыз</translation>
+<translation id="774377079771918250">Кайда сакталарын тандаңыз</translation>
<translation id="7744047395460924128">Басып чыгаруу таржымалыңызды көрүү</translation>
<translation id="7744192722284567281">Сырсөз уурдалды</translation>
<translation id="7744649840067671761">Башка аракеттерди дайындоо үчүн жаңы которгучту же баскычтоптогу баскычты таптап коюңуз.
diff --git a/chrome/app/resources/generated_resources_mn.xtb b/chrome/app/resources/generated_resources_mn.xtb
index 58836e6a0de1..a277cff23049 100644
--- a/chrome/app/resources/generated_resources_mn.xtb
+++ b/chrome/app/resources/generated_resources_mn.xtb
@@ -1123,7 +1123,7 @@
<translation id="2073148037220830746">{NUM_EXTENSIONS,plural, =1{Өргөтгөлийг суулгахын тулд товшино уу}other{Эдгээр өргөтгөлийг суулгахын тулд товшино уу}}</translation>
<translation id="2073496667646280609">Таны төхөөрөмж эсвэл сонгосон нөөцлөлтийн байршилд хангалттай сул хадгалах сан байхгүй байж магадгүй. Сул зай гаргах эсвэл өөр байршил сонгож үзнэ үү.</translation>
<translation id="2073505299004274893"><ph name="CHARACTER_LIMIT" /> эсвэл үүнээс цөөн тэмдэгт ашиглана уу</translation>
-<translation id="2075474481720804517"><ph name="BATTERY_PERCENTAGE" />% батерей</translation>
+<translation id="2075474481720804517"><ph name="BATTERY_PERCENTAGE" />% батарей</translation>
<translation id="2075959085554270910">Танд tap-to-click болон чирэлтийг товшихыг идэвхжүүлэх/идэвхгүй болгохыг зөвшөөрдөг</translation>
<translation id="2076269580855484719">Энэ нэмэлт өргөтгөлийг нуух</translation>
<translation id="2076672359661571384">Дунд (санал болгосон)</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb
index ccce07a85680..bccf4999244f 100644
--- a/chrome/app/resources/generated_resources_te.xtb
+++ b/chrome/app/resources/generated_resources_te.xtb
@@ -665,7 +665,7 @@
<translation id="1630768113285622200">రీస్టార్ట్ చేసి, కొనసాగించు</translation>
<translation id="1632082166874334883">మీ Google ఖాతాలో పాస్‌వర్డ్ స్టోర్ చేయబడింది</translation>
<translation id="1632756664321977232">కత్తిరింపు టూల్</translation>
-<translation id="1632803087685957583">మీ కీబోర్డ్ పునరావృత రేటు, పద సూచన మొదలైనవి సర్దుబాటు చేయడానికి మిమ్మల్ని అనుమతిస్తుంది</translation>
+<translation id="1632803087685957583">మీ కీబోర్డ్ రిపీట్ రేటు, పద సూచన మొదలైనవి సర్దుబాటు చేయడానికి మిమ్మల్ని అనుమతిస్తుంది</translation>
<translation id="163309982320328737">ప్రారంభ అక్షరం వెడల్పు నిండింది</translation>
<translation id="1633947793238301227">Google Assistantను డిజేబుల్ చేయండి</translation>
<translation id="1634783886312010422">మీరు ఇప్పటికే ఈ పాస్‌వర్డ్‌ను <ph name="WEBSITE" />లో మార్చారా?</translation>
@@ -1588,7 +1588,7 @@
<translation id="2468845464436879514">{NUM_TABS,plural, =1{<ph name="GROUP_TITLE" /> - 1 ట్యాబ్}other{<ph name="GROUP_TITLE" /> - # ట్యాబ్‌లు}}</translation>
<translation id="2469141124738294431">వర్చువల్ మెషీన్ స్టేటస్</translation>
<translation id="2469259292033957819">మీ వద్ద సేవ్ చేసిన ప్రింటర్‌లు ఏవీ లేవు.</translation>
-<translation id="2469375675106140201">స్పెల్ చెక్‌ను అనుకూలంగా మార్చు</translation>
+<translation id="2469375675106140201">స్పెల్ చెక్‌ను అనుకూలంగా మార్చండి</translation>
<translation id="247051149076336810">ఫైల్ షేర్ URL</translation>
<translation id="2470702053775288986">మద్దతు లేని ఎక్స్‌టెన్షన్‌లు నిలిపివేయబడ్డాయి</translation>
<translation id="2471469610750100598">నలుపు (ఆటోమేటిక్ సెట్టింగ్)</translation>
@@ -2213,7 +2213,7 @@
<translation id="3060987956645097882">మీ ఫోన్‌తో కనెక్షన్‌ను ఏర్పాటు చేయడం మాకు సాధ్యపడలేదు. మీ ఫోన్ సమీపంలోనే ఉండి, అలాగే బ్లూటూత్, Wi-Fi ఆన్ చేయబడి ఉందని నిర్ధారించుకోండి.</translation>
<translation id="3064871050034234884">సైట్‌లు సౌండ్‌ను ప్లే చేయగలవు</translation>
<translation id="3065041951436100775">ట్యాబ్ మూసివేత ప్ర‌తిస్పంద‌న‌.</translation>
-<translation id="3065522099314259755">కీబోర్డ్ పునరావృత ప్రతిస్పందన సమయం</translation>
+<translation id="3065522099314259755">కీబోర్డ్ రిపీట్ ప్రతిస్పందన సమయం</translation>
<translation id="3067198179881736288">యాప్‌ను ఇన్‌స్టాల్ చేయాలా?</translation>
<translation id="3067198360141518313">ఈ ప్లగ్ఇన్‌ను అమలు చేయి</translation>
<translation id="3071624960923923138">మీరు కొత్త ట్యాబ్‌ను తెరవడానికి ఇక్కడ క్లిక్ చేయవచ్చు</translation>
@@ -2515,7 +2515,7 @@
<translation id="340282674066624"><ph name="DOWNLOAD_RECEIVED" />, <ph name="TIME_LEFT" /></translation>
<translation id="3404065873681873169">ఈ సైట్ కోసం పాస్‌వర్డ్‌లు సేవ్ చేయబడలేదు</translation>
<translation id="3404249063913988450">స్క్రీన్ సేవర్‌ను ఎనేబుల్ చేయి</translation>
-<translation id="3405664148539009465">ఫాంట్‌లను అనుకూలంగా మార్చు</translation>
+<translation id="3405664148539009465">ఫాంట్‌లను అనుకూలంగా మార్చండి</translation>
<translation id="3405763860805964263">...</translation>
<translation id="3406290648907941085">వర్చువల్ రియాలిటీ పరికరాలను, అలాగే డేటాను ఉపయోగించడానికి అనుమతించబడింది</translation>
<translation id="3406396172897554194">భాష లేదా ఇన్‌పుట్ పేరు ఆధారంగా సెర్చ్ చేయండి</translation>
@@ -3089,7 +3089,7 @@
<translation id="3937640725563832867">సర్టిఫికెట్ జారీ చేసినవారి ప్రత్యామ్నాయ పేరు</translation>
<translation id="3937734102568271121">ఎల్లప్పుడూ <ph name="LANGUAGE" /> భాషలోది అనువదించు</translation>
<translation id="3938128855950761626"><ph name="VENDOR_ID" /> విక్రేత నుండి అందించే పరికరాలు</translation>
-<translation id="3940233957883229251">ఆటోమేటిక్‌గా పునరావృతం చేయడాన్ని ప్రారంభించు</translation>
+<translation id="3940233957883229251">ఆటోమేటిక్‌గా రిపీట్‌ చేయడాన్ని ప్రారంభించు</translation>
<translation id="3941565636838060942">ఈ ప్రోగ్రామ్‌కు యాక్సెస్‌ను దాచడానికి, మీరు దీన్ని నియంత్రణ ప్యానెల్‌లోని
<ph name="CONTROL_PANEL_APPLET_NAME" />ను ఉపయోగించి అన్‌ఇన్‌స్టాల్ చేయాలి.
@@ -3763,7 +3763,7 @@
<translation id="4627442949885028695">మరో పరికరం నుండి కొనసాగించండి</translation>
<translation id="4628762811416793313">Linux కంటెయినర్ సెటప్ పూర్తి కాలేదు. దయచేసి మళ్లీ ప్రయత్నించండి.</translation>
<translation id="4629521233550547305"><ph name="PROFILE_NAME" /> ప్రొఫైల్‌ను తెరవు</translation>
-<translation id="4632655012900268062">కార్డ్‌లను అనుకూలంగా మార్చు</translation>
+<translation id="4632655012900268062">కార్డ్‌లను అనుకూలంగా మార్చండి</translation>
<translation id="4633003931260532286">"<ph name="IMPORT_NAME" />" యొక్క వెర్షన్ కనీసం "<ph name="IMPORT_VERSION" />" ఉండాలని ఎక్స్‌టెన్షన్ కోరుతోంది, కానీ "<ph name="INSTALLED_VERSION" />" వెర్షన్ మాత్రమే ఇన్‌స్టాల్ చేయబడి ఉంది</translation>
<translation id="4633757335284074492">Google Driveలో బ్యాకప్ చేయండి. సులభంగా డేటాను పునరుద్ధరించండి లేదా ఏ సమయంలో అయినా పరికరాన్ని మార్చండి. ఈ బ్యాకప్‌లో యాప్ డేటా కూడా ఉంటుంది. బ్యాకప్‌లు Googleకు అప్‌లోడ్ అవుతాయి, మీ చిన్నారి Google ఖాతా పాస్‌వర్డ్‌ను ఉపయోగించి ఎన్‌క్రిప్ట్ చేయబడతాయి.</translation>
<translation id="4634575639321169635">పని కోసం లేదా వ్యక్తిగత వినియోగం కోసం ఈ పరికరాన్ని సెటప్ చేయండి</translation>
@@ -5659,7 +5659,7 @@
<translation id="653983593749614101">కొనసాగించబడుతోంది…</translation>
<translation id="654039047105555694"><ph name="BEGIN_BOLD" />గమనిక:<ph name="END_BOLD" /> డేటా సేకరణ వలన పనితీరు తగ్గవచ్చు, అందువల్ల‌ మీరు చేస్తున్నది మీకు తెలిసినప్పుడు లేదా ఇలా చేయాలని మీకు చెప్పినప్పుడు మాత్రమే ప్రారంభించండి.</translation>
<translation id="6541638731489116978">ఈ సైట్ మీ మోషన్ సెన్సార్‌లను యాక్సెస్ చేయనీయకుండా బ్లాక్ చేయబడింది.</translation>
-<translation id="6545665334409411530">పునరావృత రేటు</translation>
+<translation id="6545665334409411530">రిపీట్ రేటు</translation>
<translation id="6545867563032584178">Mac సిస్టమ్ ప్రాధాన్యతలలో మైక్రోఫోన్‌ ఆఫ్ చేయబడింది</translation>
<translation id="6546856949879953071">అప్‌గ్రేడ్ సమాచారా వివరాల కోసం, Files &gt; నా ఫైల్స్ &gt; <ph name="LOG_FILE" /> అనే సెట్టింగ్‌లో లాగ్స్ సేవ్ చేయబడతాయి</translation>
<translation id="6547354035488017500">కనీసం 512 MB స్థలాన్ని ఖాళీగా ఉంచండి, లేదంటే పరికరం ఇక స్పందించదు. స్థలాన్ని ఖాళీ చేయడానికి, పరికర నిల్వ నుండి ఫైళ్లను తొలగించండి.</translation>
@@ -8090,7 +8090,7 @@
<translation id="895347679606913382">ప్రారంభిస్తోంది...</translation>
<translation id="8953654039337655940">మీ తల్లి/తండ్రికి వారి Google Family Link యాప్‌నకు, అలాగే families.google.comకు ఒక అప్రూవల్ రిక్వెస్ట్ పంపబడింది. ఒకవేళ మీ తల్లి/తండ్రి ఆ రిక్వెస్ట్‌ను ఆమోదిస్తే, మీకు నోటిఫికేషన్ వస్తుంది.</translation>
<translation id="8956230710625245889">రీడర్‌లో తెరవండి</translation>
-<translation id="8957757410289731985">ప్రొఫైల్‌ను అనుకూలంగా మార్చు</translation>
+<translation id="8957757410289731985">ప్రొఫైల్‌ను అనుకూలంగా మార్చండి</translation>
<translation id="895944840846194039">JavaScript మెమరీ</translation>
<translation id="8960208913905765425">త్వరిత సమాధానాల యూనిట్ మార్పిడి</translation>
<translation id="8962051932294470566">మీరు ఒకసారి ఒక ఫైల్‌ను మాత్రమే షేర్ చేయగలరు. ప్రస్తుత బదిలీ పూర్తయినప్పుడు మీరు మళ్లీ ట్రై చేయండి.</translation>
diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
index 0cc9b784386d..fe3bffd76d5d 100644
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -7487,7 +7487,7 @@
<translation id="8376137163494131156">请将 Google Cast 发生的情况告诉我们。</translation>
<translation id="8376384591331888629">包括此网站上的第三方 Cookie</translation>
<translation id="8376451933628734023">如果此 Web 应用试图诱骗您认为它是另一款应用,请卸载它。</translation>
-<translation id="8378714024927312812">由贵单位管理</translation>
+<translation id="8378714024927312812">由贵组织管理</translation>
<translation id="8379156816349755485">一旦您登录,系统便会存储一个独一无二的身份验证令牌,并会使用它保存今后所有符合条件的下载内容。</translation>
<translation id="8379878387931047019">此设备不支持该网站要求使用的安全密钥的类型</translation>
<translation id="8379991678458444070">只需为此标签页添加书签,便可在需要时快速返回到此处</translation>
diff --git a/chrome/app/resources/google_chrome_strings_te.xtb b/chrome/app/resources/google_chrome_strings_te.xtb
index 6945de13ae9e..0e82c63e3572 100644
--- a/chrome/app/resources/google_chrome_strings_te.xtb
+++ b/chrome/app/resources/google_chrome_strings_te.xtb
@@ -367,7 +367,7 @@
<translation id="9138603949443464873">మీ మార్పులను వర్తింపజేయడానికి, Chromeని పునఃప్రారంభించండి</translation>
<translation id="9195993889682885387">గత కొన్ని వారాల మీ బ్రౌజింగ్ హిస్టరీ ఆధారంగా Chrome మీ ఆసక్తులను అంచనా వేయగలదు. ఈ సమాచారం మీ పరికరంలో ఉంటుంది.</translation>
<translation id="919706545465235479">సింక్‌ను ప్రారంభించడానికి Chromeను అప్‌డేట్ చేయాలి</translation>
-<translation id="922152298093051471">Chromeను అనుకూలంగా మార్చు</translation>
+<translation id="922152298093051471">Chromeను అనుకూలంగా మార్చండి</translation>
<translation id="93760716455950538">ChromeOS Flexను రీస్టార్ట్ చేయండి</translation>
<translation id="940313311831216333">మీ అన్ని పరికరాలలో మీ Chrome సంబంధిత అంశాలను యాక్సెస్ చేయడానికి, సైన్ ఇన్ చేసి, ఆపై సింక్‌ను ఆన్ చేయండి.</translation>
<translation id="989369509083708165">మీ డిఫాల్ట్ బ్రౌజర్ Google Chrome</translation>
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb
index dfae3919ee18..d7ba94ea8ae0 100644
--- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb
+++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_ml.xtb
@@ -136,7 +136,7 @@
<translation id="1812527064848182527">ലാൻഡ്‌സ്‌കേപ്പ്</translation>
<translation id="1829244130665387512">പേജില്‍ കണ്ടുപിടിക്കുക</translation>
<translation id="1834891354138622109">നിര</translation>
-<translation id="1845944666972354496">സജീവമാക്കാൻ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക</translation>
+<translation id="1845944666972354496">സജീവമാക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക</translation>
<translation id="1846771122725914429">Bluetooth ബ്രെയ്‌ലി ഡിസ്‌പ്ലേ</translation>
<translation id="1852018405765032699">നാല് വിരലുകൾ ഉപയോഗിച്ച് സ്‌ക്രീനിൽ ടാപ്പ് ചെയ്യുന്നത് ChromeVox മെനുകൾ തുറക്കുകയും അടയ്ക്കുകയും ചെയ്യും. ഈ മെനുകളിൽ കമാൻഡുകളെയും കുറുക്കുവഴികളെയും കുറിച്ചുള്ള സഹായകരമായ വിവരങ്ങൾ അടങ്ങിയിരിക്കുന്നു. മെനുകൾ തുറന്ന് കഴിയുമ്പോൾ, ഒരു വിരൽ ഉപയോഗിച്ച് സ്വൈപ്പ് ചെയ്ത് ഇനങ്ങളിലൂടെ നാവിഗേറ്റ് ചെയ്യാനും ഡബിൾ ടാപ്പ് ചെയ്ത് ഇനങ്ങൾ സജീവമാക്കാനും നിങ്ങൾക്ക് കഴിയും. തുടരാൻ, നാല് വിരലുകൾ ഉപയോഗിച്ച് സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക.</translation>
<translation id="1865601187525349519">വാചകത്തിന്റെ അവസാനം</translation>
@@ -228,7 +228,7 @@
<translation id="2573256689920773241">അടിസ്ഥാന നാവിഗേഷൻ</translation>
<translation id="257674075312929031">ഗ്രൂപ്പ്</translation>
<translation id="2582407057977008361">അരികിൽ</translation>
-<translation id="2592212930811759050">എഡിറ്റിംഗ് ആരംഭിക്കാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക</translation>
+<translation id="2592212930811759050">എഡിറ്റിംഗ് ആരംഭിക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക</translation>
<translation id="2598495320872286378">വ്യാകരണ പിശക്</translation>
<translation id="2603828437139726540">ഒരു പ്രതീകം മുന്നോട്ട് നീക്കുക</translation>
<translation id="2619052155095999743">ചേർക്കുക</translation>
@@ -408,7 +408,7 @@
<translation id="360241989769010433">കടപ്പാട്</translation>
<translation id="3616016838842055984">നിങ്ങൾക്ക് ക്ലിക്ക് ചെയ്യേണ്ട ഇനത്തിൽ എത്തിയെങ്കിൽ, തിരയൽ + സ്‌പെയ്‌സ് അമർത്തുക. തുടരാൻ അത് ഇപ്പോൾ പരീക്ഷിച്ചുനോക്കൂ.</translation>
<translation id="3616113530831147358">ഓഡിയോ</translation>
-<translation id="3622350485154495700">ഒരു വിരൽ ഉപയോഗിച്ച് രണ്ടുതവണ ടാപ്പ് ചെയ്യുക</translation>
+<translation id="3622350485154495700">ഒരു വിരൽ ഉപയോഗിച്ച് ഡബിൾ ടാപ്പ് ചെയ്യുക</translation>
<translation id="3646890046000188562">{COUNT,plural, =1{ബാക്ക്‌ടിക്ക്}other{# ബാക്ക്‌ടിക്കുകൾ}}</translation>
<translation id="3650317109285159359">chkmnuitm</translation>
<translation id="3655855170848725876">{COUNT,plural, =1{ഡോളർ}other{# ഡോളർ ചിഹ്നങ്ങൾ}}</translation>
@@ -874,7 +874,7 @@
<translation id="7051308646573997571">Coral</translation>
<translation id="7062635574500127092">ടീൽ നിറം</translation>
<translation id="7086377898680121060">തെളിച്ചം കൂട്ടുക</translation>
-<translation id="7088743565397416204">ഫോക്കസ് ചെയ്‌തിരിക്കുന്ന ഇനം സജീവമാക്കാൻ ഇരട്ട ടാപ്പ് ചെയ്യുക</translation>
+<translation id="7088743565397416204">ഫോക്കസ് ചെയ്‌തിരിക്കുന്ന ഇനം സജീവമാക്കാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക</translation>
<translation id="7088960765736518739">സ്വിച്ച് ആക്‌സസ്</translation>
<translation id="7090715360595433170">ഒരു വിരൽ ഉപയോഗിച്ച് ഇടത്തോട്ടും വലത്തോട്ടും സ്വൈപ്പ് ചെയ്യുന്നതിനേക്കാൾ ഇത് കൂടുതൽ കാര്യക്ഷമമാകും.</translation>
<translation id="7091296112653361280">നവാജോ വൈറ്റ്</translation>
diff --git a/components/strings/components_strings_te.xtb b/components/strings/components_strings_te.xtb
index b6930dce3e96..fc2af3c61755 100644
--- a/components/strings/components_strings_te.xtb
+++ b/components/strings/components_strings_te.xtb
@@ -901,7 +901,7 @@
<translation id="3395827396354264108">పికప్ పద్ధతి</translation>
<translation id="3399952811970034796">బట్వాడా అడ్రస్‌</translation>
<translation id="3402261774528610252">ఈ సైట్‌ను లోడ్ చేయడానికి ఉపయోగించిన కనెక్షన్ TLS 1.0 లేదా TLS 1.1ను ఉపయోగించింది, ఇవి విస్మరించబడ్డాయి, భవిష్యత్తులో నిలిపివేయబడతాయి. ఒక సారి నిలిపివేయబడితే, యూజర్‌లు ఈ సైట్‌ను లోడ్ చేయకుండా నివారించబడతారు. సర్వర్ TLS 1.2 లేదా ఆపై వెర్షన్‌లను ఎనేబుల్ చేయాలి.</translation>
-<translation id="3405664148539009465">ఫాంట్‌లను అనుకూలంగా మార్చు</translation>
+<translation id="3405664148539009465">ఫాంట్‌లను అనుకూలంగా మార్చండి</translation>
<translation id="3409896703495473338">భద్రతా సెట్టింగ్‌లను మేనేజ్ చేయండి</translation>
<translation id="3414952576877147120">పరిమాణం:</translation>
<translation id="3417660076059365994">మీరు అప్‌లోడ్ లేదా జోడించిన ఫైల్స్ Google క్లౌడ్ లేదా థర్డ్ పార్టీలకు విశ్లేషణ కోసం పంపబడతాయి. ఉదాహరణకు, వాటిని సున్నితమైన వ్యక్తిగత సమాచారం లేదా మాల్‌వేర్ కోసం స్కాన్ చేయబడవచ్చు.</translation>
@@ -909,7 +909,7 @@
<translation id="3422472998109090673"><ph name="HOST_NAME" />ని ప్రస్తుతం చేరుకోవడం సాధ్యపడదు.</translation>
<translation id="3423742043356668186">సిస్టమ్ పేర్కొన్నవి</translation>
<translation id="3427092606871434483">అనుమతించు (డిఫాల్ట్)</translation>
-<translation id="3427342743765426898">&amp;సవరించడాన్ని పునరావృతం చేయి</translation>
+<translation id="3427342743765426898">&amp;సవరించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="342781501876943858">మీరు మీ పాస్‌వర్డ్‌ని ఇతర సైట్‌లలో తిరిగి ఉపయోగించినట్లయితే దీనిని రీసెట్ చేయాల్సిందిగా Chromium సిఫార్సు చేస్తోంది.</translation>
<translation id="3428151540071562330">DnsOverHttpsTemplates సర్వర్ టెంప్లేట్‌ URIలు చెల్లవు, ఉపయోగించబడవు.</translation>
<translation id="3431636764301398940">ఈ కార్డ్‌ను ఈ పరికరానికి సేవ్ చేయి</translation>
@@ -959,7 +959,7 @@
<translation id="3577902790357386792">జిమ్నాస్టిక్స్</translation>
<translation id="3581089476000296252">ఈ పేజీ సిద్ధమైనప్పుడు Chrome మీకు తెలియజేస్తుంది. &lt;a&gt;రద్దు చేయి&lt;/a&gt;</translation>
<translation id="3582930987043644930">పేరు జోడించండి</translation>
-<translation id="3583757800736429874">&amp;తరలించడాన్ని పునరావృతం చేయి</translation>
+<translation id="3583757800736429874">&amp;తరలించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="3584299510153766161">దిగువ భాగంలో రెండు రంధ్రాలు</translation>
<translation id="3586931643579894722">వివరాలను దాచిపెట్టు</translation>
<translation id="3587738293690942763">మధ్యలో</translation>
@@ -1167,7 +1167,7 @@
<translation id="4176535426287761656">టైమ్‌షేర్‌లు &amp; వెకేషన్ ప్రాపర్టీలు</translation>
<translation id="4179515394835346607"><ph name="ROW_NAME" /> <ph name="ROW_CONTENT" /></translation>
<translation id="4194250254487269611">మీ కార్డ్‌ను ప్రస్తుతం సేవ్ చేయలేము</translation>
-<translation id="4196861286325780578">&amp;తరలించడాన్ని పునరావృతం చేయి</translation>
+<translation id="4196861286325780578">&amp;తరలించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="4202554117186904723">ఫిఫ్త్ రోల్</translation>
<translation id="4203896806696719780"><ph name="BEGIN_LINK" />ఫైర్‌వాల్ మరియు యాంటీవైరస్ కాన్ఫిగరేషన్‌లను తనిఖీ చేయడం<ph name="END_LINK" /></translation>
<translation id="4209092469652827314">పెద్దది</translation>
@@ -1653,7 +1653,7 @@
<translation id="5463625433003343978">పరికరాలను కనుగొంటోంది...</translation>
<translation id="5469868506864199649">ఇటాలియన్</translation>
<translation id="5470230812924696184">సివిల్ ఇంజినీరింగ్</translation>
-<translation id="5470861586879999274">&amp;సవరించడాన్ని పునరావృతం చేయి</translation>
+<translation id="5470861586879999274">&amp;సవరించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="5471337644440862957">కామెడీ సినిమాలు</translation>
<translation id="5478437291406423475">B6/C4 (ఎన్వలప్)</translation>
<translation id="5481076368049295676">ఈ కంటెంట్ మీ సమాచారాన్ని దొంగిలించగల లేదా తొలగించగల హానికరమైన సాఫ్ట్‌వేర్‌ను మీ పరికరంలో ఇన్‌స్టాల్ చేయడానికి ప్రయత్నించవచ్చు. <ph name="BEGIN_LINK" />ఏదేమైనా చూపు<ph name="END_LINK" /></translation>
@@ -1771,7 +1771,7 @@
<translation id="5808542072418270309">సిమ్యులేషన్ గేమ్‌లు</translation>
<translation id="5810442152076338065"><ph name="DOMAIN" />కు గల మీ కనెక్షన్ వాడుకలో లేని సైఫర్ సూట్ ఉపయోగించి ఎన్‌క్రిప్ట్ చేయ‌బ‌డింది.</translation>
<translation id="5812947184178430888">భద్రతా ఈవెంట్‌లను Chrome ద్వారా ఫ్లాగ్ చేసినప్పుడు, ఈవెంట్‌లకు సంబంధించిన డేటా మీ అడ్మినిస్ట్రేటర్‌కు పంపబడుతుంది. ఇందులో మీరు Chromeలో వెళ్లిన పేజీల URLలు, ఫైల్ పేర్లు లేదా మెటాడేటా, ఇంకా వెబ్ ఆధారితమైన యాప్‌లు, మీ పరికరం, అలాగే Chromeకు సైన్ ఇన్ చేయడానికి మీరు ఉపయోగించే యూజర్‌నేమ్ ఉండవచ్చు.</translation>
-<translation id="5813119285467412249">&amp;జోడించడాన్ని పునరావృతం చేయి</translation>
+<translation id="5813119285467412249">&amp;జోడించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="5813309815819933152">టీవీ రియాలిటీ షోలు</translation>
<translation id="5813753398265398978">భౌతిక శాస్త్రం</translation>
<translation id="5817918615728894473">జత చేయి</translation>
@@ -1913,7 +1913,7 @@
<translation id="624499991300733384">ప్రింట్ కంపోజిటర్ సేవ</translation>
<translation id="6252613631861574218"><ph name="MANAGE_CHROME_DOWNLOADS_FOCUSED_FRIENDLY_MATCH_TEXT" />, Chromeలో మీరు డౌన్‌లోడ్ చేసిన ఫైల్‌లను మేనేజ్ చేయడానికి Tabను నొక్కి, ఆపై Enterను నొక్కండి</translation>
<translation id="6254436959401408446">ఈ పేజీని తెరవడానికి తగినంత మెమరీ లేదు</translation>
-<translation id="6259156558325130047">&amp;మళ్లీ క్రమం చేయడాన్ని పునరావృతం చేయి</translation>
+<translation id="6259156558325130047">&amp;మళ్లీ క్రమం చేయడాన్ని రిపీట్‌ చేయి</translation>
<translation id="6263376278284652872"><ph name="DOMAIN" /> బుక్‌మార్క్‌లు</translation>
<translation id="6264485186158353794">భద్రతకు తిరిగి వెళ్ళు</translation>
<translation id="6265794661083428563"><ph name="POLICY_NAME" /> పాలసీ విలువను కాపీ చేయి</translation>
@@ -2008,7 +2008,7 @@
<translation id="6518133107902771759">ధృవీకరించు</translation>
<translation id="6521745193039995384">యాక్టివ్‌గా లేదు</translation>
<translation id="6529173248185917884">సెవెంత్ రోల్</translation>
-<translation id="6529602333819889595">&amp;తొలగించడాన్ని పునరావృతం చేయి</translation>
+<translation id="6529602333819889595">&amp;తొలగించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="6535751101619004418">కరెన్సీలు &amp; విదేశీ మారకం</translation>
<translation id="6540534463546766581">మ్యూచువల్ ఫండ్‌లు</translation>
<translation id="6545864417968258051">బ్లూటూత్ స్కానింగ్</translation>
@@ -2114,7 +2114,7 @@
<translation id="6865412394715372076">ప్రస్తుతం ఈ కార్డ్‌ని ధృవీకరించడం సాధ్యపడదు</translation>
<translation id="6869334554832814367">వ్యక్తిగత రుణాలు</translation>
<translation id="6873456682041376666">టాప్ ట్రే</translation>
-<translation id="6874604403660855544">&amp;జోడించడాన్ని పునరావృతం చేయి</translation>
+<translation id="6874604403660855544">&amp;జోడించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="6881240511396774766">కొత్త Google డాక్‌ను త్వరగా క్రియేట్ చేయండి</translation>
<translation id="6883221904761970440">సురక్షిత పేమెంట్ ఆధారాల ప్రామాణీకరణ షీట్ మూయబడింది</translation>
<translation id="6884662655240309489">పరిమాణం 1</translation>
@@ -2278,7 +2278,7 @@
<translation id="7320336641823683070">కనెక్షన్ సహాయం</translation>
<translation id="7323804146520582233">"<ph name="SECTION" />" విభాగాన్ని దాచు</translation>
<translation id="733354035281974745">పరికర స్థానిక ఖాతా భర్తీ</translation>
-<translation id="7334320624316649418">&amp;మళ్లీ క్రమం చేయడాన్ని పునరావృతం చేయి</translation>
+<translation id="7334320624316649418">&amp;మళ్లీ క్రమం చేయడాన్ని రిపీట్‌ చేయి</translation>
<translation id="7335157162773372339">మీ కెమెరాను ఉపయోగించడానికి సైట్ అనుమతి అడగవచ్చు</translation>
<translation id="7337248890521463931">మరిన్ని వరుసలను చూపించు</translation>
<translation id="7337418456231055214">వర్చువల్ కార్డ్ నంబర్‌ను పూరించలేదా? కాపీ చేయడం కోసం కార్డ్ వివరాలను క్లిక్ చేయండి. <ph name="IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_LEARN_MORE_LINK_LABEL" /></translation>
@@ -2379,7 +2379,7 @@
<translation id="7542403920425041731">మీరు నిర్ధారించిన తర్వాత, మీ కార్డ్ వివరాలు ఈ సైట్‌తో షేర్ చేయబడతాయి.</translation>
<translation id="7542995811387359312">ఈ ఫారమ్ సురక్షిత కనెక్షన్‌ను ఉపయోగించనందున క్రెడిట్ కార్డ్ వివరాలను ఆటోమేటిక్‌గా పూర్తి చేయడం ఆపివేయబడింది.</translation>
<translation id="7548892272833184391">కనెక్షన్ ఎర్రర్‌లను పరిష్కరించండి</translation>
-<translation id="7549584377607005141">ఈ వెబ్‌పేజీ సరిగ్గా ప్రదర్శించబడటానికి మీరు మునుపు నమోదు చేసిన డేటా అవసరం. మీరు ఈ డేటాను మళ్లీ పంపవచ్చు. కానీ అలా చేయడం వ‌ల్ల‌ ఈ పేజీ మునుపు ప్రదర్శించిన ఏదైనా చర్య పునరావృతం కావచ్చు.</translation>
+<translation id="7549584377607005141">ఈ వెబ్‌పేజీ సరిగ్గా ప్రదర్శించబడటానికి మీరు మునుపు నమోదు చేసిన డేటా అవసరం. మీరు ఈ డేటాను మళ్లీ పంపవచ్చు. కానీ అలా చేయడం వ‌ల్ల‌ ఈ పేజీ మునుపు ప్రదర్శించిన ఏదైనా చర్య రిపీట్‌ కావచ్చు.</translation>
<translation id="7550637293666041147">మీ పరికరం వినియోగదారు పేరు మరియు Chrome వినియోగదారు పేరు</translation>
<translation id="7551484245293639699">ట్రావెల్ బీమా</translation>
<translation id="755279583747225797">ట్రయల్ యాక్టివ్‌గా ఉంది</translation>
@@ -2629,7 +2629,7 @@
<translation id="8235754723616617175">కంట్రీ మ్యూజిక్</translation>
<translation id="8237519162179154808">అభిరుచులు &amp; కాలక్షేపం</translation>
<translation id="8238581221633243064">కొత్త అజ్ఞాత ట్యాబ్‌లో పేజీని తెరవండి</translation>
-<translation id="8241707690549784388">మీరు వెతికే పేజీ మీరు ఎంటర్ చేసిన సమాచారాన్ని ఉపయోగించుకుంది. ఆ పేజీకి తిరిగి వెళ్ల‌డం ద్వారా మీరు చేసిన ఏ చర్య అయినా పునరావృతం చేయ‌వలసి వస్తుంది. మీరు కొనసాగాలని అనుకుంటున్నారా?</translation>
+<translation id="8241707690549784388">మీరు వెతికే పేజీ మీరు ఎంటర్ చేసిన సమాచారాన్ని ఉపయోగించుకుంది. ఆ పేజీకి తిరిగి వెళ్ల‌డం ద్వారా మీరు చేసిన ఏ చర్య అయినా రిపీట్‌ చేయ‌వలసి వస్తుంది. మీరు కొనసాగాలని అనుకుంటున్నారా?</translation>
<translation id="8241712895048303527">ఈ సైట్‌లో బ్లాక్ చేయి</translation>
<translation id="8242426110754782860">కొనసాగు</translation>
<translation id="8249296373107784235">రద్దుచేయి</translation>
@@ -2803,7 +2803,7 @@
<translation id="8766943070169463815">సురక్షిత పేమెంట్ ఆధారాల ప్రామాణీకరణ షీట్ తెరవబడింది</translation>
<translation id="877985182522063539">A4</translation>
<translation id="8785658048882205566">మోటారుసైకిళ్లు</translation>
-<translation id="8790007591277257123">&amp;తొలగించడాన్ని పునరావృతం చేయి</translation>
+<translation id="8790007591277257123">&amp;తొలగించడాన్ని రిపీట్‌ చేయి</translation>
<translation id="8792621596287649091">మీరు మీ <ph name="ORG_NAME" /> ఖాతాకు యాక్సెస్‌ను కోల్పోవచ్చు. లేదా గుర్తింపు స‌మాచారం చోరీకి గురి కావచ్చు. మీ పాస్‌వర్డ్‌ను ఇప్పుడే రీసెట్ చేయాల్సిందిగా Chromium సిఫార్సు చేస్తోంది.</translation>
<translation id="8792626944327216835">మైక్రోఫోన్</translation>
<translation id="8793655568873652685"><ph name="ENROLLMENT_DOMAIN" />, మీ బ్రౌజర్‌లో Chrome Enterprise కనెక్టర్‌లను ఆన్ చేసింది. ఈ కనెక్టర్‌లకు మీ డేటాలో కొంత డేటాకు యాక్సెస్ ఉంది.</translation>
@@ -2963,7 +2963,7 @@
<translation id="9213433120051936369">కనిపించే తీరును అనుకూలంగా మార్చండి</translation>
<translation id="9215416866750762878">ఒక అప్లికేషన్ కారణంగా Chrome ఈ సైట్‌కు సురక్షితంగా కనెక్ట్ కాలేకపోతోంది</translation>
<translation id="9219103736887031265">ఇమేజ్‌లు</translation>
-<translation id="922152298093051471">Chromeను అనుకూలంగా మార్చు</translation>
+<translation id="922152298093051471">Chromeను అనుకూలంగా మార్చండి</translation>
<translation id="933712198907837967">డైనర్స్ క్లబ్</translation>
<translation id="935608979562296692">ఫారమ్‌ను తీసివేయండి</translation>
<translation id="936474030629450166">సూపర్-B</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ml.xtb b/ios/chrome/app/strings/resources/ios_strings_ml.xtb
index 5a7b4111c8a4..5f2f3d8a8c47 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ml.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ml.xtb
@@ -51,7 +51,7 @@
<translation id="1321993286294231467">ചിത്രം സംരക്ഷിക്കുന്നതിൽ പിശക്.</translation>
<translation id="1322735045095424339">അദൃശ്യ മോഡ് ഉപയോഗിക്കാൻ നിങ്ങളുടെ സ്ഥാപനം ആവശ്യപ്പെടുന്നു</translation>
<translation id="1323735185997015385">ഇല്ലാതാക്കുക</translation>
-<translation id="132683371494960526">പാരന്റ് ഫോൾഡർ മാറ്റാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക.</translation>
+<translation id="132683371494960526">പാരന്റ് ഫോൾഡർ മാറ്റാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക.</translation>
<translation id="1340643665687018190">മെനു അടയ്‌ക്കുക</translation>
<translation id="1358214951266274152">നിങ്ങൾ പകർത്തിയ ലിങ്ക് സന്ദർശിക്കുക</translation>
<translation id="1360432990279830238">സൈൻ ഔട്ട് ചെയ്‌ത് സമന്വയം ഓഫാക്കണോ?</translation>
@@ -67,7 +67,7 @@
<translation id="1449835205994625556">പാസ്‍വേഡ് അദൃശ്യമാക്കുക</translation>
<translation id="145015347812617860"><ph name="COUNT" /> ഇനങ്ങൾ</translation>
<translation id="149095475893949513">കോൺഫിഗറേഷൻ പ്രൊഫൈൽ ഡൗൺലോഡ് ചെയ്യാൻ ഈ വെബ്സൈറ്റ് ശ്രമിക്കുന്നു.</translation>
-<translation id="1491277525950327607">ക്രമീകരണം മാറ്റാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക</translation>
+<translation id="1491277525950327607">ക്രമീകരണം മാറ്റാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക</translation>
<translation id="1492417797159476138">ഈ സൈറ്റിനായി നിങ്ങൾ ഇതിനകം തന്നെ ഈ ഉപയോക്തൃനാമം സംരക്ഷിച്ചു</translation>
<translation id="1506063256525392513">ഫോട്ടോകളെടുത്ത് അപ്‌ലോഡ് ചെയ്യാനും QR കോഡുകൾ സ്‌കാൻ ചെയ്യാനും ഇത് നിങ്ങളെ അനുവദിക്കുന്നു</translation>
<translation id="1509486075633541495">വെബ്‌സൈറ്റിലേക്ക് സൈൻ ഇൻ ചെയ്യുക</translation>
@@ -101,7 +101,7 @@
<translation id="1690731385917361335">ഇനങ്ങളൊന്നുമില്ല</translation>
<translation id="1692118695553449118">സമന്വയം ഓണാണ്</translation>
<translation id="1700629756560807968"><ph name="NUMBER_OF_SELECTED_BOOKMARKS" /> തിരഞ്ഞെടുത്തു</translation>
-<translation id="1740468249224277719">ഇൻസ്‌റ്റാൾ ചെയ്യാൻ രണ്ടുതവണ ടാപ്പ് ചെയ്യുക.</translation>
+<translation id="1740468249224277719">ഇൻസ്‌റ്റാൾ ചെയ്യാൻ ഡബിൾ ടാപ്പ് ചെയ്യുക.</translation>
<translation id="1752547299766512813">സംരക്ഷിച്ച പാസ്‌വേഡുകള്‍</translation>
<translation id="1753905327828125965">കൂടുതൽ‍ സന്ദര്‍ശിച്ചത്</translation>
<translation id="1803264062614276815">കാർഡ് ഉടമയുടെ പേര്</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
index 4c6b66623eb7..aace2b76470a 100644
--- a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
@@ -865,7 +865,7 @@
<translation id="8319076807703933069">新搜索</translation>
<translation id="8323906514956095947">轻触并按住可查看更多的标签页选项</translation>
<translation id="8328777765163860529">全部关闭</translation>
-<translation id="8378714024927312812">由贵单位管理</translation>
+<translation id="8378714024927312812">由贵组织管理</translation>
<translation id="8386068868580335421">重置</translation>
<translation id="8407669440184693619">未找到任何用于此网站的密码</translation>
<translation id="842017693807136194">所用登录身份</translation>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_te.xtb b/ui/chromeos/translations/ui_chromeos_strings_te.xtb
index 7093b4618657..808afe88fc4e 100644
--- a/ui/chromeos/translations/ui_chromeos_strings_te.xtb
+++ b/ui/chromeos/translations/ui_chromeos_strings_te.xtb
@@ -834,7 +834,7 @@
<translation id="8045462269890919536">రొమేనియన్</translation>
<translation id="8049184478152619004">వ్యక్తిగత అన్‌బ్లాకింగ్ కీ(PUK)ని ఎంటర్ చేయండి</translation>
<translation id="807187749540895545"><ph name="FILE_NAME" />ను సంగ్రహిస్తోంది…</translation>
-<translation id="8079530767338315840">పునరావృతం చేయి</translation>
+<translation id="8079530767338315840">రిపీట్‌ చేయి</translation>
<translation id="8087576439476816834">డౌన్‌లోడ్ చేయి, <ph name="PROFILE_NAME" /></translation>
<translation id="8106045200081704138">నాతో షేర్ చేసినవి</translation>
<translation id="8116072619078571545">చల్లటి నీరు</translation>
--
2.37.0

View File

@ -0,0 +1,28 @@
From 975dd790f0a8f62d54d2a4c1a58833c81f0e1742 Mon Sep 17 00:00:00 2001
From: "Chrome Release Bot (LUCI)"
<chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Date: Sun, 3 Jul 2022 01:00:32 +0000
Subject: [PATCH 58/59] Incrementing VERSION to 102.0.5005.148
Change-Id: I30a4cd488d75fef0c005dce94d0e429e3805d297
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3739746
Bot-Commit: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#1217}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
chrome/VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/VERSION b/chrome/VERSION
index 1e243e1ad602..408a45a0b648 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=102
MINOR=0
BUILD=5005
-PATCH=147
+PATCH=148
--
2.37.0

View File

@ -0,0 +1,34 @@
--- base/debug/stack_trace.cc.orig 2018-12-08 14:11:25.303475116 +0100
+++ base/debug/stack_trace.cc 2018-12-08 18:00:43.874946999 +0100
@@ -229,7 +229,7 @@
}
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
std::stringstream stream;
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
OutputToStreamWithPrefix(&stream, prefix_string);
#endif
return stream.str();
--- net/socket/udp_socket_posix.cc.orig 2019-07-03 13:13:46.034342649 -0400
+++ net/socket/udp_socket_posix.cc 2019-07-03 13:23:53.117081909 -0400
@@ -1194,7 +1194,7 @@
msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
msgvec->reserve(buffers.size());
for (size_t j = 0; j < buffers.size(); j++)
- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
+ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
SendResult send_result(0, 0, std::move(buffers));
if (result < 0) {
--- base/debug/stack_trace.cc 2021-05-25 00:05:31.000000000 +0200
+++ - 2021-05-27 13:46:43.740380140 +0200
@@ -217,7 +217,9 @@
}
void StackTrace::OutputToStream(std::ostream* os) const {
+#if defined(__GLIBC__)
OutputToStreamWithPrefix(os, nullptr);
+#endif
}
std::string StackTrace::ToString() const {

View File

@ -0,0 +1,55 @@
diff --git a/buildtools/third_party/libc++/trunk/include/locale b/buildtools/third_party/libc++/trunk/include/locale
index d29a2dc..53998bc 100644
--- buildtools/third_party/libc++/trunk/include/locale
+++ buildtools/third_party/libc++/trunk/include/locale
@@ -11,6 +11,15 @@
#ifndef _LIBCPP_LOCALE
#define _LIBCPP_LOCALE
+// musl doesn't define _l (with locale) variants of functions, as it only supports UTF-8.
+// we can simply make macros that will call the non-localated ones if we're using musl, or rather not-using something that has the _l ones.
+// couldn't find anything glibc #defines when it creates strtoull_l (that it doesn't undefine a few lines later), so let's test against glibc and glibc-likes.
+// almost all glibc-likes define __GNU_LIBRARY__ for compatibility
+#ifndef __GNU_LIBRARY__
+#define strtoull_l(A, B, C, LOC) strtoull(A,B,C)
+#define strtoll_l(A, B, C, LOC) strtoll(A,B,C)
+#endif
+
/*
locale synopsis
diff --git a/buildtools/third_party/libc++/trunk/src/locale.cpp b/buildtools/third_party/libc++/trunk/src/locale.cpp
index 4163c2c..3d1902a 100644
--- a/buildtools/third_party/libc++/trunk/src/locale.cpp
+++ buildtools/third_party/libc++/trunk/src/locale.cpp
@@ -1028,11 +1028,11 @@ ctype<char>::do_narrow(const char_type* low, const char_type* high, char dfault,
return low;
}
-#if defined(__EMSCRIPTEN__)
+//#if defined(__EMSCRIPTEN__)
extern "C" const unsigned short ** __ctype_b_loc();
extern "C" const int ** __ctype_tolower_loc();
extern "C" const int ** __ctype_toupper_loc();
-#endif
+//#endif
#ifdef _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
const ctype<char>::mask*
@@ -1136,12 +1136,10 @@ ctype<char>::classic_table() _NOEXCEPT
#elif defined(_AIX)
return (const unsigned int *)__lc_ctype_ptr->obj->mask;
#else
- // Platform not supported: abort so the person doing the port knows what to
- // fix
-# warning ctype<char>::classic_table() is not implemented
- printf("ctype<char>::classic_table() is not implemented\n");
- abort();
- return NULL;
+// not sure any other libc like this exists, but there is no way to differentiate musl as of right now
+// to be fair, with the change above, this should always work
+// also, #warning is a gcc extension
+ return (const unsigned long *)*__ctype_b_loc();
#endif
}
#endif

View File

@ -0,0 +1,92 @@
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig 2019-07-03 11:53:21.213479736 -0400
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2019-07-03 11:57:01.304998253 -0400
@@ -140,31 +140,14 @@
ResultExpr RestrictCloneToThreadsAndEPERMFork() {
const Arg<unsigned long> flags(0);
- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
- CLONE_SIGHAND | CLONE_THREAD |
- CLONE_SYSVSEM;
- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
+ CLONE_THREAD | CLONE_SYSVSEM;
+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
+ CLONE_DETACHED;
+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
- const uint64_t kGlibcPthreadFlags =
- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
-
- const BoolExpr android_test =
- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
- flags == kGlibcPthreadFlags);
-
- // The following two flags are the two important flags in any vfork-emulating
- // clone call. EPERM any clone call that contains both of them.
- const uint64_t kImportantCloneVforkFlags = CLONE_VFORK | CLONE_VM;
-
- const BoolExpr is_fork_or_clone_vfork =
- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
-
- return If(IsAndroid() ? android_test : glibc_test, Allow())
- .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+ return If(thread_clone_ok, Allow())
+ .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
.Else(CrashSIGSYSClone());
}
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.orig
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -494,6 +494,7 @@
case __NR_mlock:
case __NR_munlock:
case __NR_munmap:
+ case __NR_mremap:
return true;
case __NR_madvise:
case __NR_mincore:
@@ -509,7 +510,6 @@
case __NR_modify_ldt:
#endif
case __NR_mprotect:
- case __NR_mremap:
case __NR_msync:
case __NR_munlockall:
case __NR_readahead:
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
index 80f02c0..21fbe21 100644
--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -373,6 +373,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
#if defined(__i386__)
case __NR_waitpid:
#endif
+ case __NR_set_tid_address:
return true;
case __NR_clone: // Should be parameter-restricted.
case __NR_setns: // Privileged.
@@ -385,7 +386,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
case __NR_set_thread_area:
#endif
- case __NR_set_tid_address:
case __NR_unshare:
#if !defined(__mips__) && !defined(__aarch64__)
case __NR_vfork:
--- sandbox/policy/linux/bpf_renderer_policy_linux.cc
+++ sandbox/policy/linux/bpf_renderer_policy_linux.cc
@@ -100,9 +100,9 @@
case __NR_uname:
case __NR_sched_getparam:
case __NR_sched_getscheduler:
+ case __NR_sched_setscheduler:
return Allow();
case __NR_sched_getaffinity:
- case __NR_sched_setscheduler:
return RestrictSchedTarget(GetPolicyPid(), sysno);
case __NR_prlimit64:
// See crbug.com/662450 and setrlimit comment above.

View File

@ -0,0 +1,81 @@
--- ./sandbox/linux/services/namespace_sandbox.cc.orig
+++ ./sandbox/linux/services/namespace_sandbox.cc
@@ -209,6 +209,70 @@
return base::LaunchProcess(argv, launch_options_copy);
}
+#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__)
+#define TLS_ABOVE_TP
+#endif
+
+struct musl_pthread
+{
+ /* Part 1 -- these fields may be external or
+ * internal (accessed via asm) ABI. Do not change. */
+ struct pthread *self;
+#ifndef TLS_ABOVE_TP
+ uintptr_t *dtv;
+#endif
+ struct pthread *prev, *next; /* non-ABI */
+ uintptr_t sysinfo;
+#ifndef TLS_ABOVE_TP
+#ifdef CANARY_PAD
+ uintptr_t canary_pad;
+#endif
+ uintptr_t canary;
+#endif
+
+/* Part 2 -- implementation details, non-ABI. */
+ int tid;
+ int errno_val;
+ volatile int detach_state;
+ volatile int cancel;
+ volatile unsigned char canceldisable, cancelasync;
+ unsigned char tsd_used:1;
+ unsigned char dlerror_flag:1;
+ unsigned char *map_base;
+ size_t map_size;
+ void *stack;
+ size_t stack_size;
+ size_t guard_size;
+ void *result;
+ struct __ptcb *cancelbuf;
+ void **tsd;
+ struct {
+ volatile void *volatile head;
+ long off;
+ volatile void *volatile pending;
+ } robust_list;
+ int h_errno_val;
+ volatile int timer_id;
+ locale_t locale;
+ volatile int killlock[1];
+ char *dlerror_buf;
+ void *stdio_locks;
+
+ /* Part 3 -- the positions of these fields relative to
+ * the end of the structure is external and internal ABI. */
+#ifdef TLS_ABOVE_TP
+ uintptr_t canary;
+ uintptr_t *dtv;
+#endif
+};
+
+void MaybeUpdateMuslTidCache()
+{
+ pid_t real_tid = sys_gettid();
+ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
+ *cached_tid_location = real_tid;
+}
+
// static
pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
const pid_t pid =
@@ -226,6 +290,7 @@
#if defined(LIBC_GLIBC)
MaybeUpdateGlibcTidCache();
#endif
+ MaybeUpdateMuslTidCache();
return 0;
}

View File

@ -0,0 +1,95 @@
--- base/trace_event/malloc_dump_provider.cc.orig
+++ base/trace_event/malloc_dump_provider.cc
@@ -174,7 +174,8 @@
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA))
+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \
+ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)))
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
--- base/trace_event/malloc_dump_provider.cc
+++ base/trace_event/malloc_dump_provider.cc
@@ -339,7 +339,7 @@
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
-#else
+#elif defined(__GLIBC__)
ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
&allocated_objects_size, &allocated_objects_count);
#endif
--- base/process/process_metrics_posix.cc.orig
+++ base/process/process_metrics_posix.cc
@@ -105,7 +105,7 @@
#endif // !BUILDFLAG(IS_FUCHSIA)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
namespace {
size_t GetMallocUsageMallinfo() {
@@ -123,7 +123,7 @@
}
} // namespace
-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+#endif // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID)
size_t ProcessMetrics::GetMallocUsage() {
@@ -131,9 +131,9 @@
malloc_statistics_t stats = {0};
malloc_zone_statistics(nullptr, &stats);
return stats.size_in_use;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();
-#elif BUILDFLAG(IS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
return 0;
#endif
--- third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig
+++ third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
@@ -35,7 +35,7 @@
MemoryUsage GetMemoryUsage() {
MemoryUsage result;
-#ifdef __linux__
+#if defined(__linux__) && defined(__GLIBC__)
rusage res;
if (getrusage(RUSAGE_SELF, &res) == 0) {
result.max_rss_kb = res.ru_maxrss;
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
@@ -86,11 +86,11 @@
}
size_t Process::GetMallocUsage() {
-#if defined(HAVE_MALLINFO2)
+#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
struct mallinfo2 mi;
mi = ::mallinfo2();
return mi.uordblks;
-#elif defined(HAVE_MALLINFO)
+#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
struct mallinfo mi;
mi = ::mallinfo();
return mi.uordblks;
--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
+++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
@@ -122,7 +122,9 @@
/* #undef HAVE_MALLCTL */
/* Define to 1 if you have the `mallinfo' function. */
+#if defined(__GLIBC__)
#define HAVE_MALLINFO 1
+#endif
/* Define to 1 if you have the <malloc.h> header file. */
#define HAVE_MALLOC_H 1

View File

@ -0,0 +1,11 @@
--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h 2022-06-14 11:16:54.000000000 +0200
+++ - 2022-07-09 09:24:13.956440529 +0200
@@ -69,7 +69,7 @@
// QuicConnections currently use around 1KB of polymorphic types which would
// ordinarily be on the heap. Instead, store them inline in an arena.
-using QuicConnectionArena = QuicOneBlockArena<1152>;
+using QuicConnectionArena = QuicOneBlockArena<1504>;
} // namespace quic

View File

@ -0,0 +1,188 @@
diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
index a6aec544e..2a4a7f1bc 100644
--- sandbox/linux/bpf_dsl/seccomp_macros.h
+++ sandbox/linux/bpf_dsl/seccomp_macros.h
@@ -16,7 +16,7 @@
#if defined(__mips__)
// sys/user.h in eglibc misses size_t definition
#include <stddef.h>
-#elif defined(__powerpc64__)
+#elif defined(__powerpc64__) && defined(__GLIBC__)
// Manually define greg_t on ppc64
typedef unsigned long long greg_t;
#endif
@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
#define SECCOMP_ARCH AUDIT_ARCH_PPC64
#endif
-#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
+#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
-#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
+#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
index d53a7ff56..c290f0e92 100644
--- sandbox/linux/seccomp-bpf/syscall.cc
+++ sandbox/linux/seccomp-bpf/syscall.cc
@@ -499,9 +499,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
// Same as MIPS, need to invert ret and set error register (cr0.SO)
if (ret_val <= -1 && ret_val >= -4095) {
ret_val = -ret_val;
- ctx->uc_mcontext.regs->ccr |= (1 << 28);
+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
} else {
- ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
}
#endif
SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
--- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h.orig
+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
@@ -46,7 +46,7 @@
// The following platforms have an implementation of a hardware counter.
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || defined(__riscv) || \
defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
#else
--- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
@@ -64,7 +64,7 @@
#elif defined(__i386__) || defined(__x86_64__)
#define ABSL_STACKTRACE_INL_HEADER \
"absl/debugging/internal/stacktrace_x86-inl.inc"
-#elif defined(__ppc__) || defined(__PPC__)
+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
#define ABSL_STACKTRACE_INL_HEADER \
"absl/debugging/internal/stacktrace_powerpc-inl.inc"
#elif defined(__aarch64__)
diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
index f9a60e37..25f3a0b7 100644
--- third_party/breakpad/BUILD.gn
+++ third_party/breakpad/BUILD.gn
@@ -637,6 +637,7 @@ if (is_linux || is_android) {
if (current_cpu == "ppc64") {
defines = [ "HAVE_GETCONTEXT" ]
+ libs += [ "ucontext" ]
} else {
sources += [
"breakpad/src/common/linux/breakpad_getcontext.S"
diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
index 03afec7a..0264ecf1 100644
--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
#elif defined(__powerpc64__)
+#include <asm/elf.h>
+#include <asm/ptrace.h>
+
uintptr_t ThreadInfo::GetInstructionPointer() const {
return mcontext.gp_regs[PT_NIP];
}
@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
out->ctr = mcontext.gp_regs[PT_CTR];
for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
- out->float_save.fpregs[i] = mcontext.fp_regs[i];
+ out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
- out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
+ out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
out->vector_save.save_vr[i] = \
diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
index 1090470f..e580233d 100644
--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
#elif defined(__powerpc64__)
+#include <asm/elf.h>
+#include <asm/ptrace.h>
+
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
}
@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
- out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
+ out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
- out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
+ out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
out->vector_save.save_vr[i] =
diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
index 5a7ab50c..ee8b858c 100644
--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
@@ -105,6 +105,11 @@
#define PR_SET_PTRACER 0x59616d61
#endif
+/* musl hack, can't include asm/ptrace.h as that causes conflicts */
+#if defined(__powerpc64__) && !defined(PT_NIP)
+#define PT_NIP 32
+#endif
+
namespace google_breakpad {
namespace {
diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
index 8e335a09..b2a0f155 100644
--- third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h
@@ -469,7 +469,7 @@ struct MContext64 {
SignalThreadContext64 gp_regs;
SignalFloatContext64 fp_regs;
SignalVectorContext64 *v_regs;
- int64_t vmx_reserve[69];
+ int64_t vmx_reserve[101];
};
struct ContextTraits64 : public Traits64 {
diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
index dea0d1f3..b203e5b2 100644
--- third_party/crashpad/crashpad/util/linux/thread_info.h
+++ third_party/crashpad/crashpad/util/linux/thread_info.h
@@ -30,6 +30,7 @@
#if defined(ARCH_CPU_PPC64_FAMILY)
#include <sys/ucontext.h>
+#include <asm/ptrace.h>
#endif
namespace crashpad {
diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
index 9955ce44..4c1cc488 100644
--- third_party/lss/linux_syscall_support.h
+++ third_party/lss/linux_syscall_support.h
@@ -4216,9 +4216,13 @@ struct kernel_statfs {
}
#endif
#if defined(__NR_fstatat64)
+ // musl does #define fstatat64 fstatat
+ #undef fstatat64
LSS_INLINE _syscall4(int, fstatat64, int, d,
const char *, p,
struct kernel_stat64 *, b, int, f)
+ // set it back like it was
+ #define fstatat64 fstatat
#endif
#if defined(__NR_waitpid)
// waitpid is polyfilled below when not available.

View File

@ -0,0 +1,25 @@
From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Wed, 27 Apr 2022 16:01:01 +0000
Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
---
third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
index 9e2d3ad..68f4823 100644
--- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
@@ -4,6 +4,8 @@
#include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
+#include <cstring>
+
#include "base/guid.h"
#include "base/strings/string_util.h"
--
2.35.1

View File

@ -0,0 +1,14 @@
--- a/components/autofill/core/browser/BUILD.gn
+++ b/components/autofill/core/browser/BUILD.gn
@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
}
static_library("browser") {
+ if (is_clang) {
+ cflags = [
+ "-fbracket-depth=1000",
+ ]
+ }
sources = [
"address_normalization_manager.cc",
"address_normalization_manager.h",

View File

@ -0,0 +1,36 @@
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index ac4713b07268..492a9a37d096 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
scoped_refptr<DecoderBuffer> buffer;
if (type() == DemuxerStream::TEXT) {
- size_t id_size = 0;
+ int id_size = 0;
uint8_t* id_data = av_packet_get_side_data(
packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
- size_t settings_size = 0;
+ int settings_size = 0;
uint8_t* settings_data = av_packet_get_side_data(
packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
side_data.data(), side_data.size());
} else {
- size_t side_data_size = 0;
+ int side_data_size = 0;
uint8_t* side_data = av_packet_get_side_data(
packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
packet->size - data_offset);
}
- size_t skip_samples_size = 0;
+ int skip_samples_size = 0;
const uint32_t* skip_samples_ptr =
reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));

View File

@ -0,0 +1,10 @@
--- a/chrome/browser/search/background/ntp_backgrounds.h 2020-08-10 20:39:20.000000000 +0200
+++ b/chrome/browser/search/background/ntp_backgrounds.h 2020-09-04 13:48:22.640023256 +0200
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
#include <array>
+#include <cstddef>
class GURL;

View File

@ -0,0 +1,18 @@
--- a/base/files/scoped_file_linux.cc.orig
+++ b/base/files/scoped_file_linux.cc
@@ -77,15 +77,3 @@
}
} // namespace base
-
-extern "C" {
-
-int __close(int);
-
-__attribute__((visibility("default"), noinline)) int close(int fd) {
- if (base::IsFDOwned(fd) && g_is_ownership_enforced)
- CrashOnFdOwnershipViolation();
- return __close(fd);
-}
-
-} // extern "C"

View File

@ -0,0 +1,21 @@
This macro is defined in glibc, but not musl.
--- a/sandbox/linux/suid/process_util.h.orig
+++ b/sandbox/linux/suid/process_util.h
@@ -11,6 +11,16 @@
#include <stdint.h>
#include <sys/types.h>
+// Some additional functions
+#if !defined(TEMP_FAILURE_RETRY)
+# define TEMP_FAILURE_RETRY(expression) \
+ (__extension__ \
+ ({ long int __result; \
+ do __result = (long int) (expression); \
+ while (__result == -1L && errno == EINTR); \
+ __result; }))
+#endif
+
// This adjusts /proc/process/oom_score_adj so the Linux OOM killer
// will prefer certain process types over others. The range for the
// adjustment is [-1000, 1000], with [0, 1000] being user accessible.

View File

@ -0,0 +1,10 @@
--- a/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
+++ b/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
@@ -3,6 +3,7 @@
#include <stddef.h>
+#include <cstdint>
#include <functional>
#include "quiche/common/platform/api/quiche_export.h"

View File

@ -0,0 +1,10 @@
--- a/sandbox/linux/services/credentials.h
+++ b/sandbox/linux/services/credentials.h
@@ -13,6 +13,7 @@
#include <string>
#include <vector>
+#include <unistd.h>
#include "sandbox/linux/system_headers/capability.h"
#include "sandbox/sandbox_export.h"

View File

@ -0,0 +1,53 @@
--- a/base/files/file_util_linux.cc
+++ b/base/files/file_util_linux.cc
@@ -23,14 +23,14 @@
// Not all possible |statfs_buf.f_type| values are in linux/magic.h.
// Missing values are copied from the statfs man page.
- switch (statfs_buf.f_type) {
+ switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
case 0:
*type = FILE_SYSTEM_0;
break;
case EXT2_SUPER_MAGIC: // Also ext3 and ext4
case MSDOS_SUPER_MAGIC:
case REISERFS_SUPER_MAGIC:
- case static_cast<int>(BTRFS_SUPER_MAGIC):
+ case BTRFS_SUPER_MAGIC:
case 0x5346544E: // NTFS
case 0x58465342: // XFS
case 0x3153464A: // JFS
@@ -40,14 +40,14 @@
*type = FILE_SYSTEM_NFS;
break;
case SMB_SUPER_MAGIC:
- case static_cast<int>(0xFF534D42): // CIFS
+ case 0xFF534D42: // CIFS
*type = FILE_SYSTEM_SMB;
break;
case CODA_SUPER_MAGIC:
*type = FILE_SYSTEM_CODA;
break;
- case static_cast<int>(HUGETLBFS_MAGIC):
- case static_cast<int>(RAMFS_MAGIC):
+ case HUGETLBFS_MAGIC:
+ case RAMFS_MAGIC:
case TMPFS_MAGIC:
*type = FILE_SYSTEM_MEMORY;
break;
--- a/base/system/sys_info_posix.cc
+++ b/base/system/sys_info_posix.cc
@@ -100,10 +100,10 @@
if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
return false;
- switch (stats.f_type) {
+ switch (static_cast<uintmax_t>(stats.f_type)) {
case TMPFS_MAGIC:
- case static_cast<int>(HUGETLBFS_MAGIC):
- case static_cast<int>(RAMFS_MAGIC):
+ case HUGETLBFS_MAGIC:
+ case RAMFS_MAGIC:
return true;
}
return false;

View File

@ -0,0 +1,12 @@
--- a/third_party/nasm/config/config-linux.h
+++ b/third_party/nasm/config/config-linux.h
@@ -139,7 +139,9 @@
#define HAVE_ACCESS 1
/* Define to 1 if you have the `canonicalize_file_name' function. */
+#ifdef __GLIBC__
#define HAVE_CANONICALIZE_FILE_NAME 1
+#endif
/* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
/* #undef HAVE_CPU_TO_LE16 */

View File

@ -0,0 +1,22 @@
--- a/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+++ b/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
@@ -30,7 +30,8 @@
#include <algorithm>
#endif
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__))
#include <sys/prctl.h>
#endif
@@ -58,7 +59,8 @@
inline bool GetThreadName(std::string& out_result) {
char buf[16] = {};
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__))
if (prctl(PR_GET_NAME, buf) != 0)
return false;
#else

View File

@ -0,0 +1,66 @@
--- a/net/dns/public/scoped_res_state.cc.orig
+++ b/net/dns/public/scoped_res_state.cc
@@ -13,7 +13,7 @@
namespace net {
ScopedResState::ScopedResState() {
-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
// res_init behaves the same way.
memset(&_res, 0, sizeof(_res));
--- a/net/dns/public/scoped_res_state.cc
+++ b/net/dns/public/scoped_res_state.cc
@@ -25,7 +25,7 @@
}
ScopedResState::~ScopedResState() {
-#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// Prefer res_ndestroy where available.
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
@@ -34,7 +34,7 @@
res_nclose(&res_);
#endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
-#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
+#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
}
bool ScopedResState::IsValid() const {
--- a/net/dns/host_resolver_manager.cc.orig
+++ b/net/dns/host_resolver_manager.cc
@@ -3015,7 +3015,7 @@
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
- !BUILDFLAG(IS_ANDROID)
+ !BUILDFLAG(IS_ANDROID) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
EnsureDnsReloaderInit();
#endif
--- a/net/dns/dns_reloader.cc.orig
+++ b/net/dns/dns_reloader.cc
@@ -7,7 +7,8 @@
#include "build/build_config.h"
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
+ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && \
+ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
#include <resolv.h>
--- a/net/dns/host_resolver_proc.cc.orig
+++ b/net/dns/host_resolver_proc.cc
@@ -177,7 +177,8 @@
base::BlockingType::WILL_BLOCK);
#if BUILDFLAG(IS_POSIX) && \
- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID) || \
+ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)))
DnsReloaderMaybeReload();
#endif
absl::optional<AddressInfo> ai;

View File

@ -0,0 +1,20 @@
--- a/third_party/blink/renderer/platform/wtf/stack_util.cc.orig
+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
@@ -29,7 +29,7 @@
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
// correctly for the main thread.
-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
BUILDFLAG(IS_FUCHSIA)
// pthread_getattr_np() can fail if the thread is not invoked by
// pthread_create() (e.g., the main thread of blink_unittests).
@@ -97,7 +97,7 @@
}
void* GetStackStart() {
-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
BUILDFLAG(IS_FUCHSIA)
pthread_attr_t attr;
int error;

View File

@ -0,0 +1,26 @@
--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
@@ -17,7 +17,11 @@
#define ENABLE_CRASH_OVERRIDES 0
/* Define to 1 if you have the `backtrace' function. */
+#ifdef __GLIBC__
#define HAVE_BACKTRACE 1
+#else
+#define HAVE_BACKTRACE 0
+#endif
/* Define to 1 if you have the <CrashReporterClient.h> header file. */
/* #undef HAVE_CRASHREPORTERCLIENT_H */
@@ -58,7 +62,11 @@
#define HAVE_ERRNO_H 1
/* Define to 1 if you have the <execinfo.h> header file. */
+#ifdef __GLIBC__
#define HAVE_EXECINFO_H 1
+#else
+#define HAVE_EXECINFO_H 0
+#endif
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1

View File

@ -0,0 +1,10 @@
--- a/build/linux/unbundle/libxml.gn 2022-06-14 11:14:53.000000000 +0200
+++ - 2022-07-08 22:53:21.278254993 +0200
@@ -20,6 +20,7 @@
":xml_writer",
"//base/test:test_support",
"//services/data_decoder:xml_parser_fuzzer_deps",
+ "//services/data_decoder:lib",
]
sources = [
"chromium/libxml_utils.cc",

View File

@ -0,0 +1,34 @@
--- a/base/process/memory_linux.cc
+++ b/base/process/memory_linux.cc
@@ -18,6 +18,13 @@
#include "base/threading/thread_restrictions.h"
#include "build/build_config.h"
+#if defined(LIBC_GLIBC)
+extern "C" {
+extern void *__libc_malloc(size_t size);
+extern void *__libc_free(void *ptr);
+}
+#endif
+
namespace base {
namespace {
@@ -111,7 +118,7 @@
#elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC)
*result = malloc(size);
#elif defined(LIBC_GLIBC)
- *result = __libc_malloc(size);
+ *result = ::__libc_malloc(size);
#endif
return *result != nullptr;
}
@@ -122,7 +129,7 @@
#elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC)
free(ptr);
#elif defined(LIBC_GLIBC)
- __libc_free(ptr);
+ ::__libc_free(ptr);
#endif
}

View File

@ -0,0 +1,12 @@
--- a/base/files/file.h.orig
+++ b/base/files/file.h
@@ -19,7 +19,8 @@
#include "build/build_config.h"
#if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \
- BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21)
+ BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \
+ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
struct stat;
namespace base {
typedef struct stat stat_wrapper_t;

View File

@ -0,0 +1,24 @@
Use monotonic clock for pthread_cond_timedwait with musl too.
diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
index 5ea7083..c13027e 100644
--- a/v8/src/base/platform/condition-variable.cc
+++ a/v8/src/base/platform/condition-variable.cc
@@ -16,7 +16,7 @@ namespace base {
ConditionVariable::ConditionVariable() {
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
- (V8_OS_LINUX && V8_LIBC_GLIBC))
+ V8_OS_LINUX)
// On Free/Net/OpenBSD and Linux with glibc we can change the time
// source for pthread_cond_timedwait() to use the monotonic clock.
pthread_condattr_t attr;
@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
&native_handle_, &mutex->native_handle(), &ts);
#else
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
- (V8_OS_LINUX && V8_LIBC_GLIBC))
+ V8_OS_LINUX)
// On Free/Net/OpenBSD and Linux with glibc we can change the time
// source for pthread_cond_timedwait() to use the monotonic clock.
result = clock_gettime(CLOCK_MONOTONIC, &ts);

View File

@ -0,0 +1,75 @@
--- a/base/debug/stack_trace_posix.cc
+++ b/base/debug/stack_trace_posix.cc
@@ -27,7 +27,7 @@
#if !defined(USE_SYMBOLIZE)
#include <cxxabi.h>
#endif
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
#include <execinfo.h>
#endif
@@ -89,7 +89,7 @@
// Note: code in this function is NOT async-signal safe (std::string uses
// malloc internally).
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
std::string::size_type search_from = 0;
while (search_from < text->size()) {
// Look for the start of a mangled symbol, from search_from.
@@ -136,7 +136,7 @@
virtual ~BacktraceOutputHandler() = default;
};
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
// This should be more than enough to store a 64-bit number in hex:
// 16 hex digits + 1 for null-terminator.
@@ -839,7 +839,7 @@
// If we do not have unwind tables, then try tracing using frame pointers.
return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
count, 0);
-#elif !defined(__UCLIBC__) && !defined(_AIX)
+#elif defined(__GLIBC__) && !defined(_AIX)
// Though the backtrace API man page does not list any possible negative
// return values, we take no chance.
return base::saturated_cast<size_t>(backtrace(trace, count));
@@ -852,13 +852,13 @@
// NOTE: This code MUST be async-signal safe (it's used by in-process
// stack dumping signal handler). NO malloc or stdio is allowed here.
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
PrintBacktraceOutputHandler handler;
ProcessBacktrace(trace_, count_, prefix_string, &handler);
#endif
}
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
const char* prefix_string) const {
StreamBacktraceOutputHandler handler(os);
--- a/v8/src/codegen/external-reference-table.cc.orig
+++ b/v8/src/codegen/external-reference-table.cc
@@ -11,7 +11,9 @@
#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
#define SYMBOLIZE_FUNCTION
+#if defined(__GLIBC__)
#include <execinfo.h>
+#endif
#include <vector>
@@ -96,7 +98,7 @@
}
const char* ExternalReferenceTable::ResolveSymbol(void* address) {
-#ifdef SYMBOLIZE_FUNCTION
+#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
char** names = backtrace_symbols(&address, 1);
const char* name = names[0];
// The array of names is malloc'ed. However, each name string is static

View File

@ -0,0 +1,27 @@
--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig 2015-12-06 09:59:55.554536646 +0100
+++ a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100
@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel
siginfo.si_code = SI_USER;
siginfo.si_pid = getpid();
ucontext_t context;
+#if defined(__GLIBC__)
getcontext(&context);
+#endif
return HandleSignal(sig, &siginfo, &context);
}
@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() {
sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
CrashContext context;
+
+#if defined(__GLIBC__)
int getcontext_result = getcontext(&context.context);
if (getcontext_result)
return false;
+#else
+ return false;
+#endif
#if defined(__i386__)
// In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved

View File

@ -0,0 +1,17 @@
--- a/build/config/compiler/BUILD.gn 2022-07-08 23:17:39.889019407 +0200
+++ - 2022-07-08 23:23:22.740712991 +0200
@@ -1531,14 +1531,6 @@
cflags += [ "-Wno-deprecated-non-prototype" ]
}
- if (!is_nacl && !(is_chromeos ||
- default_toolchain == "//build/toolchain/cros:target")) {
- # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
- cflags += [
- "-Xclang",
- "-no-opaque-pointers",
- ]
- }
if (is_fuchsia) {
# TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383)

View File

@ -0,0 +1,39 @@
--- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
@@ -17,8 +17,6 @@
#include_next <sys/ptrace.h>
-#include <sys/cdefs.h>
-
// https://sourceware.org/bugzilla/show_bug.cgi?id=22433
#if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
defined(__GLIBC__)
--- a/third_party/libsync/src/include/sync/sync.h
+++ b/third_party/libsync/src/include/sync/sync.h
@@ -19,12 +19,13 @@
#ifndef __SYS_CORE_SYNC_H
#define __SYS_CORE_SYNC_H
-#include <sys/cdefs.h>
#include <stdint.h>
#include <linux/types.h>
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
struct sync_legacy_merge_data {
int32_t fd2;
@@ -158,6 +159,8 @@
struct sync_pt_info *itr);
void sync_fence_info_free(struct sync_fence_info_data *info);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
#endif /* __SYS_CORE_SYNC_H */

View File

@ -0,0 +1,15 @@
This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200
+++ - 2021-05-25 20:31:10.102971765 +0200
@@ -13,8 +13,9 @@
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
+_JAVA_BIN = "java"
+_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
class Compiler(object):
"""Runs the Closure compiler on given source files to typecheck them

View File

@ -0,0 +1,333 @@
From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001
From: Dale Curtis <dalecurtis@chromium.org>
Date: Sat, 2 Apr 2022 05:13:53 +0000
Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125
commits)
https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526
Created with:
roll-dep src/third_party/ffmpeg
Fixed: 1293918
Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng
Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#988253}
---
.../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++---------
media/ffmpeg/ffmpeg_common.cc | 11 +++----
media/filters/audio_file_reader.cc | 9 +++---
media/filters/audio_file_reader_unittest.cc | 6 ++--
.../filters/audio_video_metadata_extractor.cc | 11 +++++--
.../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++--
...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +-
media/filters/ffmpeg_audio_decoder.cc | 13 +++++----
8 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
index e4fc3f460e2..9b1ad9f7675 100644
--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext(
codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
}
- codec_context->channels = config.channel_count;
+ codec_context->ch_layout.nb_channels = config.channel_count;
codec_context->sample_rate = config.samples_per_second;
if (config.extra_data) {
@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format,
case cdm::kAudioFormatPlanarS16:
case cdm::kAudioFormatPlanarF32: {
const int decoded_size_per_channel =
- decoded_audio_size / av_frame.channels;
- for (int i = 0; i < av_frame.channels; ++i) {
+ decoded_audio_size / av_frame.ch_layout.nb_channels;
+ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
memcpy(output_buffer, av_frame.extended_data[i],
decoded_size_per_channel);
output_buffer += decoded_size_per_channel;
@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize(
// Success!
decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
samples_per_second_ = config.samples_per_second;
- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
+ bytes_per_frame_ =
+ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
output_timestamp_helper_ =
std::make_unique<AudioTimestampHelper>(config.samples_per_second);
is_initialized_ = true;
// Store initial values to guard against midstream configuration changes.
- channels_ = codec_context_->channels;
+ channels_ = codec_context_->ch_layout.nb_channels;
av_sample_format_ = codec_context_->sample_fmt;
return true;
@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
for (auto& frame : audio_frames) {
int decoded_audio_size = 0;
if (frame->sample_rate != samples_per_second_ ||
- frame->channels != channels_ || frame->format != av_sample_format_) {
+ frame->ch_layout.nb_channels != channels_ ||
+ frame->format != av_sample_format_) {
DLOG(ERROR) << "Unsupported midstream configuration change!"
<< " Sample Rate: " << frame->sample_rate << " vs "
- << samples_per_second_ << ", Channels: " << frame->channels
- << " vs " << channels_ << ", Sample Format: " << frame->format
- << " vs " << av_sample_format_;
+ << samples_per_second_
+ << ", Channels: " << frame->ch_layout.nb_channels << " vs "
+ << channels_ << ", Sample Format: " << frame->format << " vs "
+ << av_sample_format_;
return cdm::kDecodeError;
}
decoded_audio_size = av_samples_get_buffer_size(
- nullptr, codec_context_->channels, frame->nb_samples,
+ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
codec_context_->sample_fmt, 1);
if (!decoded_audio_size)
continue;
@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame(
size_t* total_size,
std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
AVFrame* frame) {
- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
- frame->nb_samples,
- codec_context_->sample_fmt, 1);
+ *total_size += av_samples_get_buffer_size(
+ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
+ codec_context_->sample_fmt, 1);
audio_frames->emplace_back(av_frame_clone(frame));
return true;
}
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 87ca8969626..76f03d6608e 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
codec_context->sample_fmt, codec_context->codec_id);
ChannelLayout channel_layout =
- codec_context->channels > 8
+ codec_context->ch_layout.nb_channels > 8
? CHANNEL_LAYOUT_DISCRETE
- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
- codec_context->channels);
+ : ChannelLayoutToChromeChannelLayout(
+ codec_context->ch_layout.u.mask,
+ codec_context->ch_layout.nb_channels);
int sample_rate = codec_context->sample_rate;
switch (codec) {
@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
extra_data, encryption_scheme, seek_preroll,
codec_context->delay);
if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
- config->SetChannelsForDiscrete(codec_context->channels);
+ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
// These are bitstream formats unknown to ffmpeg, so they don't have
@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config,
// TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
// said information to decode.
- codec_context->channels = config.channels();
+ codec_context->ch_layout.nb_channels = config.channels();
codec_context->sample_rate = config.samples_per_second();
if (config.extra_data().empty()) {
diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
index 5f257bdfaa6..e1be5aa9a5b 100644
--- a/media/filters/audio_file_reader.cc
+++ b/media/filters/audio_file_reader.cc
@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() {
// Verify the channel layout is supported by Chrome. Acts as a sanity check
// against invalid files. See http://crbug.com/171962
- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
- codec_context_->channels) ==
+ if (ChannelLayoutToChromeChannelLayout(
+ codec_context_->ch_layout.u.mask,
+ codec_context_->ch_layout.nb_channels) ==
CHANNEL_LAYOUT_UNSUPPORTED) {
return false;
}
// Store initial values to guard against midstream configuration changes.
- channels_ = codec_context_->channels;
+ channels_ = codec_context_->ch_layout.nb_channels;
audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
sample_rate_ = codec_context_->sample_rate;
av_sample_format_ = codec_context_->sample_fmt;
@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame(
if (frames_read < 0)
return false;
- const int channels = frame->channels;
+ const int channels = frame->ch_layout.nb_channels;
if (frame->sample_rate != sample_rate_ || channels != channels_ ||
frame->format != av_sample_format_) {
DLOG(ERROR) << "Unsupported midstream configuration change!"
diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc
index 2aba7927a31..1f45a50cace 100644
--- a/media/filters/audio_file_reader_unittest.cc
+++ b/media/filters/audio_file_reader_unittest.cc
@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test {
EXPECT_FALSE(reader_->Open());
}
- void RunTestFailingDecode(const char* fn) {
+ void RunTestFailingDecode(const char* fn, int expect_read = 0) {
Initialize(fn);
EXPECT_TRUE(reader_->Open());
std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
- EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
}
void RunTestPartialDecode(const char* fn) {
@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
}
TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
- RunTestFailingDecode("midstream_config_change.mp3");
+ RunTestFailingDecode("midstream_config_change.mp3", 42624);
}
#endif
diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc
index 185819eb936..69ff508c221 100644
--- a/media/filters/audio_video_metadata_extractor.cc
+++ b/media/filters/audio_video_metadata_extractor.cc
@@ -113,6 +113,15 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source,
if (!stream)
continue;
+ void* display_matrix =
+ av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
+ if (display_matrix) {
+ rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
+ static_cast<int32_t*>(display_matrix))
+ .rotation;
+ info.tags["rotate"] = base::NumberToString(rotation_);
+ }
+
// Extract dictionary from streams also. Needed for containers that attach
// metadata to contained streams instead the container itself, like OGG.
ExtractDictionary(stream->metadata, &info.tags);
@@ -255,8 +264,6 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata,
if (raw_tags->find(tag->key) == raw_tags->end())
(*raw_tags)[tag->key] = tag->value;
- if (ExtractInt(tag, "rotate", &rotation_))
- continue;
if (ExtractString(tag, "album", &album_))
continue;
if (ExtractString(tag, "artist", &artist_))
diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc
index 6f231c85729..ca5e5fb927d 100644
--- a/media/filters/ffmpeg_aac_bitstream_converter.cc
+++ b/media/filters/ffmpeg_aac_bitstream_converter.cc
@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) {
if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
audio_profile_ != stream_codec_parameters_->profile ||
sample_rate_index_ != sample_rate_index ||
- channel_configuration_ != stream_codec_parameters_->channels ||
+ channel_configuration_ !=
+ stream_codec_parameters_->ch_layout.nb_channels ||
frame_length_ != header_plus_packet_size) {
header_generated_ =
GenerateAdtsHeader(stream_codec_parameters_->codec_id,
0, // layer
stream_codec_parameters_->profile, sample_rate_index,
0, // private stream
- stream_codec_parameters_->channels,
+ stream_codec_parameters_->ch_layout.nb_channels,
0, // originality
0, // home
0, // copyrighted_stream
@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) {
codec_ = stream_codec_parameters_->codec_id;
audio_profile_ = stream_codec_parameters_->profile;
sample_rate_index_ = sample_rate_index;
- channel_configuration_ = stream_codec_parameters_->channels;
+ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
frame_length_ = header_plus_packet_size;
}
diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
index 1fd4c5ccd7d..f59bcd8fdaf 100644
--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test {
memset(&test_parameters_, 0, sizeof(AVCodecParameters));
test_parameters_.codec_id = AV_CODEC_ID_AAC;
test_parameters_.profile = FF_PROFILE_AAC_MAIN;
- test_parameters_.channels = 2;
+ test_parameters_.ch_layout.nb_channels = 2;
test_parameters_.extradata = extradata_header_;
test_parameters_.extradata_size = sizeof(extradata_header_);
}
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index 6a56c675f7d..4615fdeb3fb 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -28,7 +28,7 @@ namespace media {
// Return the number of channels from the data in |frame|.
static inline int DetermineChannels(AVFrame* frame) {
- return frame->channels;
+ return frame->ch_layout.nb_channels;
}
// Called by FFmpeg's allocation routine to allocate a buffer. Uses
@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer,
// Translate unsupported into discrete layouts for discrete configurations;
// ffmpeg does not have a labeled discrete configuration internally.
ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
- codec_context_->channel_layout, codec_context_->channels);
+ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
channel_layout = CHANNEL_LAYOUT_DISCRETE;
@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
// Success!
av_sample_format_ = codec_context_->sample_fmt;
- if (codec_context_->channels != config.channels()) {
+ if (codec_context_->ch_layout.nb_channels != config.channels()) {
MEDIA_LOG(ERROR, media_log_)
<< "Audio configuration specified " << config.channels()
<< " channels, but FFmpeg thinks the file contains "
- << codec_context_->channels << " channels";
+ << codec_context_->ch_layout.nb_channels << " channels";
ReleaseFFmpegResources();
state_ = DecoderState::kUninitialized;
return false;
@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s,
if (frame->nb_samples <= 0)
return AVERROR(EINVAL);
- if (s->channels != channels) {
+ if (s->ch_layout.nb_channels != channels) {
DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
return AVERROR(EINVAL);
}
@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s,
ChannelLayout channel_layout =
config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
? CHANNEL_LAYOUT_DISCRETE
- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
+ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
+ s->ch_layout.nb_channels);
if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
DLOG(ERROR) << "Unsupported channel layout.";

View File

@ -0,0 +1,10 @@
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -370,6 +370,7 @@
switch (sysno) {
case __NR_exit:
case __NR_exit_group:
+ case __NR_membarrier:
case __NR_wait4:
case __NR_waitid:
#if defined(__i386__)

View File

@ -0,0 +1,20 @@
Allow SYS_sched_getparam and SYS_sched_getscheduler
musl uses them for pthread_getschedparam()
source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc.orig 2019-10-08 21:03:18.253080425 +0200
+++ a/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:04:19.648549718 +0200
@@ -88,10 +88,10 @@
case __NR_sysinfo:
case __NR_times:
case __NR_uname:
- return Allow();
- case __NR_sched_getaffinity:
case __NR_sched_getparam:
case __NR_sched_getscheduler:
+ return Allow();
+ case __NR_sched_getaffinity:
case __NR_sched_setscheduler:
return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
case __NR_prlimit64:

View File

@ -0,0 +1,16 @@
--- a/third_party/node/node.py 2022-02-23 04:45:01.000000000 +0100
+++ - 2022-04-24 21:49:27.122211926 +0200
@@ -13,12 +13,7 @@
def GetBinaryPath():
darwin_name = ('node-darwin-arm64' if platform.machine() == 'arm64' else
'node-darwin-x64')
- return os_path.join(os_path.dirname(__file__), *{
- 'Darwin': ('mac', darwin_name, 'bin', 'node'),
- 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
- 'Windows': ('win', 'node.exe'),
- }[platform.system()])
-
+ return "/usr/bin/node"
def RunNode(cmd_parts, stdout=None):
cmd = [GetBinaryPath()] + cmd_parts

View File

@ -0,0 +1,12 @@
diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
index 16e20744706..6a079b32221 100644
--- a/build/linux/unbundle/ffmpeg.gn
+++ b/build/linux/unbundle/ffmpeg.gn
@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
"libavformat",
"libavutil",
]
+ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
}
buildflag_header("ffmpeg_features") {

View File

@ -0,0 +1,66 @@
From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
From: Zequan Wu <zequanwu@google.com>
Date: Tue, 20 Jul 2021 14:13:50 +0000
Subject: [PATCH] Use -ffile-compilation-dir= instead of
-fdebug-compilation-dir=
Bug: 1010267
Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
Auto-Submit: Zequan Wu <zequanwu@google.com>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#903456}
---
build/config/compiler/BUILD.gn | 18 ++++++++++++------
build/config/compiler/compiler.gni | 7 ++-----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index ede07d111c..6db16c1cdd 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1216,12 +1216,19 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
- cflags += [
- "-Xclang",
- "-fdebug-compilation-dir",
- "-Xclang",
- ".",
- ]
+ if (is_nacl) {
+ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+ cflags += [
+ "-Xclang",
+ "-fdebug-compilation-dir",
+ "-Xclang",
+ ".",
+ ]
+ } else {
+ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+ # and -fcoverage-compilation-dir=.
+ cflags += [ "-ffile-compilation-dir=." ]
+ }
if (!is_win) {
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index 8c259c360a..642319b4f4 100644
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -225,11 +225,8 @@ declare_args() {
# deterministic builds to reduce compile times, so this is less relevant for
# official builders.
strip_absolute_paths_from_debug_symbols_default =
- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
- # dependency to absolute path of source files.
- !use_clang_coverage &&
- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
- is_chromeos || (is_apple && !enable_dsyms))
+ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+ is_chromeos || (is_apple && !enable_dsyms)
# If the platform uses stripped absolute paths by default, then we don't expose
# it as a configuration option. If this is causing problems, please file a bug.

View File

@ -0,0 +1,33 @@
Upstream: Yes, https://webrtc-review.googlesource.com/9384
Reason: Fixes musl builds of webrtc
From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Date: Fri, 13 Oct 2017 15:49:32 +0200
Subject: [PATCH] IWYU: Include math.h for round(3).
math.h was being implicitly included, which can break the build with
alternative libc implementations.
Bug: None
Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
Reviewed-on: https://webrtc-review.googlesource.com/9384
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
Cr-Commit-Position: refs/heads/master@{#20292}
---
--- a/third_party/webrtc/p2p/base/port.cc
+++ a/third_party/webrtc/p2p/base/port.cc
@@ -10,6 +10,8 @@
#include "p2p/base/port.h"
+#include <math.h>
+
#include <algorithm>
#include <vector>
--
2.15.0.rc2

View File

@ -0,0 +1,10 @@
--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200
+++ a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200
@@ -12,6 +12,7 @@
#define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
#include <array>
+#include <cstddef>
namespace webrtc {

View File

@ -0,0 +1,56 @@
commit 45809f85bc3524f867e6e954f444fddd2333245a
Author: q66 <daniel@octaforge.org>
Date: Fri Jan 7 18:18:52 2022 +0100
switch ppc64 to 4k pages
since the partition allocator appears to hate larger constants
and at this point errors at compile time and i am not willing
to wade through this pile of curse and we use 4k kernels anyway,
assume 4K pages for ppc64
diff --git a/base/allocator/partition_allocator/page_allocator_constants.h b/base/allocator/partition_allocator/page_allocator_constants.h
index bfd5753..045082b 100644
--- a/base/allocator/partition_allocator/page_allocator_constants.h
+++ b/base/allocator/partition_allocator/page_allocator_constants.h
@@ -40,7 +40,7 @@ namespace base {
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
PageAllocationGranularityShift() {
-#if BUILDFLAG(IS_WIN) || defined(ARCH_CPU_PPC64)
+#if BUILDFLAG(IS_WIN)
// Modern ppc64 systems support 4kB (shift = 12) and 64kB (shift = 16) page
// sizes. Since 64kB is the de facto standard on the platform and binaries
// compiled for 64kB are likely to work on 4kB systems, 64kB is a good choice
diff --git a/base/allocator/partition_allocator/partition_alloc_constants.h b/base/allocator/partition_allocator/partition_alloc_constants.h
index 0b9260d..3e054ec 100644
--- a/base/allocator/partition_allocator/partition_alloc_constants.h
+++ b/base/allocator/partition_allocator/partition_alloc_constants.h
@@ -74,11 +74,6 @@
PartitionPageShift() {
return 16; // 64 KiB
}
-#elif defined(ARCH_CPU_PPC64)
-PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
-PartitionPageShift() {
- return 18; // 256 KiB
-}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
(BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
diff --git a/base/allocator/partition_allocator/partition_alloc_forward.h b/base/allocator/partition_allocator/partition_alloc_forward.h
index 938ea38..9414b41 100644
--- a/base/allocator/partition_allocator/partition_alloc_forward.h
+++ b/base/allocator/partition_allocator/partition_alloc_forward.h
@@ -26,7 +26,10 @@ namespace base {
//
// __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
// platforms, as Chrome's requirement is C++14 as of 2020.
-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
+#if defined(__powerpc64__)
+/* we want this to be 16 here always */
+constexpr size_t kAlignment = 16;
+#elif defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
constexpr size_t kAlignment =
std::max(alignof(max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
#else

Some files were not shown because too many files have changed in this diff Show More