mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
24c2f2fa38
- CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214).
14 lines
844 B
Diff
14 lines
844 B
Diff
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
|
index 4d07574af45c..56299e99f49e 100644
|
|
--- chrome/app/generated_resources.grd
|
|
+++ chrome/app/generated_resources.grd
|
|
@@ -5068,7 +5068,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
|