Update/port patches for 125.0.6422.165.0

GrapheneOS · Jun 4, 2024 · de019c6 · de019c6
1 parent 7508a92
commit de019c6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/patches/0001-Vanadium-string-rebranding.patch b/patches/0001-Vanadium-string-rebranding.patch
@@ -63364,7 +63364,7 @@ index 1079740e77c24..a0bd0f2e1e9fd 100644
  <translation id="970715775301869095"><ph name="MINUTES" /> ମିନିଟ୍ ବାକି ଅଛି</translation>
  <translation id="981121421437150478">ଅଫ୍‍ଲାଇନ୍</translation>
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb
-index 6c20e25747919..2f2ce1fb198c6 100644
+index de89f7d82019f..588c3613dc6e7 100644
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pa.xtb
 @@ -5,7 +5,7 @@
@@ -63896,7 +63896,7 @@ index 6c20e25747919..2f2ce1fb198c6 100644
  <translation id="555816257274242153">ਕੀਮਤ ਨੂੰ ਟਰੈਕ ਕਰਨਾ ਬੰਦ ਕਰ ਦਿੱਤਾ ਗਿਆ</translation>
 @@ -875,8 +875,8 @@
  <translation id="5590372121997663538">ਇਸ ਕੰਪਿਊਟਰ ਨੂੰ ਯਾਦ ਰੱਖੋ</translation>
- <translation id="5596627076506792578">ਹੋਰ ਚੋਣਾਂ</translation>
+ <translation id="5596627076506792578">ਹੋਰ ਵਿਕਲਪ</translation>
  <translation id="5599455543593328020">ਇਨਕੋਗਨਿਟੋ ਮੋਡ</translation>
 -<translation id="5605283439565877834">Google Pay ਦੀਆਂ ਭੁਗਤਾਨ ਵਿਧੀਆਂ ਅਤੇ ਪਤਿਆਂ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। Chrome ਦੇ ਬ੍ਰਾਊਜ਼ਿੰਗ ਇਤਿਹਾਸ ਨੂੰ ਸਿੰਕ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ।
 -ਸਿਰਫ਼ ਤੁਹਾਡੇ ਪਾਸਫਰੇਜ਼ ਨਾਲ ਹੀ ਕੋਈ ਤੁਹਾਡੇ ਇਨਕ੍ਰਿਪਟਡ ਡਾਟੇ ਨੂੰ ਪੜ੍ਹ ਸਕਦਾ ਹੈ। ਪਾਸਫਰੇਜ਼ Google ਨੂੰ ਨਹੀਂ ਭੇਜਿਆ ਜਾਂਦਾ ਜਾਂ ਇਸ ਵੱਲੋਂ ਸਟੋਰ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ। ਜੇ ਤੁਸੀਂ ਆਪਣਾ ਪਾਸਫਰੇਜ਼ ਭੁੱਲ ਜਾਂਦੇ ਹੋ ਜਾਂ ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ <ph name="BEGIN_LINK" />ਆਪਣੇ ਖਾਤੇ ਵਿੱਚ Chrome ਡਾਟੇ ਨੂੰ ਕਲੀਅਰ ਕਰੋ<ph name="END_LINK" />।</translation>
@@ -89531,7 +89531,7 @@ index 0047ea607214b..5f933c3957960 100644
  <translation id="970715775301869095">還剩 <ph name="MINUTES" /> 分鐘</translation>
  <translation id="981121421437150478">離線</translation>
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb
-index a38d58463f8f8..6f321a9c07f34 100644
+index 0f4d8a4b1d259..caa13d5b89aaa 100644
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb
 +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zu.xtb
 @@ -5,7 +5,7 @@
@@ -89685,7 +89685,7 @@ index a38d58463f8f8..6f321a9c07f34 100644
 -<translation id="250020030759455918">Uzobona isimo sakho sokungena ngemvume se-<ph name="SITE_NAME" />, idatha yokuphequlula, nedatha yesayithi ku-Chrome</translation>
 +<translation id="250020030759455918">Uzobona isimo sakho sokungena ngemvume se-<ph name="SITE_NAME" />, idatha yokuphequlula, nedatha yesayithi ku-Vanadium</translation>
  <translation id="2510106555128151389">Ifaka i-<ph name="WEBAPK_NAME" />...</translation>
- <translation id="2513403576141822879">Ukuze uthole ezinye izilungiselelo ezihambisana nobumfihlo, ukuvikelwa nokuqoqwa kwedatha, bona <ph name="BEGIN_LINK" />amasevisi okuvumelanisa nawe-Google<ph name="END_LINK" /></translation>
+ <translation id="2513403576141822879">Ukuze uthole amanye amasethingi ezihambisana nobumfihlo, ukuvikelwa nokuqoqwa kwedatha, bona <ph name="BEGIN_LINK" />amasevisi okuvumelanisa nawe-Google<ph name="END_LINK" /></translation>
  <translation id="2517113738956581680">Ishidi elinosayizi ogcwele</translation>
 @@ -285,9 +285,9 @@ Ukuze ushintshel lawa masethingi, <ph name="BEGIN_LINK" />sula idatha yakho ye-C
  <translation id="2569733278091928697">Uzokwazi ukuphatha kalula izilawuli zemidiya, amaseshini we-Incognito, okudawunilodiwe nokuningi</translation>
@@ -119563,7 +119563,7 @@ index fa41ee4afc4ee..06ba3bd38186c 100644
  <translation id="964050462028070434">Upravljajte lozinkama i pristupnim ključevima…</translation>
  <translation id="969892804517981540">Zvanična verzija</translation>
 diff --git a/components/strings/components_strings_ca.xtb b/components/strings/components_strings_ca.xtb
-index 32cc315500bdc..7d5da6a962c9d 100644
+index 82e2a1d5ad01d..b27b71296e210 100644
 --- a/components/strings/components_strings_ca.xtb
 +++ b/components/strings/components_strings_ca.xtb
 @@ -9,7 +9,7 @@
@@ -120741,7 +120741,7 @@ index 32cc315500bdc..7d5da6a962c9d 100644
 -<translation id="6226163402662242066"><ph name="MANAGE_CHROME_ACCESSIBILITY_FOCUSED_FRIENDLY_MATCH_TEXT" />: prem Tab i després Retorn per personalitzar les eines d'accessibilitat a la configuració de Chrome</translation>
 +<translation id="6226163402662242066"><ph name="MANAGE_CHROME_ACCESSIBILITY_FOCUSED_FRIENDLY_MATCH_TEXT" />: prem Tab i després Retorn per personalitzar les eines d'accessibilitat a la configuració de Vanadium</translation>
  <translation id="6228346913624365233">Vehicles de luxe</translation>
- <translation id="6229196330202833460">Serveis de reproducció en línia de programes de televisió i pel·lícules</translation>
+ <translation id="6229196330202833460">Serveis d'estríming de programes de televisió i pel·lícules</translation>
  <translation id="6234122620015464377">Retalla després de cada document</translation>
  <translation id="6236290670123303279">Gestiona la configuració</translation>
  <translation id="623825323736974198">Gestiona els llocs web que estaran sempre actius i dels quals no se n'alliberarà memòria</translation>
@@ -156329,7 +156329,7 @@ index be5d4cbe7894d..6658d1469b333 100644
  <translation id="964050462028070434">पासवर्ड और पासकी मैनेज करें…</translation>
  <translation id="969892804517981540">आधिकारिक बिल्ड</translation>
 diff --git a/components/strings/components_strings_hr.xtb b/components/strings/components_strings_hr.xtb
-index c4b6328ea9b80..f4c9f88927cc9 100644
+index d82fbe47a72e8..a68897cd260d4 100644
 --- a/components/strings/components_strings_hr.xtb
 +++ b/components/strings/components_strings_hr.xtb
 @@ -9,7 +9,7 @@
@@ -181831,7 +181831,7 @@ index b156fe6484945..bdef17d993ce3 100644
  <translation id="964050462028070434">비밀번호 및 패스키 관리…</translation>
  <translation id="969892804517981540">공식 빌드</translation>
 diff --git a/components/strings/components_strings_ky.xtb b/components/strings/components_strings_ky.xtb
-index b097b7b2be955..23afb770e71f8 100644
+index b5c0f8eaa24a9..d39f68f9441c4 100644
 --- a/components/strings/components_strings_ky.xtb
 +++ b/components/strings/components_strings_ky.xtb
 @@ -9,7 +9,7 @@
@@ -182068,7 +182068,7 @@ index b097b7b2be955..23afb770e71f8 100644
 +<translation id="201174227998721785">Vanadium параметрлеринен уруксаттарды жана сайттарда сакталган маалыматтарды башкаруу</translation>
  <translation id="2012276282211112603">Учурда көрсөтүлө турган темалар жок</translation>
  <translation id="2018769312928511665">Кездеме (жылтырак)</translation>
- <translation id="2021333772895814435">Бул эреже боюнча түзмөктөрдө төмөнкүлөрдү шайкештирүү автоматтык түрдө өчүрүлөт: <ph name="ACTION_LIST" />.</translation>
+ <translation id="2021333772895814435">Бул эреже боюнча түзмөктөрдө төмөнкүлөрдү шайкештирүү өзү өчүп калат: <ph name="ACTION_LIST" />.</translation>
 @@ -573,7 +573,7 @@
  <translation id="2046951263634619614">Чекене китеп сатуучулар</translation>
  <translation id="2048261947532620704">Барак которулууда</translation>
@@ -183764,7 +183764,7 @@ index b097b7b2be955..23afb770e71f8 100644
  <translation id="918454845714257218"><ph name="SIDE_OF_CARD" /> кодду текшерип, кайра аракет кылыңыз</translation>
 -<translation id="9186203289258525843">"Chrome'ду демейки серепчи катары коюу" баскычы. Chrome'ду тутумдун демейки серепчиси катары коюу үчүн иштетиңиз</translation>
 +<translation id="9186203289258525843">"Vanadium'ду демейки серепчи катары коюу" баскычы. Vanadium'ду тутумдун демейки серепчиси катары коюу үчүн иштетиңиз</translation>
- <translation id="9190557999028587593">4 апта мурун изделген темалар автоматтык түрдө өчүрүлөт</translation>
+ <translation id="9190557999028587593">4 апта мурун изделген темалар өзү өчүп калат</translation>
  <translation id="9191834167571392248">Төмөнкү сол жагын тешүү</translation>
  <translation id="9192361865877479444">Металл (Жылтырабаган кагаз)</translation>
 @@ -4277,30 +4277,30 @@
@@ -193697,7 +193697,7 @@ index e9294a2baf97c..08105ff335711 100644
  <translation id="964050462028070434">പാസ്‌വേഡുകളും പാസ്‌കീകളും മാനേജ് ചെയ്യുക…</translation>
  <translation id="969892804517981540">ഔദ്യോഗിക ബില്‍ഡ്</translation>
 diff --git a/components/strings/components_strings_mn.xtb b/components/strings/components_strings_mn.xtb
-index 856b2c618fd58..c79031bceda8d 100644
+index 7ddb77599605d..443c5e5aa9451 100644
 --- a/components/strings/components_strings_mn.xtb
 +++ b/components/strings/components_strings_mn.xtb
 @@ -9,7 +9,7 @@
@@ -243711,7 +243711,7 @@ index d1bb8f4627ade..74655f27d31b5 100644
  <translation id="964050462028070434">Şifreleri ve şifre anahtarlarını yönetin…</translation>
  <translation id="969892804517981540">Resmi Derleme</translation>
 diff --git a/components/strings/components_strings_uk.xtb b/components/strings/components_strings_uk.xtb
-index 3b1253512aa56..1b7efe2dc3af5 100644
+index b05c1e2ca01a7..2a7f053930049 100644
 --- a/components/strings/components_strings_uk.xtb
 +++ b/components/strings/components_strings_uk.xtb
 @@ -9,7 +9,7 @@
@@ -257506,7 +257506,7 @@ index 4e9daedf084b6..1df09cb401729 100644
  <translation id="964050462028070434">管理密碼和密碼金鑰…</translation>
  <translation id="969892804517981540">正式版本</translation>
 diff --git a/components/strings/components_strings_zu.xtb b/components/strings/components_strings_zu.xtb
-index 8d0ae2525ed97..5d91aa16e41ea 100644
+index 8aee3eff731b3..3b095f5d74814 100644
 --- a/components/strings/components_strings_zu.xtb
 +++ b/components/strings/components_strings_zu.xtb
 @@ -9,7 +9,7 @@

diff --git a/patches/0011-Checkout-PGO-profiles.patch b/patches/0011-Checkout-PGO-profiles.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 51f1407ccf25e..6b7a70ce6a4ff 100644
+index 5b128736051ec..729d02c620eed 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -149,7 +149,7 @@ vars = {

diff --git a/patches/0012-disable-checkout_nacl.patch b/patches/0012-disable-checkout_nacl.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 6b7a70ce6a4ff..259b52404fd8e 100644
+index 729d02c620eed..4652a1bf100d1 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -118,7 +118,7 @@ vars = {

diff --git a/patches/0135-config-add-new-needed-deps-to-fetch-filter-lists.patch b/patches/0135-config-add-new-needed-deps-to-fetch-filter-lists.patch
@@ -10,7 +10,7 @@ for adblocking.
  1 file changed, 11 insertions(+)
 
 diff --git a/DEPS b/DEPS
-index 259b52404fd8e..a786b8d06b02b 100644
+index 4652a1bf100d1..07986f1faba5a 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -5668,6 +5668,17 @@ hooks = [