Merge branch 'release-0.0.2'0.0.2

5 files changed, 2 insertions, 9 deletions

diff --git a/chrome/content/.gitignore b/chrome/content/.gitignore
deleted file mode 100644
index 3fec32c..0000000
--- a/chrome/content/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tmp/
diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js
index b2b533f..da49536 100644
--- a/chrome/content/accountWizard/accountWizard.js
+++ b/chrome/content/accountWizard/accountWizard.js
@@ -28,7 +28,6 @@ Cu.import("resource:///modules/gloda/log4moz.js");
 let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
 
 var gStringsBundle;
-var gMessengerBundle;
 var gBrandShortName;
 
 function e(elementID)
@@ -125,8 +124,7 @@ BitmaskAccountWizard.prototype =
 
     gEmailWizardLogger.info("Email account setup dialog loaded.");
 
-    gStringsBundle = e("strings");
-    gMessengerBundle = e("bundle_messenger");
+    gStringsBundle = e("accountCreationStrings");
     gBrandShortName = e("bundle_brand").getString("brandShortName");
 
     // admin-locked prefs hurray
diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul
index 0d42c0d..f9ff6f4 100644
--- a/chrome/content/accountWizard/accountWizard.xul
+++ b/chrome/content/accountWizard/accountWizard.xul
@@ -31,12 +31,8 @@
   <stringbundleset>
     <stringbundle id="bundle_brand"
           src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="strings"
+    <stringbundle id="accountCreationStrings"
           src="chrome://messenger/locale/accountCreation.properties"/>
-    <stringbundle id="utilstrings"
-          src="chrome://messenger/locale/accountCreationUtil.properties"/>
-    <stringbundle id="bundle_messenger"
-          src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
   <script type="application/javascript"
           src="chrome://bitmask/content/serverConfig.js"/>
diff --git a/chrome/content/logo-small.png b/chrome/content/logo-small.png
new file mode 100644
index 0000000..0f29cd1
--- /dev/null
+++ b/chrome/content/logo-small.png
diff --git a/chrome/content/logo.png b/chrome/content/logo.png
new file mode 100644
index 0000000..fdb2be0
--- /dev/null
+++ b/chrome/content/logo.png