diff --git a/web/babel.cfg b/web/babel.cfg
index f0234b326..4b12a8274 100644
--- a/web/babel.cfg
+++ b/web/babel.cfg
@@ -1,3 +1,4 @@
 [python: **.py]
 [jinja2: **/templates/**.html]
+[jinja2: **/templates/**.js]
 extensions=jinja2.ext.autoescape,jinja2.ext.with_
diff --git a/web/pgadmin/browser/templates/browser/js/browser.js b/web/pgadmin/browser/templates/browser/js/browser.js
index c29c78c27..3684eccec 100644
--- a/web/pgadmin/browser/templates/browser/js/browser.js
+++ b/web/pgadmin/browser/templates/browser/js/browser.js
@@ -15,7 +15,7 @@ $(window).bind('unload', function() {
 });
 
 // Build a regular dock panel
-function buildPanel(docker, name, width, height, showTitle, isCloseable, isPrivate, content) {
+function buildPanel(docker, name, title, width, height, showTitle, isCloseable, isPrivate, content) {
     docker.registerPanelType(name, {
         isPrivate: isPrivate,
         onCreate: function(myPanel) {
@@ -23,6 +23,8 @@ function buildPanel(docker, name, width, height, showTitle, isCloseable, isPriva
             
             if (showTitle == false) 
                 myPanel.title(false);
+            else
+                myPanel.title(title);
 
             myPanel.closeable(isCloseable);
 
@@ -32,7 +34,7 @@ function buildPanel(docker, name, width, height, showTitle, isCloseable, isPriva
 }
 
 // Build an iFrame dock panel
-function buildIFramePanel(docker, name, width, height, showTitle, isCloseable, isPrivate, url) {
+function buildIFramePanel(docker, name, title, width, height, showTitle, isCloseable, isPrivate, url) {
     docker.registerPanelType(name, {
         isPrivate: isPrivate,
         onCreate: function(myPanel) {
@@ -40,6 +42,8 @@ function buildIFramePanel(docker, name, width, height, showTitle, isCloseable, i
             
             if (showTitle == false) 
                 myPanel.title(false);
+            else
+                myPanel.title(title);
                 
             myPanel.closeable(isCloseable);
 
@@ -82,27 +86,27 @@ WITH ( \n\
 ALTER TABLE tickets_detail \n\
   OWNER TO helpdesk;\n';
   
-        buildPanel(docker, 'SQL', 500, 200, false, false, true, 
+        buildPanel(docker, 'sql', '{{ _('SQL') }}', 500, 200, false, false, true, 
                   '<textarea id="sql-textarea" name="sql-textarea">' + demoSql + '</textarea>')
-        buildPanel(docker, 'Browser', 300, 600, false, false, true, 
+        buildPanel(docker, 'browser', '{{ _('Browser') }}', 300, 600, false, false, true, 
                   '<div id="tree" class="aciTree">')
-        buildIFramePanel(docker, 'Dashboard', 500, 600, true, false, true, 
+        buildIFramePanel(docker, 'dashboard', '{{ _('Dashboard') }}', 500, 600, true, false, true, 
                   'http://www.pgadmin.org/')
-        buildPanel(docker, 'Properties', 500, 600, true, false, true, 
+        buildPanel(docker, 'properties', '{{ _('Properties') }}', 500, 600, true, false, true, 
                   '<p>Properties pane</p>')
-        buildPanel(docker, 'Statistics', 500, 600, true, false, true, 
+        buildPanel(docker, 'statistics', '{{ _('Statistics') }}', 500, 600, true, false, true, 
                   '<p>Statistics pane</p>')
-        buildPanel(docker, 'Dependencies', 500, 600, true, false, true, 
+        buildPanel(docker, 'dependencies', '{{ _('Dependencies') }}', 500, 600, true, false, true, 
                   '<p>Depedencies pane</p>')
-        buildPanel(docker, 'Dependents', 500, 600, true, false, true, 
+        buildPanel(docker, 'dependents', '{{ _('Dependents') }}', 500, 600, true, false, true, 
                   '<p>Dependents pane</p>')
         
         // Some useful panels
-        buildIFramePanel(docker, 'Online Help', 500, 600, true, true, false, 
+        buildIFramePanel(docker, 'online_help', '{{ _('Online Help') }}', 500, 600, true, true, false, 
                          '{{ url_for('help.static', filename='index.html') }}')
-        buildIFramePanel(docker, 'pgAdmin Website', 500, 600, true, true, false, 
+        buildIFramePanel(docker, 'pgadmin_website', '{{ _('pgAdmin Website') }}', 500, 600, true, true, false, 
                          'http://www.pgadmin.org/')
-        buildIFramePanel(docker, 'PostgreSQL Website', 500, 600, true, true, false, 
+        buildIFramePanel(docker, 'postgresql_website', '{{ _('PostgreSQL Website') }}', 500, 600, true, true, false, 
                          'http://www.postgresql.org/')
 
         var layout = '{{ layout }}';
@@ -111,13 +115,13 @@ ALTER TABLE tickets_detail \n\
         if (layout != '') {
             docker.restore(layout)
         } else {
-            var dashboardPanel = docker.addPanel('Dashboard', wcDocker.DOCK_TOP, propertiesPanel);
-            var propertiesPanel = docker.addPanel('Properties', wcDocker.DOCK_STACKED, dashboardPanel);
-            var statisticsPanel = docker.addPanel('Statistics', wcDocker.DOCK_STACKED, dashboardPanel);
-            var dependenciesPanel = docker.addPanel('Dependencies', wcDocker.DOCK_STACKED, dashboardPanel);
-            var dependentsPanel = docker.addPanel('Dependents', wcDocker.DOCK_STACKED, dashboardPanel);
-            var sqlPanel = docker.addPanel('SQL', wcDocker.DOCK_BOTTOM, sqlPanel);
-            var browserPanel = docker.addPanel('Browser', wcDocker.DOCK_LEFT, browserPanel);
+            var dashboardPanel = docker.addPanel('dashboard', wcDocker.DOCK_TOP, propertiesPanel);
+            var propertiesPanel = docker.addPanel('properties', wcDocker.DOCK_STACKED, dashboardPanel);
+            var statisticsPanel = docker.addPanel('statistics', wcDocker.DOCK_STACKED, dashboardPanel);
+            var dependenciesPanel = docker.addPanel('dependencies', wcDocker.DOCK_STACKED, dashboardPanel);
+            var dependentsPanel = docker.addPanel('dependents', wcDocker.DOCK_STACKED, dashboardPanel);
+            var sqlPanel = docker.addPanel('sql', wcDocker.DOCK_BOTTOM, sqlPanel);
+            var browserPanel = docker.addPanel('browser', wcDocker.DOCK_LEFT, browserPanel);
         }
     }
     
diff --git a/web/pgadmin/messages.pot b/web/pgadmin/messages.pot
index 5a5e4660b..82614528e 100644
--- a/web/pgadmin/messages.pot
+++ b/web/pgadmin/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-25 16:30+0000\n"
+"POT-Creation-Date: 2015-03-03 10:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -80,24 +80,28 @@ msgstr ""
 msgid "No server group was specified."
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:11
-msgid "Dashboard"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:4
+msgid "Add a server group"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:12
-msgid "Properties"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:5
+msgid "Enter a name for the new server group"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:13
-msgid "Statistics"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:37
+msgid "Delete server group?"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:14
-msgid "Dependencies"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:38
+msgid "Are you sure you wish to delete the server group \"{0}\"?"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:15
-msgid "Dependents"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:65
+msgid "Rename server group"
+msgstr ""
+
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:66
+msgid "Enter a new name for the server group"
 msgstr ""
 
 #: pgadmin/browser/templates/browser/index.html:8
@@ -133,6 +137,58 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
+#: pgadmin/browser/templates/browser/js/browser.js:89
+msgid "SQL"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:91
+msgid "Browser"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:93
+msgid "Dashboard"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:95
+msgid "Properties"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:97
+msgid "Statistics"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:99
+msgid "Dependencies"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:101
+msgid "Dependents"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:105
+msgid "Online Help"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:107
+msgid "pgAdmin Website"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:109
+msgid "PostgreSQL Website"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:173
+msgid "Error message"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:187
+msgid "Additional info"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:201
+msgid "An error has occurred"
+msgstr ""
+
 #: pgadmin/help/hooks.py:21
 msgid "Contents"
 msgstr ""
@@ -171,10 +227,6 @@ msgstr ""
 msgid "Forgotten your <a href=\"%(url)s\">password</a>?"
 msgstr ""
 
-#: pgadmin/templates/security/messages.html:6
-msgid "Close"
-msgstr ""
-
 #: pgadmin/templates/security/reset_password.html:2
 #, python-format
 msgid "%(appname)s Password Reset"
diff --git a/web/pgadmin/static/js/wcDocker/panel.js b/web/pgadmin/static/js/wcDocker/panel.js
index 2af027df1..9774c6782 100755
--- a/web/pgadmin/static/js/wcDocker/panel.js
+++ b/web/pgadmin/static/js/wcDocker/panel.js
@@ -606,7 +606,7 @@ wcPanel.prototype = {
     var data = {};
     data.type = 'wcPanel';
     data.panelType = this._type;
-    data.title = this._title;
+    // data.title = this._title;
     // data.minSize = {
     //   x: this._minSize.x,
     //   y: this._minSize.y,
@@ -629,7 +629,7 @@ wcPanel.prototype = {
 
   // Restores a previously saved configuration.
   __restore: function(data, docker) {
-    this._title = data.title;
+    // this._title = data.title;
     // this._minSize.x = data.minSize.x;
     // this._minSize.y = data.minSize.y;
     // this._maxSize.x = data.maxSize.x;
diff --git a/web/pgadmin/translations/fr/LC_MESSAGES/messages.mo b/web/pgadmin/translations/fr/LC_MESSAGES/messages.mo
index eaa998f6a..2f8a96bfb 100644
Binary files a/web/pgadmin/translations/fr/LC_MESSAGES/messages.mo and b/web/pgadmin/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/web/pgadmin/translations/fr/LC_MESSAGES/messages.po b/web/pgadmin/translations/fr/LC_MESSAGES/messages.po
index 7eec5ddcc..90e64ed7d 100644
--- a/web/pgadmin/translations/fr/LC_MESSAGES/messages.po
+++ b/web/pgadmin/translations/fr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-25 16:30+0000\n"
+"POT-Creation-Date: 2015-03-03 10:50+0000\n"
 "PO-Revision-Date: 2015-02-25 17:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr <LL@li.org>\n"
@@ -81,24 +81,28 @@ msgstr ""
 msgid "No server group was specified."
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:11
-msgid "Dashboard"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:4
+msgid "Add a server group"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:12
-msgid "Properties"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:5
+msgid "Enter a name for the new server group"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:13
-msgid "Statistics"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:37
+msgid "Delete server group?"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:14
-msgid "Dependencies"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:38
+msgid "Are you sure you wish to delete the server group \"{0}\"?"
 msgstr ""
 
-#: pgadmin/browser/templates/browser/body.html:15
-msgid "Dependents"
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:65
+msgid "Rename server group"
+msgstr ""
+
+#: pgadmin/browser/nodes/server_groups/templates/server_groups/server_groups.js:66
+msgid "Enter a new name for the server group"
 msgstr ""
 
 #: pgadmin/browser/templates/browser/index.html:8
@@ -134,6 +138,58 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
+#: pgadmin/browser/templates/browser/js/browser.js:89
+msgid "SQL"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:91
+msgid "Browser"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:93
+msgid "Dashboard"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:95
+msgid "Properties"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:97
+msgid "Statistics"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:99
+msgid "Dependencies"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:101
+msgid "Dependents"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:105
+msgid "Online Help"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:107
+msgid "pgAdmin Website"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:109
+msgid "PostgreSQL Website"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:173
+msgid "Error message"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:187
+msgid "Additional info"
+msgstr ""
+
+#: pgadmin/browser/templates/browser/js/browser.js:201
+msgid "An error has occurred"
+msgstr ""
+
 #: pgadmin/help/hooks.py:21
 msgid "Contents"
 msgstr ""
@@ -172,10 +228,6 @@ msgstr ""
 msgid "Forgotten your <a href=\"%(url)s\">password</a>?"
 msgstr ""
 
-#: pgadmin/templates/security/messages.html:6
-msgid "Close"
-msgstr ""
-
 #: pgadmin/templates/security/reset_password.html:2
 #, python-format
 msgid "%(appname)s Password Reset"
@@ -209,3 +261,6 @@ msgstr ""
 msgid "Test Notifier"
 msgstr ""
 
+#~ msgid "Close"
+#~ msgstr ""
+