Fix script auto-updating.

The goal is to act just like Firefox acts for any other Add-on. Using the same preferences it already defines. This is done by removing all custom "check for updates" code (which previously supported Firefox 3), relying instead on the AddonManager interface. Refs greasemonkey#1646 (probable fix) Fixes greasemonkey#1647
arantius · Nov 8, 2012 · c932a6e · c932a6e
1 parent 6876ae7
commit c932a6e
Show file tree

Hide file tree

Showing 85 changed files with 105 additions and 413 deletions.
diff --git a/components/greasemonkey.js b/components/greasemonkey.js
@@ -477,7 +477,6 @@ service.prototype.runScripts = function(aRunWhen, aWrappedContentWin) {
   });
   if (scripts.length > 0) {
     this.injectScripts(scripts, url, aWrappedContentWin);
-    this._config.checkScriptsForRemoteUpdates(scripts);
   }
 };
 

diff --git a/content/addons4-overlay.js b/content/addons4-overlay.js
@@ -24,17 +24,6 @@ createItem = function GM_createItem(aObj, aIsInstall, aIsRemote) {
   return item;
 };
 
-// Patch the default loadView() to suppress the detail view for user scripts.
-var _loadViewOrig = gViewController.loadView.bind(gViewController);
-gViewController.loadView = function(aViewId) {
-  if (userScriptViewId == gViewController.currentViewId
-      && 0 === aViewId.indexOf('addons://detail/')
-  ) {
-    return false;
-  }
-  _loadViewOrig(aViewId);
-};
-
 // Set up an "observer" on the config, to keep the displayed items up to date
 // with their actual state.
 var observer = {
@@ -129,37 +118,15 @@ function init() {
       isEnabled: addonExecutesNonLast,
       doCommand: function(aAddon) { reorderScriptExecution(aAddon, 9999); }
     };
-  gViewController.commands.cmd_userscript_toggleCheckUpdates = {
-      isEnabled: addonIsInstalledScript,
-      doCommand: function(aAddon) {
-        aAddon._script.checkRemoteUpdates = !aAddon._script.checkRemoteUpdates;
-        GM_util.getService().config._changed(aAddon._script, "modified", null);
-      }
-    };
 
   window.addEventListener('ViewChanged', onViewChanged, false);
   onViewChanged(); // initialize on load as well as when it changes later
 
   document.getElementById('greasemonkey-sort-bar').addEventListener(
       'command', onSortersClicked, false);
   applySort();
-
-  var contextMenu = document.getElementById("addonitem-popup");
-  contextMenu.addEventListener("popupshowing", onContextShowing, false);
 };
 
-function onContextShowing(aEvent) {
-  var addon = gViewController.currentViewObj.getSelectedAddon();
-  if ('user-script' != addon.type) return;
-  var menuitem = document.getElementById(
-      'menuitem_userscript_toggleCheckUpdates');
-  if (addon._script.checkRemoteUpdates) {
-    menuitem.setAttribute('checked', 'true');
-  } else {
-    menuitem.removeAttribute('checked');
-  }
-}
-
 function onSortersClicked(aEvent) {
   if ('button' != aEvent.target.tagName) return;
   var button = aEvent.target;

diff --git a/content/addons4-overlay.xul b/content/addons4-overlay.xul
@@ -33,7 +33,6 @@
   <command id="cmd_userscript_execute_later" />
   <command id="cmd_userscript_execute_last" />
   <command id="cmd_userscript_showItemPreferences" />
-  <command id="cmd_userscript_toggleCheckUpdates" />
 </commandset>
 
 <menupopup id="addonitem-popup">
@@ -59,13 +58,10 @@
 
   <menuseparator class="greasemonkey"/>
 
+  <!-- Default find updates item. -->
   <menuitem command="cmd_findItemUpdates" class="greasemonkey"
     label="&cmd.findUpdates.label;" accesskey="&cmd.findUpdates.accesskey;"
   />
-  <menuitem command="cmd_userscript_toggleCheckUpdates" class="greasemonkey"
-    label="&CheckUpdates;" accesskey="&CheckUpdates.accesskey;"
-    type="checkbox" id="menuitem_userscript_toggleCheckUpdates"
-  />
 </menupopup>
 
 <vbox id="list-view">

diff --git a/content/config.js b/content/config.js
@@ -251,22 +251,6 @@ Config.prototype._notifyUpdates = function() {
   GM_util.getBrowserWindow().GM_OpenUpdatesMgr();
 };
 
-Config.prototype.checkScriptsForRemoteUpdates = function(scripts) {
-  var forced = false;
-  if ('undefined' == typeof scripts) {
-    forced = true;
-    var scripts = this.getMatchingScripts(function (script) {
-      return !script.updateAvailable &&
-          script.updateURL &&
-          script.enabled;
-    });
-  }
-
-  scripts.forEach(function(script) {
-    script.checkForRemoteUpdate(forced);
-  });
-};
-
 Config.prototype.getScriptById = function(scriptId) {
   for (var i = 0, script = null; script = this.scripts[i]; i++) {
     if (scriptId == script.id) {

diff --git a/content/options.js b/content/options.js
@@ -4,51 +4,17 @@ Components.utils.import('resource://greasemonkey/util.js');
 function GM_loadOptions() {
   document.getElementById('check-uninstall')
       .checked = GM_prefRoot.getValue('uninstallPreferences');
-
+  document.getElementById('secure-update')
+  .checked = GM_prefRoot.getValue('requireSecureUpdates');
   document.getElementById('globalExcludes')
       .pages = GM_util.getService().config.globalExcludes;
-
-  document.getElementById('check-update')
-      .checked = GM_prefRoot.getValue('enableUpdateChecking');
-  document.getElementById('auto-install-updates')
-      .checked = GM_prefRoot.getValue('autoInstallUpdates');
-  document.getElementById('secure-update')
-      .checked = GM_prefRoot.getValue('requireSecureUpdates');
-
-  document.getElementById('slide-updateInterval')
-      .value = GM_prefRoot.getValue('minDaysBetweenUpdateChecks');
-
-  GM_setMinUpdateIntervalLabel();
-  GM_onChangeUpdateChecking();
 }
 
 function GM_saveOptions(checkbox) {
   GM_prefRoot.setValue('uninstallPreferences',
       !!document.getElementById('check-uninstall').checked);
-  GM_util.getService().config.globalExcludes =
-      document.getElementById('globalExcludes').pages;
-  GM_prefRoot.setValue('enableUpdateChecking',
-      !!document.getElementById('check-update').checked);
-  GM_prefRoot.setValue('autoInstallUpdates',
-      !!document.getElementById('auto-install-updates').checked);
   GM_prefRoot.setValue('requireSecureUpdates',
       !!document.getElementById('secure-update').checked);
-  GM_prefRoot.setValue("minDaysBetweenUpdateChecks", GM_getMinUpdateDays());
-}
-
-function GM_getMinUpdateDays() {
-  return parseInt(document.getElementById('slide-updateInterval').value);
-}
-
-function GM_onChangeUpdateChecking() {
-  var enabled = document.getElementById('check-update').checked;
-  document.getElementById('auto-install-updates').disabled = !enabled;
-  document.getElementById('secure-update').disabled = !enabled;
-  document.getElementById('slide-updateInterval').disabled = !enabled;
-  document.getElementById('label-slide-updateInterval').disabled = !enabled;
-}
-
-function GM_setMinUpdateIntervalLabel() {
-  document.getElementById('txt-updateInterval')
-      .setAttribute('value', GM_getMinUpdateDays());
+  GM_util.getService().config.globalExcludes =
+      document.getElementById('globalExcludes').pages;
 }
diff --git a/content/options.xul b/content/options.xul
@@ -37,24 +37,13 @@
   </groupbox>
 
   <groupbox>
-    <caption label="&options.globalExcludes;" />
-    <cludes id="globalExcludes" />
+    <caption label="&UpdateChecking;" />
+    <checkbox id="secure-update" label="&RequireSecureUpdates;" />
   </groupbox>
 
   <groupbox>
-    <caption label="&UpdateChecking;" />
-    <checkbox id="check-update" label="&EnableUpdateChecking;"
-        oncommand="GM_onChangeUpdateChecking()" />
-    <checkbox id="auto-install-updates" label="&AutoInstallUpdates;" />
-    <checkbox id="secure-update" label="&RequireSecureUpdates;" />
-    <label value="&UpdateInterval;" control="slide-updateInterval"
-        id="label-slide-updateInterval" />
-    <hbox>
-      <scale id="slide-updateInterval" flex="1"
-        orient="horizontal" min="1" max="30"
-        onchange="GM_setMinUpdateIntervalLabel()"/>
-      <label id="txt-updateInterval" />
-    </hbox>
+    <caption label="&options.globalExcludes;" />
+    <cludes id="globalExcludes" />
   </groupbox>
 </vbox>
 

diff --git a/defaults/preferences/greasemonkey.js b/defaults/preferences/greasemonkey.js
@@ -5,9 +5,6 @@ pref("greasemonkey.installDelay", 5);
 pref("greasemonkey.unmhtIsGreaseable", false);
 pref("greasemonkey.enableScriptRefreshing", true);
 pref("greasemonkey.uninstallPreferences", true);
-pref("greasemonkey.enableUpdateChecking", true);
-pref("greasemonkey.minDaysBetweenUpdateChecks", 7);
-pref("greasemonkey.autoInstallUpdates", true);
 pref("greasemonkey.requireSecureUpdates", true);
 pref("greasemonkey.haveInsertedToolbarbutton", false);
 pref("greasemonkey.logChrome", false);

diff --git a/locale/ar/gm-addons.dtd b/locale/ar/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "التحقق من وجود تحديثات تلقائيا">
-<!ENTITY CheckUpdates.accesskey "ت">
 <!ENTITY Edit "تحرير">
 <!ENTITY Edit.accesskey "ت">
 <!ENTITY Edit.tooltip "تحرير هذا السكربت">

diff --git a/locale/ar/greasemonkey.dtd b/locale/ar/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "إلغاء التثبيت">
 <!ENTITY AlsoUninstallPrefs "أيضا مسح جميع الأعدادات">
 <!ENTITY UpdateChecking "تحديث السكربت">
-<!ENTITY EnableUpdateChecking "تمكين التحديث التلقائي للتحقق من السكربتات">
-<!ENTITY UpdateInterval "الحد الأدنى لعدد الأيام للتحقق من تحديث السكربتات">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "تتطلب تحديثات آمنة">
 <!ENTITY greasemonkey.noscriptshere "لايوجد سكربت مثبت يعمل على هذه الصفحة.">
 <!ENTITY greasemonkey.youhavenoscripts "انت لم تثبت أي سكربت">

diff --git a/locale/ca-AD/gm-addons.dtd b/locale/ca-AD/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Edit">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Edit this User Script">

diff --git a/locale/ca-AD/greasemonkey.dtd b/locale/ca-AD/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Uninstall">
 <!ENTITY AlsoUninstallPrefs "Also uninstall associated preferences">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "No installed scripts run on this page.">
 <!ENTITY greasemonkey.youhavenoscripts "You don't have any user scripts installed">

diff --git a/locale/cs-CZ/gm-addons.dtd b/locale/cs-CZ/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automaticky kontrolovat aktualizace">
-<!ENTITY CheckUpdates.accesskey "A">
 <!ENTITY Edit "Upravit">
 <!ENTITY Edit.accesskey "U">
 <!ENTITY Edit.tooltip "Upravit tento uživatelský skript">

diff --git a/locale/cs-CZ/greasemonkey.dtd b/locale/cs-CZ/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Odinstalovat">
 <!ENTITY AlsoUninstallPrefs "Odinstalovat i přidružená nastavení">
 <!ENTITY UpdateChecking "Zkontrolovat aktualizace">
-<!ENTITY EnableUpdateChecking "Povolit automatickou kontrolu aktualizací skriptu">
-<!ENTITY UpdateInterval "Minimální počet dní ke kontrole aktualizací">
-<!ENTITY AutoInstallUpdates "Automaticky instalovat nalezené aktualizace">
 <!ENTITY RequireSecureUpdates "Použít zabezpečené aktualizace">
 <!ENTITY greasemonkey.noscriptshere "Žádné nainstalované skripty neběží na této stránce.">
 <!ENTITY greasemonkey.youhavenoscripts "Nemáte nainstalované uživatelské skripty">

diff --git a/locale/cs/gm-addons.dtd b/locale/cs/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Upravit">
 <!ENTITY Edit.accesskey "U">
 <!ENTITY Edit.tooltip "Upravit tento uživatelský skript">

diff --git a/locale/cs/greasemonkey.dtd b/locale/cs/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Odinstalovat">
 <!ENTITY AlsoUninstallPrefs "Odinstalovat i přidružená nastavení">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "No installed scripts run on this page.">
 <!ENTITY greasemonkey.youhavenoscripts "Nemáte nainstalované uživatelské skripty">

diff --git a/locale/da/gm-addons.dtd b/locale/da/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Rediger">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Rediger dette User Script">

diff --git a/locale/da/greasemonkey.dtd b/locale/da/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Afinstaller">
 <!ENTITY AlsoUninstallPrefs "Også afinstallere tilhørende indstilliner">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "Ingen installerede scripts køres på denne side.">
 <!ENTITY greasemonkey.youhavenoscripts "Du har ikke nogen user scripts installeret">

diff --git a/locale/de/gm-addons.dtd b/locale/de/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatisch auf Updates prüfen">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Bearbeiten">
 <!ENTITY Edit.accesskey "B">
 <!ENTITY Edit.tooltip "Dieses Benutzerskript bearbeiten">

diff --git a/locale/de/greasemonkey.dtd b/locale/de/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Deinstallieren">
 <!ENTITY AlsoUninstallPrefs "Zugehörige Einstellungen ebenfalls entfernen">
 <!ENTITY UpdateChecking "Auf Aktualisierungen überprüfen">
-<!ENTITY EnableUpdateChecking "Automatische Überprüfung der Skripte auf Aktualisierung">
-<!ENTITY UpdateInterval "Minimale Anzahl von Tagen zwischen Aktualisierungsprüfungen">
-<!ENTITY AutoInstallUpdates "Gefundene Aktualisierungen automatisch installieren">
 <!ENTITY RequireSecureUpdates "Sicherheitsupdate erforderlich">
 <!ENTITY greasemonkey.noscriptshere "Es werden keine installierten Skripte auf dieser Seite ausgeführt.">
 <!ENTITY greasemonkey.youhavenoscripts "Sie haben noch keine Benutzerskripte installiert">

diff --git a/locale/el/gm-addons.dtd b/locale/el/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Αυτόματος έλεγχος για ενημερώσεις">
-<!ENTITY CheckUpdates.accesskey "Α">
 <!ENTITY Edit "Επεξεργασία">
 <!ENTITY Edit.accesskey "Ε">
 <!ENTITY Edit.tooltip "Επεξεργασία αυτού του Κώδικα Χρήστη">

diff --git a/locale/el/greasemonkey.dtd b/locale/el/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Απεγκατάσταση">
 <!ENTITY AlsoUninstallPrefs "Απεγκατάσταση και των σχετικών ρυθμίσεων">
 <!ENTITY UpdateChecking "Έλεγχος Ενημέρωσης">
-<!ENTITY EnableUpdateChecking "Ενεργοποιηση αυτύματου ελέγχου ενημερώσεων του κώδικα χρηστών">
-<!ENTITY UpdateInterval "Ελάχιστος αριθμός ημερών μεταξύ ελέγχων για ενημερώσεις">
-<!ENTITY AutoInstallUpdates "Αυτόματη εγκατάσταση ενημερώσεων όταν βρεθούν">
 <!ENTITY RequireSecureUpdates "Απαιτούνται ασφαλείς ενημερώσεις">
 <!ENTITY greasemonkey.noscriptshere "Κανένας εγκατεστημένος κώδικας δεν εκτελείτε σε αυτή τη σελίδα.">
 <!ENTITY greasemonkey.youhavenoscripts "Δεν έχετε κανένα εγκατεστημένο κώδικα χρήστη">

diff --git a/locale/en-US/gm-addons.dtd b/locale/en-US/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Edit">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Edit this User Script">

diff --git a/locale/en-US/greasemonkey.dtd b/locale/en-US/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Uninstall">
 <!ENTITY AlsoUninstallPrefs "Also uninstall associated preferences">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "No installed scripts run on this page.">
 <!ENTITY greasemonkey.youhavenoscripts "You don't have any user scripts installed">

diff --git a/locale/es-AR/gm-addons.dtd b/locale/es-AR/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Editar">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Editar este Script">

diff --git a/locale/es-AR/greasemonkey.dtd b/locale/es-AR/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Desinstalar">
 <!ENTITY AlsoUninstallPrefs "También desinstalar las preferencias asociadas">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "No installed scripts run on this page.">
 <!ENTITY greasemonkey.youhavenoscripts "You don't have any user scripts installed">

diff --git a/locale/es-CL/gm-addons.dtd b/locale/es-CL/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Auto-verificar para actualizar">
-<!ENTITY CheckUpdates.accesskey "V">
 <!ENTITY Edit "Editar">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Editar este script">

diff --git a/locale/es-CL/greasemonkey.dtd b/locale/es-CL/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Eliminar">
 <!ENTITY AlsoUninstallPrefs "Eliminar preferencias asociadas">
 <!ENTITY UpdateChecking "Verificar para actualizar">
-<!ENTITY EnableUpdateChecking "Habilitar auto-verificar para actualizar scripts">
-<!ENTITY UpdateInterval "Lapso menor de días entre verificaciones">
-<!ENTITY AutoInstallUpdates "Auto-actualizar de ser el caso">
 <!ENTITY RequireSecureUpdates "Requerir actualizaciones seguras">
 <!ENTITY greasemonkey.noscriptshere "No hay  scripts instalados para este sitio.">
 <!ENTITY greasemonkey.youhavenoscripts "No hay  scripts instalados">

diff --git a/locale/es-ES/gm-addons.dtd b/locale/es-ES/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "editar">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Edit this User Script">

diff --git a/locale/es-ES/greasemonkey.dtd b/locale/es-ES/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Uninstall">
 <!ENTITY AlsoUninstallPrefs "Also uninstall associated preferences">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "No installed scripts run on this page.">
 <!ENTITY greasemonkey.youhavenoscripts "You don't have any user scripts installed">

diff --git a/locale/es-MX/gm-addons.dtd b/locale/es-MX/gm-addons.dtd
@@ -1,5 +1,3 @@
-<!ENTITY CheckUpdates "Automatically check for updates">
-<!ENTITY CheckUpdates.accesskey "U">
 <!ENTITY Edit "Editar">
 <!ENTITY Edit.accesskey "E">
 <!ENTITY Edit.tooltip "Editar">

diff --git a/locale/es-MX/greasemonkey.dtd b/locale/es-MX/greasemonkey.dtd
@@ -33,9 +33,6 @@
 <!ENTITY Uninstall "Desinstalar">
 <!ENTITY AlsoUninstallPrefs "También desinstalar preferencias asociadas">
 <!ENTITY UpdateChecking "Update Checking">
-<!ENTITY EnableUpdateChecking "Enable automatic update checking of scripts">
-<!ENTITY UpdateInterval "Minimum number of days between update checks">
-<!ENTITY AutoInstallUpdates "Automatically install updates when found">
 <!ENTITY RequireSecureUpdates "Require secure updates">
 <!ENTITY greasemonkey.noscriptshere "No installed scripts run on this page.">
 <!ENTITY greasemonkey.youhavenoscripts "You don't have any user scripts installed">