Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc83820 authored by Saalim Quadri's avatar Saalim Quadri
Browse files

[Auto] Update /e/ patches

parent d5171f4e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
From a08ff33c2de8dce39e1998f22a2d08ae9681c2db Mon Sep 17 00:00:00 2001
From e57560717bda51b705127676008ca14f06ef31a4 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:42:44 +0100
Subject: Browser: Modify default search engines
@@ -151,7 +151,7 @@ index 26c187bbcff33..60a32065acd26 100644
     }
 }
diff --git a/components/regional_capabilities/regional_capabilities_service.cc b/components/regional_capabilities/regional_capabilities_service.cc
index 3bf139c816ff7..8d7b5d7c2dd63 100644
index c235574e0b469..bbf31224ca5de 100644
--- a/components/regional_capabilities/regional_capabilities_service.cc
+++ b/components/regional_capabilities/regional_capabilities_service.cc
@@ -271,6 +271,10 @@ RegionalCapabilitiesService::~RegionalCapabilitiesService() {
+5 −5
Original line number Diff line number Diff line
From 7964e88ac2d2b9dbcf1f348585efe46be7b303d8 Mon Sep 17 00:00:00 2001
From 0e4d03920ed50b7032e7fcc0dd3be08e418a3b66 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Fri, 30 Mar 2018 10:09:03 +0200
Subject: Multiple fingerprinting mitigations
@@ -66,7 +66,7 @@ index 1dca41c54804f..6b2fb381cbd40 100644
     "//services/device/public/mojom:usb",
     "//services/image_annotation:service",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0144d94281cfc..2be1364863813 100644
index 463034bd99d35..9b79899e3aa38 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -268,6 +268,8 @@
@@ -704,10 +704,10 @@ index 2c016b0cd581d..3e84dfeae63ab 100644
 
   // Methods overridden by all sub-classes
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 4e9817aacb041..bac5907f64b1b 100644
index 8a20854d95660..4b2127483fb0d 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3417,6 +3417,12 @@
@@ -3424,6 +3424,12 @@
       status: {"Mac": "test", "default": "stable"},
       base_feature: "none",
     },
@@ -781,5 +781,5 @@ index 0000000000000..f1db5dba46d93
+
+#endif  // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
-- 
2.34.1
2.51.2
+6 −6
Original line number Diff line number Diff line
From 54636d8a65b45747448c0a7b09b2d70b9f7ff20a Mon Sep 17 00:00:00 2001
From 17891a400a2d0e83d31a7b903a17d8ee7e590344 Mon Sep 17 00:00:00 2001
From: mars <gzhqyz@gmail.com>
Date: Sun, 2 Aug 2020 00:37:49 +0800
Subject: Update i18n zh_CN support
@@ -15,10 +15,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com>
 6 files changed, 133 insertions(+), 6 deletions(-)

diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
index 2f60b583fee1d..d5e65d40fa962 100644
index 538e84e6c0ce2..d6eb8171b0dda 100644
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -11985,4 +11985,6 @@
@@ -11984,4 +11984,6 @@
 <translation id="99731366405731005">您需要开启 <ph name="LINK1_BEGIN" />Chrome 同步<ph name="LINK1_END" />才能使用 Wi-Fi 同步功能。<ph name="LINK2_BEGIN" />了解详情<ph name="LINK2_END" /></translation>
 <translation id="998347228911661591">同步标签页分组</translation>
 <translation id="998747458861718449">检查(&amp;N)</translation>
@@ -121,7 +121,7 @@ index e8bd68419fb0e..40465e82fce32 100644
+<translation id="5494920125229734069">全选</translation>
+</translationbundle>
diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
index 06ca91210c145..3f5bef0e0bbad 100644
index 9d3078e1fab52..22fdef4bf0bdc 100644
--- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
@@ -734,4 +734,28 @@
@@ -156,7 +156,7 @@ index 06ca91210c145..3f5bef0e0bbad 100644
+<translation id="8431607486333903291">WebRTC</translation>
+</translationbundle>
diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb
index db0782707ffff..0f37cdfe7e094 100644
index 0f2f0ddde59fe..d0dcf3e91a0fa 100644
--- a/components/strings/components_strings_zh-CN.xtb
+++ b/components/strings/components_strings_zh-CN.xtb
@@ -5034,4 +5034,33 @@
@@ -208,5 +208,5 @@ index 5259e751b21cd..44cc7f0f184cd 100644
+<translation id="8586588515010398065">无法保存到所选文件</translation>
+</translationbundle>
-- 
2.34.1
2.51.2