Merge branch 'master' of github.com:gluster/console

6 files changed, 12 insertions, 4 deletions

diff --git a/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
index fcb162c1..30589606 100644
--- a/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
@@ -27,3 +27,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
+Bundle-Localization: plugin
diff --git a/src/com.gluster.storage.management.console/plugin.properties b/src/com.gluster.storage.management.console/plugin.properties
new file mode 100644
index 00000000..1efd6934
--- /dev/null
+++ b/src/com.gluster.storage.management.console/plugin.properties
@@ -0,0 +1,6 @@
+aboutText=Gluster Management Console\n\
+Version: 1.0.0\n\n\
+(c) Copyright Gluster, Inc. 2011.  All rights reserved.\n\
+Visit http://www.gluster.com/\n\n\
+This product includes software developed by the\n\
+Eclipse Foundation http://eclipse.org/
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 7f14ef9b..9e799d49 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -385,7 +385,7 @@
             name="Gluster Management Console">
          <property
                name="aboutText"
-               value="GlusterFS is an open source clustered storage solution. The software is a powerful and flexible solution that simplifies the task of managing unstructured file data whether you have a few terabytes of storage or multiple petabytes. Gluster Management Console is a powerful GUI management interface for the GlusterFS.">
+               value="%aboutText">
          </property>
          <property
                name="windowImages"
@@ -393,7 +393,7 @@
          </property>
          <property
                name="aboutImage"
-               value="splash/gluster_about.jpg">
+               value="splash/gluster-about.png">
          </property>
          <property
                name="appName"
@@ -509,7 +509,7 @@
                icon="icons/tango/32x32/replace-brick.png"
                id="com.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Brick"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
diff --git a/src/com.gluster.storage.management.console/preferences.ini b/src/com.gluster.storage.management.console/preferences.ini
index 04afab80..7053b209 100644
--- a/src/com.gluster.storage.management.console/preferences.ini
+++ b/src/com.gluster.storage.management.console/preferences.ini
@@ -1,2 +1,3 @@
 org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.console.KeyConfig
-org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html
\ No newline at end of file
+org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html
+IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP=true
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/splash/gluster-about.png b/src/com.gluster.storage.management.console/splash/gluster-about.png
new file mode 100644
index 00000000..9518b2b2
--- /dev/null
+++ b/src/com.gluster.storage.management.console/splash/gluster-about.png
diff --git a/src/com.gluster.storage.management.console/splash/gluster_about.jpg b/src/com.gluster.storage.management.console/splash/gluster_about.jpg
deleted file mode 100644
index 242fa560..00000000
--- a/src/com.gluster.storage.management.console/splash/gluster_about.jpg
+++ /dev/null