diff --git a/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html
index f6e9fee86..6c3c8c278 100644
--- a/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html
+++ b/web/pgadmin/dashboard/templates/dashboard/database_dashboard.html
@@ -2,12 +2,12 @@
     <div class="row">
         <div class="col-xs-6">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Database sessions') }}</legend>
+                <legend class="badge">{{ _('Database sessions') }}</legend>
             </div>
         </div>
         <div class="col-xs-6">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Transactions per second') }}</legend>
+                <legend class="badge">{{ _('Transactions per second') }}</legend>
             </div>
         </div>
     </div>
@@ -23,17 +23,17 @@
     <div class="row dashboard-header-spacer">
         <div class="col-xs-4">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Tuples in') }}</legend>
+                <legend class="badge">{{ _('Tuples in') }}</legend>
             </div>
         </div>
         <div class="col-xs-4">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Tuples out') }}</legend>
+                <legend class="badge">{{ _('Tuples out') }}</legend>
             </div>
         </div>
         <div class="col-xs-4">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Block I/O') }}</legend>
+                <legend class="badge">{{ _('Block I/O') }}</legend>
             </div>
         </div>
     </div>
@@ -53,7 +53,7 @@
     <div class="row dashboard-header-spacer">
         <div class="col-xs-12">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Database activity') }}</legend>
+                <legend class="badge">{{ _('Database activity') }}</legend>
             </div>
         </div>
     </div>
@@ -64,35 +64,35 @@
                 <ul class="nav nav-tabs dashboard-tab-panel" role="tablist">
                     <li role="presentation" class="active dashboard-tab"><a href="#tab_panel_database_activity"
                                                                             aria-controls="tab_database_activity"
-                                                                            role="tab" data-toggle="tab">{{ gettext('Sessions') }}</a>
+                                                                            role="tab" data-toggle="tab">{{ _('Sessions') }}</a>
                     </li>
                     <li role="presentation" class="dashboard-tab"><a href="#tab_panel_database_locks"
                                                                      aria-controls="tab_database_locks" role="tab"
-                                                                     data-toggle="tab">{{ gettext('Locks') }}</a></li>
+                                                                     data-toggle="tab">{{ _('Locks') }}</a></li>
                     <li role="presentation" class="dashboard-tab"><a href="#tab_panel_database_prepared"
                                                                      aria-controls="tab_database_prepared" role="tab"
-                                                                     data-toggle="tab">{{ gettext('Prepared Transactions') }}</a></li>
+                                                                     data-toggle="tab">{{ _('Prepared Transactions') }}</a></li>
                 </ul>
 
                 <!-- Tab panes -->
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="tab_panel_database_activity">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_database_activity_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_database_activity_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="database_activity_filter"></div>
                         </div>
                         <div id="database_activity" class="grid-container"></div>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tab_panel_database_locks">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_database_locks_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_database_locks_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="database_locks_filter"></div>
                         </div>
                         <div id="database_locks" class="grid-container"></div>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tab_panel_database_prepared">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_database_prepared_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_database_prepared_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="database_prepared_filter"></div>
                         </div>
                         <div id="database_prepared" class="grid-container"></div>
diff --git a/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html
index 066873c98..5b217d4fc 100644
--- a/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html
+++ b/web/pgadmin/dashboard/templates/dashboard/server_dashboard.html
@@ -2,12 +2,12 @@
     <div class="row">
         <div class="col-xs-6">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Server sessions') }}</legend>
+                <legend class="badge">{{ _('Server sessions') }}</legend>
             </div>
         </div>
         <div class="col-xs-6">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Transactions per second') }}</legend>
+                <legend class="badge">{{ _('Transactions per second') }}</legend>
             </div>
         </div>
     </div>
@@ -23,17 +23,17 @@
     <div class="row dashboard-header-spacer">
         <div class="col-xs-4">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Tuples in') }}</legend>
+                <legend class="badge">{{ _('Tuples in') }}</legend>
             </div>
         </div>
         <div class="col-xs-4">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Tuples out') }}</legend>
+                <legend class="badge">{{ _('Tuples out') }}</legend>
             </div>
         </div>
         <div class="col-xs-4">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Block I/O') }}</legend>
+                <legend class="badge">{{ _('Block I/O') }}</legend>
             </div>
         </div>
     </div>
@@ -53,7 +53,7 @@
     <div class="row dashboard-header-spacer">
         <div class="col-xs-12">
             <div class="obj_properties">
-                <legend class="badge">{{ gettext('Server activity') }}</legend>
+                <legend class="badge">{{ _('Server activity') }}</legend>
             </div>
         </div>
     </div>
@@ -64,45 +64,45 @@
                 <ul class="nav nav-tabs dashboard-tab-panel" role="tablist">
                     <li role="presentation" class="active dashboard-tab"><a href="#tab_panel_server_activity"
                                                                             aria-controls="tab_server_activity"
-                                                                            role="tab" data-toggle="tab">{{ gettext('Sessions') }}</a>
+                                                                            role="tab" data-toggle="tab">{{ _('Sessions') }}</a>
                     </li>
                     <li role="presentation" class="dashboard-tab"><a href="#tab_panel_server_locks"
                                                                      aria-controls="tab_server_locks" role="tab"
-                                                                     data-toggle="tab">{{ gettext('Locks') }}</a></li>
+                                                                     data-toggle="tab">{{ _('Locks') }}</a></li>
                     <li role="presentation" class="dashboard-tab"><a href="#tab_panel_server_prepared"
                                                                      aria-controls="tab_server_prepared" role="tab"
-                                                                     data-toggle="tab">{{ gettext('Prepared Transactions') }}</a></li>
+                                                                     data-toggle="tab">{{ _('Prepared Transactions') }}</a></li>
                     <li role="presentation" class="dashboard-tab"><a href="#tab_panel_server_config"
                                                                      aria-controls="tab_server_config" role="tab"
-                                                                     data-toggle="tab">{{ gettext('Configuration') }}</a></li>
+                                                                     data-toggle="tab">{{ _('Configuration') }}</a></li>
                 </ul>
 
                 <!-- Tab panes -->
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="tab_panel_server_activity">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_server_activity_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_server_activity_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="server_activity_filter"></div>
                         </div>
                         <div id="server_activity" class="grid-container"></div>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tab_panel_server_locks">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_server_locks_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_server_locks_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="server_locks_filter"></div>
                         </div>
                         <div id="server_locks" class="grid-container"></div>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tab_panel_server_prepared">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_server_prepared_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_server_prepared_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="server_prepared_filter"></div>
                         </div>
                         <div id="server_prepared" class="grid-container"></div>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tab_panel_server_config">
                         <div class="dashboard-tab-btn-group pg-prop-btn-group-above">
-                            <button id="btn_server_config_refresh" type="button" class="btn btn-default" title="{{ gettext('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
+                            <button id="btn_server_config_refresh" type="button" class="btn btn-default" title="{{ _('Refresh') }}"> <span class="fa fa-lg fa-refresh"></span></button>
                             <div id="server_config_filter"></div>
                         </div>
                         <div id="server_config" class="grid-container"></div>
diff --git a/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html b/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
index 093f827e5..ab8a75b4f 100644
--- a/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
+++ b/web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
@@ -6,12 +6,9 @@
             </div>
             <div class="well well-lg">
                 <img src="{{ url_for('dashboard.static', filename='img/welcome_logo.png') }}" alt="pgAdmin 4">
-                <h4>Feature rich | Maximises PostgreSQL | Open Source </h4>
+                <h4>{{ _('Feature rich') }} | {{ _('Maximises PostgreSQL') }} | {{ _('Open Source') }} </h4>
                 <p>
-                    pgAdmin is an open source administration and management tool for the PostgreSQL
-                    database. The tools include a graphical administration interface, an SQL query
-                    tool, a procedural code debugger and much more. The tool is designed to answer
-                    the needs of developers, DBAs and system administrators alike.
+                    {{ _('pgAdmin is an open source administration and management tool for the PostgreSQL database. The tools include a graphical administration interface, an SQL query tool, a procedural code debugger and much more. The tool is designed to answer the needs of developers, DBAs and system administrators alike.') }}
                 </p>
             </div>
         </div>
@@ -19,21 +16,21 @@
     <div class="row">
         <div class="col-xs-12">
             <div class="obj_properties">
-                <legend class="badge">Quick Links</legend>
+                <legend class="badge">{{ _('Quick Links') }}</legend>
             </div>
             <div class="well well-lg">
                 <div class="row">
                     <div class="col-xs-6 dashboard-link">
                         <a onclick="pgAdmin.Dashboard.add_new_server()">
                             <span class="fa fa-4x dashboard-icon fa-server" aria-hidden="true"></span><br/>
-                            Add New Server
+                            {{ _('Add New Server') }}
                         </a>
                     </div>
                     <div class="col-xs-6 dashboard-link">
                         <a onclick="pgAdmin.Preferences.show()">
                             <span id="mnu_preferences" class="fa fa-4x dashboard-icon fa-cogs"
                                   aria-hidden="true"></span><br/>
-                            Configure pgAdmin
+                            {{ _('Configure pgAdmin') }}
                         </a>
                     </div>
                 </div>
@@ -44,32 +41,32 @@
     <div class="row">
         <div class="col-xs-12">
             <div class="obj_properties">
-                <legend class="badge">Getting Started</legend>
+                <legend class="badge">{{ _('Getting Started') }}</legend>
             </div>
             <div class="well well-lg">
                 <div class="row">
                     <div class="col-xs-3 dashboard-link">
                         <a href="http://www.postgresql.org/docs" target="_new">
                             <span class="fa fa-4x dashboard-icon icon-postgres" aria-hidden="true"></span><br/>
-                            PostgreSQL Documentation
+                            {{ _('PostgreSQL Documentation') }}
                         </a>
                     </div>
                     <div class="col-xs-3 dashboard-link">
                         <a href="https://www.pgadmin.org" target="_new">
                             <span class="fa fa-4x dashboard-icon fa-globe" aria-hidden="true"></span><br/>
-                            pgAdmin Website
+                            {{ _('pgAdmin Website') }}
                         </a>
                     </div>
                     <div class="col-xs-3 dashboard-link">
                         <a href="http://planet.postgresql.org" target="_new">
                             <span class="fa fa-4x dashboard-icon fa-book" aria-hidden="true"></span><br/>
-                            Planet PostgreSQL
+                            {{ _('Planet PostgreSQL') }}
                         </a>
                     </div>
                     <div class="col-xs-3 dashboard-link">
                         <a href="http://www.postgresql.org/community" target="_new">
                             <span class="fa fa-4x dashboard-icon fa-users" aria-hidden="true"></span><br/>
-                            Community Support
+                            {{ _('Community Support') }}
                         </a>
                     </div>
                 </div>
diff --git a/web/pgadmin/messages.pot b/web/pgadmin/messages.pot
index f792d1f12..2a0f3c49c 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: 2016-11-14 11:51+0000\n"
+"POT-Creation-Date: 2016-11-14 12:03+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"
@@ -6548,6 +6548,60 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:9
+msgid "Feature rich"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:9
+msgid "Maximises PostgreSQL"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:9
+msgid "Open Source"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:11
+msgid ""
+"pgAdmin is an open source administration and management tool for the "
+"PostgreSQL database. The tools include a graphical administration "
+"interface, an SQL query tool, a procedural code debugger and much more. "
+"The tool is designed to answer the needs of developers, DBAs and system "
+"administrators alike."
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:19
+msgid "Quick Links"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:26
+msgid "Add New Server"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:33
+msgid "Configure pgAdmin"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:44
+msgid "Getting Started"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:51
+msgid "PostgreSQL Documentation"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:57
+#: pgadmin/help/__init__.py:35 pgadmin/help/__init__.py:60
+msgid "pgAdmin Website"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:63
+msgid "Planet PostgreSQL"
+msgstr ""
+
+#: pgadmin/dashboard/templates/dashboard/welcome_dashboard.html:69
+msgid "Community Support"
+msgstr ""
+
 #: pgadmin/dashboard/templates/dashboard/js/dashboard.js:44
 #: pgadmin/dashboard/templates/dashboard/js/dashboard.js:117
 msgid "An error occurred whilst loading the dashboard."
@@ -6745,10 +6799,6 @@ msgstr ""
 msgid "Online Help"
 msgstr ""
 
-#: pgadmin/help/__init__.py:35 pgadmin/help/__init__.py:60
-msgid "pgAdmin Website"
-msgstr ""
-
 #: pgadmin/help/__init__.py:42 pgadmin/help/__init__.py:67
 msgid "PostgreSQL Website"
 msgstr ""