summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2019-11-17 10:05:33 +0000
committerGitHub <noreply@github.com>2019-11-17 10:05:33 +0000
commit36c81a978695ec3ba68af8475422bcab49ef470d (patch)
tree4410771482d5ac6239a9952cb5d15a06cd294ff0
parent8a64845aa527d2d3370ee73a1e17b7327f00d6ed (diff)
parentd034857122f608f654b10a6ca204d35adddcde08 (diff)
downloadUXP-36c81a978695ec3ba68af8475422bcab49ef470d.tar
UXP-36c81a978695ec3ba68af8475422bcab49ef470d.tar.gz
UXP-36c81a978695ec3ba68af8475422bcab49ef470d.tar.lz
UXP-36c81a978695ec3ba68af8475422bcab49ef470d.tar.xz
UXP-36c81a978695ec3ba68af8475422bcab49ef470d.zip
Merge pull request #1293 from JustOff/PR_widevine_strings
Adjust Widewine strings after removing Adobe Primetime support
-rw-r--r--dom/locales/en-US/chrome/plugins.properties5
-rw-r--r--toolkit/mozapps/extensions/internal/GMPProvider.jsm4
2 files changed, 4 insertions, 5 deletions
diff --git a/dom/locales/en-US/chrome/plugins.properties b/dom/locales/en-US/chrome/plugins.properties
index 6fa829bf1..d5e65fea7 100644
--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -28,6 +28,5 @@ gmp_privacy_info=Privacy Information
openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
openH264_description2=This plugin is automatically installed by Mozilla to comply with the WebRTC specification and to enable WebRTC calls with devices that require the H.264 video codec. Visit http://www.openh264.org/ to view the codec source code and learn more about the implementation.
-eme-adobe_description=Play back protected web video.
-
-widevine_description=Widevine Content Decryption Module provided by Google Inc.
+widevine_name=Widevine Content Decryption Module provided by Google Inc.
+widevine_description2=Play back protected web video.
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 39d8f2d98..2ebde08bb 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -51,9 +51,9 @@ const GMP_PLUGINS = [
},
{
id: WIDEVINE_ID,
- name: "widevine_description",
+ name: "widevine_name",
// Describe the purpose of both CDMs in the same way.
- description: "eme-adobe_description",
+ description: "widevine_description2",
licenseURL: "https://www.google.com/policies/privacy/",
homepageURL: "https://www.widevine.com/",
optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul",