mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
047e8f9349
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
14 lines
844 B
Diff
14 lines
844 B
Diff
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
|
index 007d476f22ce..106ddd21a532 100644
|
|
--- chrome/app/generated_resources.grd
|
|
+++ chrome/app/generated_resources.grd
|
|
@@ -4984,7 +4984,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
|
</message>
|
|
</if>
|
|
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
|
- <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is blocked by enterprise policy
|
|
+ <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is not allowed
|
|
</message>
|
|
<message name="IDS_PLUGIN_BLOCKED_NO_LOADING" desc="The placeholder text for a blocked plugin that cannot be manually loaded by the user.">
|
|
<ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is blocked
|