--- a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd+++ b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd@@ -1,32 +1,11 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->-<!ENTITY pluginWizard.title "Plugin Finder Service">-<!ENTITY pluginWizard.firstPage.title "Welcome to the &pluginWizard.title;">--<!ENTITY pluginWizard.checkingForPlugins.description.label "&brandShortName; is now checking for available plugins…">--<!ENTITY pluginWizard.availablePluginsPage.title "Available Plugin Downloads">-<!ENTITY pluginWizard.availablePluginsPage.description.label "The following plugins are available:">-<!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Press Next to install these plugins.">-<!ENTITY pluginWizard.availablePluginsPage.installerUI "Some plugins may require additional information from you during installation.">--<!ENTITY pluginWizard.licensePage.title "Plugin Licenses">-<!ENTITY pluginWizard.licensePage.accept.label "I agree.">-<!ENTITY pluginWizard.licensePage.deny.label "I do not agree (plugin will not be installed).">--<!ENTITY pluginWizard.installPluginsPage.title "Installing Plugins">-<!ENTITY pluginWizard.installPluginsPage.description.label "&brandShortName; is installing plugins…">--<!ENTITY pluginWizard.finalPage.description.label "&brandShortName; finished installing the missing plugins:">--<!ENTITY pluginWizard.finalPage.moreInfo.label "Find out more about Plugins or manually find missing plugins.">-<!ENTITY pluginWizard.finalPage.restart.label "&brandShortName; needs to be restarted for the plugin(s) to work."> <!-- LOCALIZATION NOTE (unsupportedPlatform.pre): Mobile only. Flash (the only plugin available on mobile) is not supported on some devices. Include a trailing space as needed. --> <!ENTITY unsupportedPlatform.pre "We're very sorry, but &brandShortName; can't play Flash on this device. "> <!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. --> <!ENTITY unsupportedPlatform.learnMore "Learn More…"> <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->@@ -35,17 +14,16 @@ <!ENTITY missingPlugin "A plugin is needed to display this content."> <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. --> <!ENTITY tapToPlayPlugin "Tap here to activate plugin."> <!ENTITY clickToActivatePlugin "Activate plugin."> <!ENTITY checkForUpdates "Check for updates…"> <!ENTITY disabledPlugin "This plugin is disabled."> <!ENTITY blockedPlugin.label "This plugin has been blocked for your protection."> <!ENTITY hidePluginBtn.label "Hide plugin">-<!ENTITY installPlugin "Install plugin…"> <!ENTITY managePlugins "Manage plugins…"> <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed --> <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link --> <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed --> <!ENTITY reloadPlugin.pre ""> <!ENTITY reloadPlugin.middle "Reload the page"> <!ENTITY reloadPlugin.post " to try again.">

deleted file mode 100644--- a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.properties+++ /dev/null@@ -1,30 +0,0 @@-# This Source Code Form is subject to the terms of the Mozilla Public-# License, v. 2.0. If a copy of the MPL was not distributed with this-# file, You can obtain one at http://mozilla.org/MPL/2.0/.--pluginLicenseAgreement.label=To install %S, you need to agree to the following:--pluginInstallation.download.start=Downloading %S…-pluginInstallation.download.finish=Finished downloading %S.--pluginInstallation.install.start=Installing %S…-pluginInstallation.install.finish=Successfully installed %S.-pluginInstallation.install.error=Failed to install %S (%S).--pluginInstallation.complete=Finished installing plugins.--pluginInstallationSummary.success=Installed-pluginInstallationSummary.failed=Failed-pluginInstallationSummary.licenseNotAccepted=License not accepted-pluginInstallationSummary.notAvailable=Not Available-pluginInstallationSummary.manualInstall.label=Manual Install-pluginInstallationSummary.manualInstall.tooltip=Manually install the plugin.--pluginInstallation.noPluginsFound=No suitable plugins were found.-pluginInstallation.noPluginsInstalled=No plugins were installed.-pluginInstallation.unknownPlugin=Unknown Plugin (%S)--pluginInstallation.restart.label=Restart %S-pluginInstallation.restart.accesskey=R-pluginInstallation.close.label=Close-pluginInstallation.close.accesskey=C

deleted file mode 100644--- a/toolkit/mozapps/plugins/content/pluginInstallerWizard.css+++ /dev/null@@ -1,9 +0,0 @@-/* This Source Code Form is subject to the terms of the Mozilla Public- * License, v. 2.0. If a copy of the MPL was not distributed with this- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */---.wizard-header-description {- display: none;-}-

--- a/toolkit/mozapps/plugins/jar.mn+++ b/toolkit/mozapps/plugins/jar.mn@@ -1,15 +1,10 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: % content mozapps %content/mozapps/- content/mozapps/plugins/pluginInstallerWizard.xul (content/pluginInstallerWizard.xul)- content/mozapps/plugins/pluginInstallerWizard.js (content/pluginInstallerWizard.js)- content/mozapps/plugins/pluginInstallerWizard.css (content/pluginInstallerWizard.css)- content/mozapps/plugins/pluginInstallerDatasource.js (content/pluginInstallerDatasource.js)- content/mozapps/plugins/pluginInstallerService.js (content/pluginInstallerService.js) content/mozapps/plugins/pluginProblem.xml (content/pluginProblem.xml) content/mozapps/plugins/pluginProblemContent.css (content/pluginProblemContent.css) content/mozapps/plugins/pluginProblemBinding.css (content/pluginProblemBinding.css) content/mozapps/plugins/pluginFinderBinding.css (content/pluginFinderBinding.css)

--- a/toolkit/mozapps/plugins/moz.build+++ b/toolkit/mozapps/plugins/moz.build@@ -1,13 +1,11 @@ # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.-TEST_DIRS += ['tests']- EXTRA_COMPONENTS += [ 'pluginGlue.manifest', ]-JAR_MANIFESTS += ['jar.mn']\ No newline at end of file+JAR_MANIFESTS += ['jar.mn']

deleted file mode 100644--- a/toolkit/mozapps/plugins/tests/Makefile.in+++ /dev/null@@ -1,9 +0,0 @@-# This Source Code Form is subject to the terms of the Mozilla Public-# License, v. 2.0. If a copy of the MPL was not distributed with this-# file, You can obtain one at http://mozilla.org/MPL/2.0/.--TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)--PROGRAMS_DEST = $(TESTROOT)--include $(topsrcdir)/config/rules.mk