diff -u8pdNr exten-023/chrome/content/tinderstatus.css exten-024/chrome/content/tinderstatus.css
--- exten-023/chrome/content/tinderstatus.css	2005-06-10 13:14:00.000000000 +0200
+++ exten-024/chrome/content/tinderstatus.css	2008-06-25 13:02:24.000000000 +0200
@@ -41,16 +41,17 @@ statusbarpanel#tinderstatus-panel {
   -moz-box-align: stretch;
 }
 
 box#tinderstatus-box {
   background-color: #000000;
   
   /* Center-align the enclosed icon so it doesn't stretch to fill the box. */
   -moz-box-align: center;
+  min-width: 10px;
 
   padding: 0px 2px 0px 2px;
 }
 
 /* Style the background color of the box to reflect build status. */
 box#tinderstatus-box[buildstatus="success"] {
   background-color: #11DD11;
 }
diff -u8pdNr exten-023/chrome/content/tinderstatus.js exten-024/chrome/content/tinderstatus.js
--- exten-023/chrome/content/tinderstatus.js	2008-04-02 18:56:30.000000000 +0200
+++ exten-024/chrome/content/tinderstatus.js	2008-07-04 15:37:04.000000000 +0200
@@ -153,17 +153,17 @@ function setUpTinderboxMenuPopup() {
   // Get the full list of tinderboxes that we know about.
   var fullList;
 
   try {
     fullList = gPrefBranch.getComplexValue("fullList",
                                            Ci.nsISupportsString).data;
   }
   catch (ex) {
-    fullList = "Bugzilla,Camino,Firefox,Firefox-Ports,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,XULRunner";
+    fullList = "Bugzilla,Camino,Firefox,Firefox-Ports,Firefox3.0,Mozilla2,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,XULRunner";
   }
 
   fullList = fullList.split(",");
 
   // Now add the tinderboxes onto the menu
   var item;
   for (var i = 0; i < fullList.length; ++i) {
     item = document.createElement("menuitem");
@@ -224,21 +224,22 @@ function updateCurrentTinderboxList() {
                                                  Ci.nsISupportsString).data;
     gTinderboxList = gTinderboxList.split(",");
 
     if (gTinderboxList.length == 1 && gTinderboxList[0] == "")
       gTinderboxList = [];
   }
   catch (ex) {
     // Set to the default list
-    gTinderboxList  = ["Firefox",
+    gTinderboxList  = ["Camino",
+                       "Firefox",
+                       "Mozilla2",
                        "SeaMonkey",
                        "Thunderbird",
-                       "XULRunner",
-                       "Camino"];
+                       "XULRunner"];
   }
   gTinderboxListUpdateRequired = false;
 }
 
 /**
  * Load into the browser a current tinderbox page.
  */
 function loadTinderboxURI(evt) {
diff -u8pdNr exten-023/chrome/locale/de/showhideTinderboxes.dtd exten-024/chrome/locale/de/showhideTinderboxes.dtd
--- exten-023/chrome/locale/de/showhideTinderboxes.dtd	2008-04-03 00:27:48.000000000 +0200
+++ exten-024/chrome/locale/de/showhideTinderboxes.dtd	2008-07-04 14:26:22.000000000 +0200
@@ -1,6 +1,6 @@
 <!ENTITY tinderstatus.showhide.tinderboxes.title "Tinderbox-Liste bearbeiten">
 <!ENTITY tinderstatus.showhide.tinderboxes.caption "Tinderbox-Liste bearbeiten">
 <!ENTITY tinderstatus.showhide.tinderboxes.applications "Anwendungen, Diverse">
 <!ENTITY tinderstatus.showhide.tinderboxes.localizations "Lokalisierungen">
-<!ENTITY tinderstatus.showhide.tinderboxes.info1 "Hier kann festgelegt werden, welche Tinderboxen im Einstellungsdialog">
-<!ENTITY tinderstatus.showhide.tinderboxes.info2 "für die Beobachtung zur Auswahl stehen sollen.">
+<!ENTITY tinderstatus.showhide.tinderboxes.info1 "Hier kann festgelegt werden, welche Quellen-Verzeichnisbäume im">
+<!ENTITY tinderstatus.showhide.tinderboxes.info2 " Einstellungsdialog für die Beobachtung zur Auswahl stehen sollen.">
diff -u8pdNr exten-023/chrome/locale/en-US/showhideTinderboxes.dtd exten-024/chrome/locale/en-US/showhideTinderboxes.dtd
--- exten-023/chrome/locale/en-US/showhideTinderboxes.dtd	2008-04-03 00:28:14.000000000 +0200
+++ exten-024/chrome/locale/en-US/showhideTinderboxes.dtd	2008-07-04 15:14:58.000000000 +0200
@@ -1,6 +1,6 @@
 <!ENTITY tinderstatus.showhide.tinderboxes.title "Edit list of tinderboxes">
 <!ENTITY tinderstatus.showhide.tinderboxes.caption "Edit list of tinderboxes">
 <!ENTITY tinderstatus.showhide.tinderboxes.applications "Applications, Misc">
 <!ENTITY tinderstatus.showhide.tinderboxes.localizations "Localizations">
-<!ENTITY tinderstatus.showhide.tinderboxes.info1 "Choose which tinderboxes the options dialog">
-<!ENTITY tinderstatus.showhide.tinderboxes.info2 "offers to watch.">
+<!ENTITY tinderstatus.showhide.tinderboxes.info1 "Choose which trees the options dialog offers to watch.">
+<!ENTITY tinderstatus.showhide.tinderboxes.info2 "">
diff -u8pdNr exten-023/defaults/preferences/tinderstatus.js exten-024/defaults/preferences/tinderstatus.js
--- exten-023/defaults/preferences/tinderstatus.js	2008-06-17 21:58:34.000000000 +0200
+++ exten-024/defaults/preferences/tinderstatus.js	2008-07-04 15:37:30.000000000 +0200
@@ -1,7 +1,7 @@
 pref("extensions.{CE49928A-7804-4688-8C9E-ABCBC7FB9BCF}.description", "chrome://tinderstatus/locale/tinderstatus.properties");
-pref("extensions.tinderstatus.fullList", "Bugzilla,Camino,Firefox,Firefox-Ports,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,XULRunner");
-pref("extensions.tinderstatus.fullList.applications", "Actionmonkey,Bugzilla,Bugzilla2.20,Bugzilla2.22,Bugzilla3.0,Bugzilla3.2,Camino,Firefox,Firefox-Ports,Joey,LeakTest,Mobile,Mozilla1.8,Mozilla1.8-SeaMonkey,Mozilla1.8-Staging,Mozilla1.8.0,Mozilla1.8.0-SeaMonkey,Mozilla2,MozillaExperimental,MozillaRelease,MozillaStaging,MozillaTest,MozillaTry,NSS,NSS-Stable-Branch,SeaMonkey,SeaMonkey-Ports,Sunbird,Sunbird-Mozilla1.8,Testing,Thunderbird,UnitTest,XULRunner");
+pref("extensions.tinderstatus.fullList", "Bugzilla,Camino,Firefox,Firefox-Ports,Firefox3.0,Mozilla2,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,XULRunner");
+pref("extensions.tinderstatus.fullList.applications", "Actionmonkey,Bugzilla,Bugzilla2.20,Bugzilla2.22,Bugzilla3.0,Bugzilla3.2,Camino,Firefox,Firefox-Ports,Firefox3.0,Joey,LeakTest,Mobile,Mozilla1.8,Mozilla1.8-SeaMonkey,Mozilla1.8-Staging,Mozilla1.8.0,Mozilla1.8.0-SeaMonkey,Mozilla2,MozillaExperimental,MozillaRelease,MozillaStaging,MozillaTest,MozillaTry,NSS,NSS-Stable-Branch,SeaMonkey,SeaMonkey-Ports,Sunbird,Sunbird-Mozilla1.8,Testing,Thunderbird,UnitTest,XULRunner");
 pref("extensions.tinderstatus.fullList.localizations", "Mozilla-l10n,Mozilla-l10n-af,Mozilla-l10n-ar,Mozilla-l10n-be,Mozilla-l10n-bg,Mozilla-l10n-bn-IN,Mozilla-l10n-ca,Mozilla-l10n-cs,Mozilla-l10n-da,Mozilla-l10n-de,Mozilla-l10n-el,Mozilla-l10n-en-GB,Mozilla-l10n-en-ZA,Mozilla-l10n-eo,Mozilla-l10n-es-AR,Mozilla-l10n-es-ES,Mozilla-l10n-eu,Mozilla-l10n-fa,Mozilla-l10n-fi,Mozilla-l10n-fr,Mozilla-l10n-fy-NL,Mozilla-l10n-ga-IE,Mozilla-l10n-gu-IN,Mozilla-l10n-he,Mozilla-l10n-hi-IN,Mozilla-l10n-hu,Mozilla-l10n-hy-AM,Mozilla-l10n-id,Mozilla-l10n-it,Mozilla-l10n-ja,Mozilla-l10n-ja-JP-mac,Mozilla-l10n-ka,Mozilla-l10n-kn,Mozilla-l10n-ko,Mozilla-l10n-ku,Mozilla-l10n-lt,Mozilla-l10n-mk,Mozilla-l10n-ml,Mozilla-l10n-mn,Mozilla-l10n-mr,Mozilla-l10n-nb-NO,Mozilla-l10n-ne-NP,Mozilla-l10n-nl,Mozilla-l10n-nn-NO,Mozilla-l10n-pa-IN,Mozilla-l10n-pl,Mozilla-l10n-pt-BR,Mozilla-l10n-pt-PT,Mozilla-l10n-ro,Mozilla-l10n-ru,Mozilla-l10n-rw,Mozilla-l10n-si,Mozilla-l10n-sk,Mozilla-l10n-sl,Mozilla-l10n-sq,Mozilla-l10n-sr,Mozilla-l10n-sv-SE,Mozilla-l10n-ta,Mozilla-l10n-te,Mozilla-l10n-tr,Mozilla-l10n-uk,Mozilla-l10n-zh-CN,Mozilla-l10n-zh-TW,Mozilla1.8-l10n,Mozilla1.8-l10n-af,Mozilla1.8-l10n-ar,Mozilla1.8-l10n-be,Mozilla1.8-l10n-bg,Mozilla1.8-l10n-ca,Mozilla1.8-l10n-cs,Mozilla1.8-l10n-da,Mozilla1.8-l10n-de,Mozilla1.8-l10n-el,Mozilla1.8-l10n-en-GB,Mozilla1.8-l10n-en-ZA,Mozilla1.8-l10n-es-AR,Mozilla1.8-l10n-es-ES,Mozilla1.8-l10n-eu,Mozilla1.8-l10n-fi,Mozilla1.8-l10n-fr,Mozilla1.8-l10n-fy-NL,Mozilla1.8-l10n-ga-IE,Mozilla1.8-l10n-gu-IN,Mozilla1.8-l10n-he,Mozilla1.8-l10n-hu,Mozilla1.8-l10n-hy-AM,Mozilla1.8-l10n-it,Mozilla1.8-l10n-ja,Mozilla1.8-l10n-ja-JP-mac,Mozilla1.8-l10n-ka,Mozilla1.8-l10n-ko,Mozilla1.8-l10n-ku,Mozilla1.8-l10n-lt,Mozilla1.8-l10n-mk,Mozilla1.8-l10n-mn,Mozilla1.8-l10n-nb-NO,Mozilla1.8-l10n-nl,Mozilla1.8-l10n-nn-NO,Mozilla1.8-l10n-nr,Mozilla1.8-l10n-nso,Mozilla1.8-l10n-pa-IN,Mozilla1.8-l10n-pl,Mozilla1.8-l10n-pt-BR,Mozilla1.8-l10n-pt-PT,Mozilla1.8-l10n-ro,Mozilla1.8-l10n-ru,Mozilla1.8-l10n-sk,Mozilla1.8-l10n-sl,Mozilla1.8-l10n-sq,Mozilla1.8-l10n-ss,Mozilla1.8-l10n-st,Mozilla1.8-l10n-sv-SE,Mozilla1.8-l10n-tn,Mozilla1.8-l10n-tr,Mozilla1.8-l10n-ts,Mozilla1.8-l10n-uk,Mozilla1.8-l10n-ve,Mozilla1.8-l10n-xh,Mozilla1.8-l10n-zh-CN,Mozilla1.8-l10n-zh-TW,Mozilla1.8-l10n-zu,Mozilla1.8.0-l10n,Mozilla1.8.0-l10n-ar,Mozilla1.8.0-l10n-bg,Mozilla1.8.0-l10n-ca,Mozilla1.8.0-l10n-cs,Mozilla1.8.0-l10n-da,Mozilla1.8.0-l10n-de,Mozilla1.8.0-l10n-el,Mozilla1.8.0-l10n-en-GB,Mozilla1.8.0-l10n-es-AR,Mozilla1.8.0-l10n-es-ES,Mozilla1.8.0-l10n-eu,Mozilla1.8.0-l10n-fi,Mozilla1.8.0-l10n-fr,Mozilla1.8.0-l10n-fy-NL,Mozilla1.8.0-l10n-ga-IE,Mozilla1.8.0-l10n-gu-IN,Mozilla1.8.0-l10n-he,Mozilla1.8.0-l10n-hu,Mozilla1.8.0-l10n-hy-AM,Mozilla1.8.0-l10n-it,Mozilla1.8.0-l10n-ja,Mozilla1.8.0-l10n-ja-JP-mac,Mozilla1.8.0-l10n-ko,Mozilla1.8.0-l10n-lt,Mozilla1.8.0-l10n-mk,Mozilla1.8.0-l10n-mn,Mozilla1.8.0-l10n-nb-NO,Mozilla1.8.0-l10n-nl,Mozilla1.8.0-l10n-nn-NO,Mozilla1.8.0-l10n-pa-IN,Mozilla1.8.0-l10n-pl,Mozilla1.8.0-l10n-pt-BR,Mozilla1.8.0-l10n-ro,Mozilla1.8.0-l10n-ru,Mozilla1.8.0-l10n-sk,Mozilla1.8.0-l10n-sl,Mozilla1.8.0-l10n-sq,Mozilla1.8.0-l10n-sv-SE,Mozilla1.8.0-l10n-tr,Mozilla1.8.0-l10n-zh-CN,Mozilla1.8.0-l10n-zh-TW");
-pref("extensions.tinderstatus.watchList", "Firefox,SeaMonkey,Thunderbird,XULRunner,Camino");
+pref("extensions.tinderstatus.watchList", "Camino,Firefox,Mozilla2,SeaMonkey,Thunderbird,XULRunner");
 pref("extensions.tinderstatus.gotoTree", "Firefox");
 pref("extensions.tinderstatus.refreshTime", 1);
diff -u8pdNr exten-023/install.js exten-024/install.js
--- exten-023/install.js	2008-06-17 22:07:00.000000000 +0200
+++ exten-024/install.js	2008-07-04 15:26:36.000000000 +0200
@@ -1,9 +1,9 @@
-initInstall("Tinderstatus Extended", "/mozdev/tinderstatus", "0.2.3");
+initInstall("Tinderstatus Extended", "/mozdev/tinderstatus", "0.2.4");
 
 var chromeDir = getFolder("Profile", "chrome");
 
 // Specify the directory into which we're going to install the extension.
 var installDir = getFolder(chromeDir, "tinderstatus");
 setPackageFolder(installDir);
 
 // Specify the directory into which we're going to install the content files,
diff -u8pdNr exten-023/install.rdf exten-024/install.rdf
--- exten-023/install.rdf	2008-06-17 22:07:10.000000000 +0200
+++ exten-024/install.rdf	2008-07-04 15:26:52.000000000 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
     <em:name>Tinderstatus Extended</em:name>
     <em:id>{CE49928A-7804-4688-8C9E-ABCBC7FB9BCF}</em:id>
-    <em:version>0.2.3</em:version>
+    <em:version>0.2.4</em:version>
 
     <em:description>icon showing the status of Mozilla tinderboxen</em:description>
     <em:creator>Myk Melez</em:creator>
     <em:contributor>Alex Vincent</em:contributor>
     <em:contributor>Mark Banner</em:contributor>
     <em:contributor>Frédéric Buclin</em:contributor>
     <em:homepageURL>http://tinderstatus.mozdev.org/</em:homepageURL>
     <em:optionsURL>chrome://tinderstatus/content/prefs.xul</em:optionsURL>