--- a/suite/locales/filter.py
+++ b/suite/locales/filter.py
@@ -1,37 +1,42 @@
 # 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/.
 
-def test(mod, path, entity = None):
+def test(mod, path, entity=None):
   import re
   # ignore anything but SeaMonkey
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "devtools/client", "devtools/shared",
+                 "devtools/shared",
                  "editor/ui", "suite", "services/sync"):
-    return False
+    return "ignore"
   # ignore temporary files, hiden files and files from rejects
   if (re.match(r".*?\/[.#].+", path) or
       re.match(r".*~$", path) or
       re.match(r".+\.(orig|rej)", path)):
-    return False
+    return "ignore"
   if mod not in ("suite"):
     # we only have exceptions for suite
-    return True
+    return "error"
   if entity is None:
     # missing and obsolete files
-    return not (re.match(r"searchplugins\/.+\.xml", path) or
-                re.match(r"chrome\/common\/help\/images\/[A-Za-z-_]+\.[a-z]+", path))
+    return ("ignore" if (re.match(r"searchplugins\/.+\.xml", path) or
+                         re.match(r"chrome\/common\/help\/images\/[A-Za-z-_]+\.[a-z]+", path))
+            else "error")
   if path == "defines.inc":
-    return entity != "MOZ_LANGPACK_CONTRIBUTORS"
+    return ("ignore" if (entity == "MOZ_LANGPACK_CONTRIBUTORS")
+            else "error")
   if path == "profile/bookmarks.extra" or path == "profile/panels.extra":
     # ignore files for additional bookmarks and panels
-    return False
-    
+    return "ignore"
+
   if path == "chrome/common/region.properties":
-    return not re.match(r"browser\.search\.order\.[1-9]", entity)
+    return ("ignore" if (re.match(r"browser\.search\.order\.[1-9]", entity))
+            else "error")
 
   if path != "chrome/browser/region.properties":
     # only region.properties exceptions remain, compare all others
-    return True
+    return "error"
 
-  return not re.match(r"browser\.contentHandlers\.types\.[0-5]", entity)
+  return ("ignore"
+          if (re.match(r"browser\.contentHandlers\.types\.[0-5]", entity))
+          else "error")

--- a/suite/locales/l10n-aurora.ini
+++ b/suite/locales/l10n-aurora.ini
@@ -11,20 +11,16 @@ dirs = suite
      editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 services_sync = mozilla/services/sync/locales/l10n.ini
 
-[extras]
-dirs = mozilla/extensions/inspector
-    mozilla/extensions/spellcheck
-
 [include_toolkit]
 type = hg
 mozilla = releases/mozilla-aurora
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
 
 [include_services_sync]
 type = hg

--- a/suite/locales/l10n-beta.ini
+++ b/suite/locales/l10n-beta.ini
@@ -11,20 +11,16 @@ dirs = suite
      editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 services_sync = mozilla/services/sync/locales/l10n.ini
 
-[extras]
-dirs = mozilla/extensions/inspector
-    mozilla/extensions/spellcheck
-
 [include_toolkit]
 type = hg
 mozilla = releases/mozilla-beta
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
 
 [include_services_sync]
 type = hg

--- a/suite/locales/l10n-central.ini
+++ b/suite/locales/l10n-central.ini
@@ -11,20 +11,16 @@ dirs = suite
      editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 services_sync = mozilla/services/sync/locales/l10n.ini
 
-[extras]
-dirs = mozilla/extensions/inspector
-    mozilla/extensions/spellcheck
-
 [include_toolkit]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
 
 [include_services_sync]
 type = hg

deleted file mode 100644
--- a/suite/locales/l10n-moz2.0.ini
+++ /dev/null
@@ -1,33 +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/.
-
-[general]
-depth = ../..
-all = suite/locales/all-locales
-
-[compare]
-dirs = suite
-     editor/ui
-
-[includes]
-# non-central apps might want to use %(topsrcdir)s here, or other vars
-# RFE: that needs to be supported by compare-locales, too, though
-toolkit = mozilla/toolkit/locales/l10n.ini
-services_sync = mozilla/services/sync/locales/l10n.ini
-
-[extras]
-dirs = mozilla/extensions/inspector
-    mozilla/extensions/spellcheck
-
-[include_toolkit]
-type = hg
-mozilla = releases/mozilla-2.0
-repo = http://hg.mozilla.org/
-l10n.ini = toolkit/locales/l10n.ini
-
-[include_services_sync]
-type = hg
-mozilla = releases/mozilla-2.0
-repo = http://hg.mozilla.org/
-l10n.ini = services/sync/locales/l10n.ini

--- a/suite/locales/l10n.ini
+++ b/suite/locales/l10n.ini
@@ -4,31 +4,15 @@
 
 [general]
 depth = ../..
 all = suite/locales/all-locales
 
 [compare]
 dirs = suite
      editor/ui
-     mozilla/devtools/client
 
 [includes]
-# non-central apps might want to use %(topsrcdir)s here, or other vars
-# RFE: that needs to be supported by compare-locales, too, though
+# include toolkit and services/sync from mozilla.
+# Don't specify which, use l10n-central.ini and friends if you're
+# not working on a local check-out
 toolkit = mozilla/toolkit/locales/l10n.ini
 services_sync = mozilla/services/sync/locales/l10n.ini
-
-[extras]
-dirs = mozilla/extensions/inspector
-    mozilla/extensions/spellcheck
-
-[include_toolkit]
-type = hg
-mozilla = mozilla-central
-repo = http://hg.mozilla.org/
-l10n.ini = toolkit/locales/l10n.ini
-
-[include_services_sync]
-type = hg
-mozilla = mozilla-central
-repo = http://hg.mozilla.org/
-l10n.ini = services/sync/locales/l10n.ini