diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js
index 14830341..e58268cf 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js
@@ -38,18 +38,18 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           pgBrowser.add_menus([{
             name: 'create_cast_on_database', node: 'database', module: this,
             applies: ['object', 'context'], callback: 'show_obj_properties',
-            category: 'create', priority: 4, label: '{{ _('Cast...') }}',
+            category: 'create', priority: 4, label: '{{ _('Cast ...') }}',
             icon: 'wcTabIcon icon-cast', data: {action: 'create'},
             enable: pgBrowser.Nodes['database'].is_conn_allow
           },{
             name: 'create_cast_on_coll', node: 'coll-cast', module: this,
             applies: ['object', 'context'], callback: 'show_obj_properties',
-            category: 'create', priority: 4, label: '{{ _('Cast...') }}',
+            category: 'create', priority: 4, label: '{{ _('Cast ...') }}',
             icon: 'wcTabIcon icon-cast', data: {action: 'create'}
           },{
             name: 'create_cast', node: 'cast', module: this,
             applies: ['object', 'context'], callback: 'show_obj_properties',
-            category: 'create', priority: 4, label: '{{ _('Cast...') }}',
+            category: 'create', priority: 4, label: '{{ _('Cast ...') }}',
             icon: 'wcTabIcon icon-cast', data: {action: 'create'}
           }]);
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
index 3a5a259d..3010f2f8 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js
@@ -35,17 +35,17 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_event_trigger_on_coll', node: 'coll-event_trigger', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Event Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Event Trigger ...') }}',
           icon: 'wcTabIcon icon-event_trigger', data: {action: 'create'}
         },{
           name: 'create_event_trigger', node: 'event_trigger', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Event Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Event Trigger ...') }}',
           icon: 'wcTabIcon icon-event_trigger', data: {action: 'create'}
         },{
           name: 'create_event_trigger', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Event Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Event Trigger ...') }}',
           icon: 'wcTabIcon icon-event_trigger', data: {action: 'create'},
           enable: pgBrowser.Nodes['database'].is_conn_allow
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js
index 14e65e34..b4f72eb6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js
@@ -61,17 +61,17 @@ function($, _, S, pgAdmin, pgBrowser) {
         pgBrowser.add_menus([{
           name: 'create_extension_on_coll', node: 'coll-extension', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Extension...') }}',
+          category: 'create', priority: 4, label: '{{ _('Extension ...') }}',
           icon: 'wcTabIcon icon-extension', data: {action: 'create'}
         },{
           name: 'create_extension', node: 'extension', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Extension...') }}',
+          category: 'create', priority: 4, label: '{{ _('Extension ...') }}',
           icon: 'wcTabIcon icon-extension', data: {action: 'create'}
         },{
           name: 'create_extension', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Extension...') }}',
+          category: 'create', priority: 4, label: '{{ _('Extension ...') }}',
           icon: 'wcTabIcon icon-extension', data: {action: 'create'},
           enable: pgBrowser.Nodes['database'].is_conn_allow
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js
index 1d1bf1a8..e137681c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js
@@ -73,17 +73,17 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_foreign_server_on_coll', node: 'coll-foreign_server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Server...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Server ...') }}',
           icon: 'wcTabIcon icon-foreign_server', data: {action: 'create'}
         },{
           name: 'create_foreign_server', node: 'foreign_server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Server...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Server ...') }}',
           icon: 'wcTabIcon icon-foreign_server', data: {action: 'create'}
         },{
           name: 'create_foreign_server', node: 'foreign_data_wrapper', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Server...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Server ...') }}',
           icon: 'wcTabIcon icon-foreign_server', data: {action: 'create'}
         }
         ]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js
index 43f2fb88..237ab7f7 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js
@@ -73,17 +73,17 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_user_mapping_on_coll', node: 'coll-user_mapping', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('User Mapping...') }}',
+          category: 'create', priority: 4, label: '{{ _('User Mapping ...') }}',
           icon: 'wcTabIcon icon-user_mapping', data: {action: 'create'}
         },{
           name: 'create_user_mapping', node: 'user_mapping', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('User Mapping...') }}',
+          category: 'create', priority: 4, label: '{{ _('User Mapping ...') }}',
           icon: 'wcTabIcon icon-user_mapping', data: {action: 'create'}
         },{
           name: 'create_user_mapping', node: 'foreign_server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('User Mapping...') }}',
+          category: 'create', priority: 4, label: '{{ _('User Mapping ...') }}',
           icon: 'wcTabIcon icon-user_mapping', data: {action: 'create'}
         }
         ]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js
index e3639fb6..74c6f86f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js
@@ -76,17 +76,17 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_foreign_data_wrapper_on_coll', node: 'coll-foreign_data_wrapper', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Data Wrapper...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Data Wrapper ...') }}',
           icon: 'wcTabIcon icon-foreign_data_wrapper', data: {action: 'create'}
         },{
           name: 'create_foreign_data_wrapper', node: 'foreign_data_wrapper', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Data Wrapper...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Data Wrapper ...') }}',
           icon: 'wcTabIcon icon-foreign_data_wrapper', data: {action: 'create'}
         },{
           name: 'create_foreign_data_wrapper', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Data Wrapper...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Data Wrapper ...') }}',
           icon: 'wcTabIcon icon-foreign_data_wrapper', data: {action: 'create'},
           enable: pgBrowser.Nodes['database'].is_conn_allow
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js
index e55c1abd..818bb39c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js
@@ -39,18 +39,18 @@ define(
         pgBrowser.add_menus([{
           name: 'create_language_on_database', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Language...') }}',
+          category: 'create', priority: 4, label: '{{ _('Language ...') }}',
           icon: 'wcTabIcon icon-language', data: {action: 'create'},
           enable: pgBrowser.Nodes['database'].is_conn_allow
         },{
           name: 'create_language_on_coll', node: 'coll-language', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Language...') }}',
+          category: 'create', priority: 4, label: '{{ _('Language ...') }}',
           icon: 'wcTabIcon icon-language', data: {action: 'create'}
         },{
           name: 'create_language', node: 'language', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Language...') }}',
+          category: 'create', priority: 4, label: '{{ _('Language ...') }}',
           icon: 'wcTabIcon icon-language', data: {action: 'create'}
         }]);
       },
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js
index e4e3176d..31ea7ae0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js
@@ -33,19 +33,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_collation_on_coll', node: 'coll-collation', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Collation...') }}',
+          category: 'create', priority: 4, label: '{{ _('Collation ...') }}',
           icon: 'wcTabIcon icon-collation', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_collation', node: 'collation', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Collation...') }}',
+          category: 'create', priority: 4, label: '{{ _('Collation ...') }}',
           icon: 'wcTabIcon icon-collation', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_collation', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Collation...') }}',
+          category: 'create', priority: 4, label: '{{ _('Collation ...') }}',
           icon: 'wcTabIcon icon-collation', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js
index ea71170b..2afbe9e9 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js
@@ -36,19 +36,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_domain_on_coll', node: 'coll-domain_constraints', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 5, label: '{{ _('Domain Constraint...') }}',
+          category: 'create', priority: 5, label: '{{ _('Domain Constraint ...') }}',
           icon: 'wcTabIcon icon-domain_constraints', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_domain_constraints', node: 'domain_constraints', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 5, label: '{{ _('Domain Constraint...') }}',
+          category: 'create', priority: 5, label: '{{ _('Domain Constraint ...') }}',
           icon: 'wcTabIcon icon-domain_constraints', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_domain_constraints', node: 'domain', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 5, label: '{{ _('Domain Constraint...') }}',
+          category: 'create', priority: 5, label: '{{ _('Domain Constraint ...') }}',
           icon: 'wcTabIcon icon-domain_constraints', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js
index 7d1e8fe3..d71e8a04 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js
@@ -104,19 +104,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_domain_on_coll', node: 'coll-domain', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Domain...') }}',
+          category: 'create', priority: 4, label: '{{ _('Domain ...') }}',
           icon: 'wcTabIcon icon-domain', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_domain', node: 'domain', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Domain...') }}',
+          category: 'create', priority: 4, label: '{{ _('Domain ...') }}',
           icon: 'wcTabIcon icon-domain', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_domain', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Domain...') }}',
+          category: 'create', priority: 4, label: '{{ _('Domain ...') }}',
           icon: 'wcTabIcon icon-domain', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
index c3adca28..ea6b74c3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
@@ -1233,7 +1233,7 @@ shifted to the another schema.
                 columns, values
             )
         else:
-            sql = gettext('-- Please create column(s) first...')
+            sql = gettext('-- Please create column(s) first ...')
 
         return ajax_response(response=sql)
 
@@ -1274,7 +1274,7 @@ shifted to the another schema.
                 columns
             )
         else:
-            sql = gettext('-- Please create column(s) first...')
+            sql = gettext('-- Please create column(s) first ...')
 
         return ajax_response(response=sql)
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js
index f0c70363..feeebac8 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js
@@ -466,19 +466,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_foreign-table_on_coll', node: 'coll-foreign-table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Table...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Table ...') }}',
           icon: 'wcTabIcon icon-foreign-table', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_foreign-table', node: 'foreign-table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Table...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Table ...') }}',
           icon: 'wcTabIcon icon-foreign-table', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_foreign-table', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign Table...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign Table ...') }}',
           icon: 'wcTabIcon icon-foreign-table', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
index b04ad103..bc55381c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
@@ -435,20 +435,20 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           name: 'create_fts_configuration_on_schema', node: 'schema',
           module: this, category: 'create', priority: 4,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          label: '{{_('FTS Configuration...')}}',
+          label: '{{_('FTS Configuration ...')}}',
           icon: 'wcTabIcon icon-fts_configuration', data: {action: 'create'},
           enable: 'canCreate'
           },{
           name: 'create_fts_configuration_on_coll', module: this, priority: 4,
           node: 'coll-fts_configuration', applies: ['object', 'context'],
           callback: 'show_obj_properties', category: 'create',
-          label: '{{ _('FTS Configuration...') }}', data: {action: 'create'},
+          label: '{{ _('FTS Configuration ...') }}', data: {action: 'create'},
           icon: 'wcTabIcon icon-fts_configuration', enable: 'canCreate'
           },{
           name: 'create_fts_configuration', node: 'fts_configuration',
           module: this, applies: ['object', 'context'],
           callback: 'show_obj_properties', category: 'create', priority: 4,
-          label: '{{_('FTS Configuration...')}}', data: {action: 'create'},
+          label: '{{_('FTS Configuration ...')}}', data: {action: 'create'},
           icon: 'wcTabIcon icon-fts_configuration', enable: 'canCreate'
           }]);
       },
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js
index 03039431..ef65d718 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js
@@ -75,19 +75,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_fts_dictionary_on_schema', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{_('FTS Dictionary...')}}',
+          category: 'create', priority: 4, label: '{{_('FTS Dictionary ...')}}',
           icon: 'wcTabIcon icon-fts_dictionary', data: {action: 'create'},
           enable: 'canCreate'
           },{
           name: 'create_fts_dictionary_on_coll', node: 'coll-fts_dictionary',
           module: this, applies: ['object', 'context'],  priority: 4,
           callback: 'show_obj_properties', category: 'create',
-          label: '{{ _('FTS Dictionary...') }}', data: {action: 'create'},
+          label: '{{ _('FTS Dictionary ...') }}', data: {action: 'create'},
           icon: 'wcTabIcon icon-fts_dictionary', enable: 'canCreate'
           },{
           name: 'create_fts_dictionary', node: 'fts_dictionary', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{_('FTS Dictionary...')}}',
+          category: 'create', priority: 4, label: '{{_('FTS Dictionary ...')}}',
           icon: 'wcTabIcon icon-fts_dictionary', data: {action: 'create'},
           enable: 'canCreate'
           }]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js
index 6a12bf70..0f19bbfa 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js
@@ -39,19 +39,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_fts_parser_on_schema', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('FTS Parser...') }}',
+          category: 'create', priority: 4, label: '{{ _('FTS Parser ...') }}',
           icon: 'wcTabIcon icon-fts_parser', data: {action: 'create'},
           enable: 'canCreate'
           },{
           name: 'create_fts_parser_on_coll', node: 'coll-fts_parser',
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('FTS Parser...') }}',
+          category: 'create', priority: 4, label: '{{ _('FTS Parser ...') }}',
           icon: 'wcTabIcon icon-fts_parser', data: {action: 'create'},
           module: this, enable: 'canCreate'
           },{
           name: 'create_fts_parser', node: 'fts_parser', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('FTS Parser...') }}',
+          category: 'create', priority: 4, label: '{{ _('FTS Parser ...') }}',
           icon: 'wcTabIcon icon-fts_parser', data: {action: 'create'},
           enable: 'canCreate'
           }]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js
index fba56b69..1135dcbd 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js
@@ -38,19 +38,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_fts_template_on_schema', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('FTS Template...') }}',
+          category: 'create', priority: 4, label: '{{ _('FTS Template ...') }}',
           icon: 'wcTabIcon icon-fts_template', data: {action: 'create'},
           enable: 'canCreate'
           },{
           name: 'create_fts_template_on_coll', node: 'coll-fts_template', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('FTS Template...') }}',
+          category: 'create', priority: 4, label: '{{ _('FTS Template ...') }}',
           icon: 'wcTabIcon icon-fts_template', data: {action: 'create'},
           enable: 'canCreate'
           },{
           name: 'create_fts_template', node: 'fts_template', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('FTS Template...') }}',
+          category: 'create', priority: 4, label: '{{ _('FTS Template ...') }}',
           icon: 'wcTabIcon icon-fts_template', data: {action: 'create'},
           enable: 'canCreate'
           }]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js
index 461e1a27..635eccc7 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js
@@ -105,19 +105,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_function_on_coll', node: 'coll-function', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Function...') }}',
+          category: 'create', priority: 4, label: '{{ _('Function ...') }}',
           icon: 'wcTabIcon icon-function', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_function', node: 'function', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Function...') }}',
+          category: 'create', priority: 4, label: '{{ _('Function ...') }}',
           icon: 'wcTabIcon icon-function', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_function', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Function...') }}',
+          category: 'create', priority: 4, label: '{{ _('Function ...') }}',
           icon: 'wcTabIcon icon-function', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js
index a3cfc5d9..c50570e5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js
@@ -44,19 +44,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Function) {
           name: 'create_procedure_on_coll', node: 'coll-procedure', module:
           this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Procedure...') }}',
+          category: 'create', priority: 4, label: '{{ _('Procedure ...') }}',
           icon: 'wcTabIcon icon-procedure', data: {action: 'create', check:
           false}, enable: 'canCreateProc'
         },{
           name: 'create_procedure', node: 'procedure', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Procedure...') }}',
+          category: 'create', priority: 4, label: '{{ _('Procedure ...') }}',
           icon: 'wcTabIcon icon-procedure', data: {action: 'create', check:
           true}, enable: 'canCreateProc'
         },{
           name: 'create_procedure', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Procedure...') }}',
+          category: 'create', priority: 4, label: '{{ _('Procedure ...') }}',
           icon: 'wcTabIcon icon-procedure', data: {action: 'create', check:
           true}, enable: 'canCreateProc'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js
index 1d1c7b60..55cbf538 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js
@@ -38,19 +38,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_trigger_function_on_coll', node: 'coll-trigger_function', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger function...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger function ...') }}',
           icon: 'wcTabIcon icon-trigger_function', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_trigger_function', node: 'trigger_function', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger function...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger function ...') }}',
           icon: 'wcTabIcon icon-trigger_function', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_trigger_function', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger function...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger function ...') }}',
           icon: 'wcTabIcon icon-trigger_function', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js
index 61832685..c9f5af1e 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js
@@ -33,19 +33,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_package_on_coll', node: 'coll-package', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Package...') }}',
+          category: 'create', priority: 4, label: '{{ _('Package ...') }}',
           icon: 'wcTabIcon icon-package', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_package', node: 'package', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Package...') }}',
+          category: 'create', priority: 4, label: '{{ _('Package ...') }}',
           icon: 'wcTabIcon icon-package', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_package', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Package...') }}',
+          category: 'create', priority: 4, label: '{{ _('Package ...') }}',
           icon: 'wcTabIcon icon-package', data: {action: 'create', check: true},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js
index 5597a49e..b025dd41 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js
@@ -37,19 +37,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_sequence_on_coll', node: 'coll-sequence', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Sequence...') }}',
+          category: 'create', priority: 4, label: '{{ _('Sequence ...') }}',
           icon: 'wcTabIcon icon-sequence', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_sequence', node: 'sequence', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Sequence...') }}',
+          category: 'create', priority: 4, label: '{{ _('Sequence ...') }}',
           icon: 'wcTabIcon icon-sequence', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_sequence', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Sequence...') }}',
+          category: 'create', priority: 4, label: '{{ _('Sequence ...') }}',
           icon: 'wcTabIcon icon-sequence', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js
index 6e5bcb54..7b7172f3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js
@@ -31,19 +31,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_synonym_on_coll', node: 'coll-synonym', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Synonym...') }}',
+          category: 'create', priority: 4, label: '{{ _('Synonym ...') }}',
           icon: 'wcTabIcon icon-synonym', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_synonym', node: 'synonym', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Synonym...') }}',
+          category: 'create', priority: 4, label: '{{ _('Synonym ...') }}',
           icon: 'wcTabIcon icon-synonym', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_synonym', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Synonym...') }}',
+          category: 'create', priority: 4, label: '{{ _('Synonym ...') }}',
           icon: 'wcTabIcon icon-synonym', data: {action: 'create', check: true},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
index 257a49ff..56ca4186 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
@@ -2789,7 +2789,7 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
                 columns, values
             )
         else:
-            sql = gettext('-- Please create column(s) first...')
+            sql = gettext('-- Please create column(s) first ...')
 
         return ajax_response(response=sql)
 
@@ -2838,7 +2838,7 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
                 columns
             )
         else:
-            sql = gettext('-- Please create column(s) first...')
+            sql = gettext('-- Please create column(s) first ...')
 
         return ajax_response(response=sql)
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js
index 039e618a..59cc340a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js
@@ -127,25 +127,25 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
         pgBrowser.add_menus([{
           name: 'create_column_on_coll', node: 'coll-column', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Column...') }}',
+          category: 'create', priority: 4, label: '{{ _('Column ...') }}',
           icon: 'wcTabIcon icon-column', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_column', node: 'column', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Column...') }}',
+          category: 'create', priority: 4, label: '{{ _('Column ...') }}',
           icon: 'wcTabIcon icon-column', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_column_onTable', node: 'table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Column...') }}',
+          category: 'create', priority: 4, label: '{{ _('Column ...') }}',
           icon: 'wcTabIcon icon-column', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_column_onView', node: 'view', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Column...') }}',
+          category: 'create', priority: 4, label: '{{ _('Column ...') }}',
           icon: 'wcTabIcon icon-column', data: {action: 'create', check: true},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js
index 9389bc91..cb292426 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js
@@ -28,7 +28,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
         pgBrowser.add_menus([{
           name: 'create_check_constraints_on_coll', node: 'coll-constraints', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 5, label: '{{ _('Check...') }}',
+          category: 'create', priority: 5, label: '{{ _('Check ...') }}',
           icon: 'wcTabIcon icon-check_constraints', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
index 02b77e16..db408c76 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
@@ -637,7 +637,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
         pgBrowser.add_menus([{
           name: 'create_exclusion_constraint_on_coll', node: 'coll-constraints', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Exclusion constraint...') }}',
+          category: 'create', priority: 4, label: '{{ _('Exclusion constraint ...') }}',
           icon: 'wcTabIcon icon-exclusion_constraint', data: {action: 'create', check: true},
           enable: 'canCreate'
         }]);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
index 5fbb3629..0b27641b 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
@@ -620,7 +620,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
         pgBrowser.add_menus([{
           name: 'create_foreign_key_on_coll', node: 'coll-constraints', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Foreign key...') }}',
+          category: 'create', priority: 4, label: '{{ _('Foreign key ...') }}',
           icon: 'wcTabIcon icon-foreign_key', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
index 7ca2da46..3d11e17f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
@@ -225,25 +225,25 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
         pgBrowser.add_menus([{
           name: 'create_index_on_coll', node: 'coll-index', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Index...') }}',
+          category: 'create', priority: 4, label: '{{ _('Index ...') }}',
           icon: 'wcTabIcon icon-index', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_index', node: 'index', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Index...') }}',
+          category: 'create', priority: 4, label: '{{ _('Index ...') }}',
           icon: 'wcTabIcon icon-index', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_index_onTable', node: 'table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Index...') }}',
+          category: 'create', priority: 4, label: '{{ _('Index ...') }}',
           icon: 'wcTabIcon icon-index', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_index_onMatView', node: 'mview', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 5, label: '{{ _('Index...') }}',
+          category: 'create', priority: 5, label: '{{ _('Index ...') }}',
           icon: 'wcTabIcon icon-index', data: {action: 'create', check: true},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js
index d34e3ce3..7bd08697 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js
@@ -78,25 +78,25 @@ function($, _, S, pgAdmin, pgBrowser, CodeMirror) {
         pgBrowser.add_menus([{
           name: 'create_rule_on_coll', node: 'coll-rule', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _("Rule...") }}',
+          category: 'create', priority: 1, label: '{{ _("Rule ...") }}',
           icon: 'wcTabIcon icon-rule', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_rule_onView', node: 'view', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 5, label: '{{ _("Rule...") }}',
+          category: 'create', priority: 5, label: '{{ _("Rule ...") }}',
           icon: 'wcTabIcon icon-rule', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_rule', node: 'rule', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _("Rule...") }}',
+          category: 'create', priority: 1, label: '{{ _("Rule ...") }}',
           icon: 'wcTabIcon icon-rule', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_rule', node: 'table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _("Rule...") }}',
+          category: 'create', priority: 4, label: '{{ _("Rule ...") }}',
           icon: 'wcTabIcon icon-rule', data: {action: 'create', check: true},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js
index 1e5471e0..d3959667 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js
@@ -42,19 +42,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_table_on_coll', node: 'coll-table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _('Table...') }}',
+          category: 'create', priority: 1, label: '{{ _('Table ...') }}',
           icon: 'wcTabIcon icon-table', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_table', node: 'table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _('Table...') }}',
+          category: 'create', priority: 1, label: '{{ _('Table ...') }}',
           icon: 'wcTabIcon icon-table', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_table__on_schema', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Table...') }}',
+          category: 'create', priority: 4, label: '{{ _('Table ...') }}',
           icon: 'wcTabIcon icon-table', data: {action: 'create', check: false},
           enable: 'canCreate'
         },{
@@ -329,7 +329,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           disabled: 'checkInheritance', deps: ['typname'],
           mode: ['create', 'edit'],
           select2: { multiple: true, allowClear: true,
-          placeholder: '{{ _('Select to inherit from...') }}'},
+          placeholder: '{{ _('Select to inherit from ...') }}'},
           transform: function(data, cell) {
             var control = cell || this,
               m = control.model;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js
index c0527e62..9e054663 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js
@@ -55,19 +55,19 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
         pgBrowser.add_menus([{
           name: 'create_trigger_on_coll', node: 'coll-trigger', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger ...') }}',
           icon: 'wcTabIcon icon-trigger', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_trigger', node: 'trigger', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger ...') }}',
           icon: 'wcTabIcon icon-trigger', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_trigger_onTable', node: 'table', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger ...') }}',
           icon: 'wcTabIcon icon-trigger', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
@@ -83,7 +83,7 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
         },{
           name: 'create_trigger_onView', node: 'view', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Trigger...') }}',
+          category: 'create', priority: 4, label: '{{ _('Trigger ...') }}',
           icon: 'wcTabIcon icon-trigger', data: {action: 'create', check: true},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js
index cd55e0bc..32c740a0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js
@@ -299,17 +299,17 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
         pgBrowser.add_menus([{
           name: 'create_schema_on_coll', node: 'coll-schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Schema...') }}',
+          category: 'create', priority: 4, label: '{{ _('Schema ...') }}',
           icon: 'wcTabIcon icon-schema', data: {action: 'create'}
         },{
           name: 'create_schema', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Schema...') }}',
+          category: 'create', priority: 4, label: '{{ _('Schema ...') }}',
           icon: 'wcTabIcon icon-schema', data: {action: 'create'}
         },{
           name: 'create_schema', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Schema...') }}',
+          category: 'create', priority: 4, label: '{{ _('Schema ...') }}',
           icon: 'wcTabIcon icon-schema', data: {action: 'create'},
           enable: 'can_create_schema'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js
index 94f31396..2afae955 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js
@@ -278,19 +278,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Backgrid) {
         pgBrowser.add_menus([{
           name: 'create_type_on_coll', node: 'coll-type', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Type...') }}',
+          category: 'create', priority: 4, label: '{{ _('Type ...') }}',
           icon: 'wcTabIcon icon-type', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_type', node: 'type', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Type...') }}',
+          category: 'create', priority: 4, label: '{{ _('Type ...') }}',
           icon: 'wcTabIcon icon-type', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_type', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Type...') }}',
+          category: 'create', priority: 4, label: '{{ _('Type ...') }}',
           icon: 'wcTabIcon icon-type', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
index 2800ce87..dbf41354 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
@@ -1208,7 +1208,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
                 columns, values
             )
         else:
-            sql = gettext('-- Please create column(s) first...')
+            sql = gettext('-- Please create column(s) first ...')
 
         return ajax_response(response=sql)
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js
index e32594ca..1a9b6866 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js
@@ -68,19 +68,19 @@ function($, _, S, pgAdmin, alertify, pgBrowser, CodeMirror) {
           applies: ['object', 'context'], callback: 'show_obj_properties',
           category: 'create', priority: 1, icon: 'wcTabIcon icon-mview',
           data: {action: 'create', check: true}, enable: 'canCreate',
-          label: '{{ _("Materialized View...") }}'
+          label: '{{ _("Materialized View ...") }}'
         },{
           name: 'create_mview', node: 'mview', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
           category: 'create', priority: 1, icon: 'wcTabIcon icon-mview',
           data: {action: 'create', check: true}, enable: 'canCreate',
-          label: '{{ _("Materialized View...") }}',
+          label: '{{ _("Materialized View ...") }}',
         },{
           name: 'create_mview', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
           category: 'create', priority: 18, icon: 'wcTabIcon icon-mview',
           data: {action: 'create', check: false}, enable: 'canCreate',
-          label: '{{ _("Materialized View...") }}'
+          label: '{{ _("Materialized View ...") }}'
         },{
           name: 'refresh_mview_data', node: 'mview', module: this,
           priority: 1, callback: 'refresh_mview', category: 'refresh_mview',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js
index 8e2000d2..db53277f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js
@@ -64,19 +64,19 @@ function($, _, S, pgAdmin, pgBrowser, CodeMirror) {
         pgBrowser.add_menus([{
           name: 'create_view_on_coll', node: 'coll-view', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _("View...") }}',
+          category: 'create', priority: 1, label: '{{ _("View ...") }}',
           icon: 'wcTabIcon icon-view', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_view', node: 'view', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _("View...") }}',
+          category: 'create', priority: 1, label: '{{ _("View ...") }}',
           icon: 'wcTabIcon icon-view', data: {action: 'create', check: true},
           enable: 'canCreate'
         },{
           name: 'create_view', node: 'schema', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 17, label: '{{ _("View...") }}',
+          category: 'create', priority: 17, label: '{{ _("View ...") }}',
           icon: 'wcTabIcon icon-view', data: {action: 'create', check: false},
           enable: 'canCreate'
         }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
index c567fb71..b7dec2df 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
@@ -43,30 +43,30 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
         pgBrowser.add_menus([{
           name: 'create_database_on_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Database...') }}',
+          category: 'create', priority: 4, label: '{{ _('Database ...') }}',
           icon: 'wcTabIcon pg-icon-database', data: {action: 'create'},
           enable: 'can_create_database'
         },{
           name: 'create_database_on_coll', node: 'coll-database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Database...') }}',
+          category: 'create', priority: 4, label: '{{ _('Database ...') }}',
           icon: 'wcTabIcon pg-icon-database', data: {action: 'create'},
           enable: 'can_create_database'
         },{
           name: 'create_database', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Database...') }}',
+          category: 'create', priority: 4, label: '{{ _('Database ...') }}',
           icon: 'wcTabIcon pg-icon-database', data: {action: 'create'},
           enable: 'can_create_database'
         },{
           name: 'connect_database', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'connect_database',
-          category: 'connect', priority: 4, label: '{{ _('Connect Database...') }}',
+          category: 'connect', priority: 4, label: '{{ _('Connect Database ...') }}',
           icon: 'fa fa-link', enable : 'is_not_connected'
         },{
           name: 'disconnect_database', node: 'database', module: this,
           applies: ['object', 'context'], callback: 'disconnect_database',
-          category: 'drop', priority: 5, label: '{{ _('Disconnect Database...') }}',
+          category: 'drop', priority: 5, label: '{{ _('Disconnect Database ...') }}',
           icon: 'fa fa-chain-broken', enable : 'is_connected'
         }]);
 
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js
index 6fb9808d..deca2c0f 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js
@@ -201,17 +201,17 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
         pgBrowser.add_menus([{
           name: 'create_pga_schedule_on_job', node: 'pga_job', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Schedule...') }}',
+          category: 'create', priority: 4, label: '{{ _('Schedule ...') }}',
           icon: 'wcTabIcon icon-pga_schedule', data: {action: 'create'}
         },{
           name: 'create_pga_schedule_on_coll', node: 'coll-pga_schedule', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Schedule...') }}',
+          category: 'create', priority: 4, label: '{{ _('Schedule ...') }}',
           icon: 'wcTabIcon icon-pga_schedule', data: {action: 'create'}
         },{
           name: 'create_pga_schedule', node: 'pga_schedule', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Schedule...') }}',
+          category: 'create', priority: 4, label: '{{ _('Schedule ...') }}',
           icon: 'wcTabIcon icon-pga_schedule', data: {action: 'create'}
         }]);
       },
@@ -350,7 +350,7 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
               first_empty: false,
               multiple: true,
               allowClear: true,
-              placeholder: '{{ _("Select the weekdays...") }}',
+              placeholder: '{{ _("Select the weekdays ...") }}',
               width: 'style',
               dropdownAdapter: $.fn.select2.amd.require(
                 'select2/selectAllAdapter'
@@ -366,7 +366,7 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
               first_empty: false,
               multiple: true,
               allowClear: true,
-              placeholder: '{{ _("Select the month days...") }}',
+              placeholder: '{{ _("Select the month days ...") }}',
               width: 'style',
               dropdownAdapter: $.fn.select2.amd.require(
                 'select2/selectAllAdapter'
@@ -381,7 +381,7 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
               first_empty: false,
               multiple: true,
               allowClear: true,
-              placeholder: '{{ _("Select the months...") }}',
+              placeholder: '{{ _("Select the months ...") }}',
               width: 'style',
               dropdownAdapter: $.fn.select2.amd.require(
                 'select2/selectAllAdapter'
@@ -400,7 +400,7 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
               first_empty: false,
               multiple: true,
               allowClear: true,
-              placeholder: '{{ _("Select the hours...") }}',
+              placeholder: '{{ _("Select the hours ...") }}',
               width: 'style',
               dropdownAdapter: $.fn.select2.amd.require(
                 'select2/selectAllAdapter'
@@ -415,7 +415,7 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
               first_empty: false,
               multiple: true,
               allowClear: true,
-              placeholder: '{{ _("Select the minutes...") }}',
+              placeholder: '{{ _("Select the minutes ...") }}',
               width: 'style',
               dropdownAdapter: $.fn.select2.amd.require(
                 'select2/selectAllAdapter'
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js b/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js
index a38d3380..8927a5c7 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js
@@ -47,17 +47,17 @@ function($, _, S, pgAdmin, pgBrowser, Alertify, Backform) {
         pgBrowser.add_menus([{
           name: 'create_pga_jobstep_on_job', node: 'pga_job', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Job Step...') }}',
+          category: 'create', priority: 4, label: '{{ _('Job Step ...') }}',
           data: {'action': 'create'}, icon: 'wcTabIcon icon-pga_jobstep'
         },{
           name: 'create_pga_jobstep_on_coll', node: 'coll-pga_jobstep', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Job Step...') }}',
+          category: 'create', priority: 4, label: '{{ _('Job Step ...') }}',
           data: {'action': 'create'}, icon: 'wcTabIcon icon-pga_jobstep'
         },{
           name: 'create_pga_jobstep', node: 'pga_jobstep', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Job Step...') }}',
+          category: 'create', priority: 4, label: '{{ _('Job Step ...') }}',
           data: {'action': 'create'}, icon: 'wcTabIcon icon-pga_jobstep'
         }]);
       },
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js b/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js
index 51f41810..47298096 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js
@@ -45,12 +45,12 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
         pgBrowser.add_menus([{
           name: 'create_pga_job_on_coll', node: 'coll-pga_job', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('pgAgent Job...') }}',
+          category: 'create', priority: 4, label: '{{ _('pgAgent Job ...') }}',
           icon: 'wcTabIcon icon-pga_job', data: {action: 'create'}
         },{
           name: 'create_pga_job', node: 'pga_job', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('pgAgent Job...') }}',
+          category: 'create', priority: 4, label: '{{ _('pgAgent Job ...') }}',
           icon: 'wcTabIcon icon-pga_job', data: {action: 'create'}
         }, {
           name: 'run_now_pga_job', node: 'pga_job', module: this,
diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js b/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js
index 3cc822eb..98d78ccd 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js
@@ -34,7 +34,7 @@ define(
         pgBrowser.add_menus([{
           name: 'create_resourcegroup_on_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Resource Group...') }}',
+          category: 'create', priority: 4, label: '{{ _('Resource Group ...') }}',
           icon: 'wcTabIcon icon-resource_group', data: {action: 'create'},
           /* Function is used to check the server type and version.
            * Resource Group only supported in PPAS 9.4 and above.
@@ -48,12 +48,12 @@ define(
         },{
           name: 'create_resource_group_on_coll', node: 'coll-resource_group', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Resource Group...') }}',
+          category: 'create', priority: 4, label: '{{ _('Resource Group ...') }}',
           icon: 'wcTabIcon icon-resource_group', data: {action: 'create'}
         },{
           name: 'create_resource_group', node: 'resource_group', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Resource Group...') }}',
+          category: 'create', priority: 4, label: '{{ _('Resource Group ...') }}',
           icon: 'wcTabIcon icon-resource_group', data: {action: 'create'}
         }
         ]);
diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js
index cbda5b7f..0805b1c6 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js
+++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js
@@ -359,19 +359,19 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Backform) {
         pgBrowser.add_menus([{
           name: 'create_role_on_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Login/Group Role...') }}',
+          category: 'create', priority: 4, label: '{{ _('Login/Group Role ...') }}',
           icon: 'wcTabIcon icon-role', data: {action: 'create'},
           enable: 'can_create_role'
         },{
           name: 'create_role_on_roles', node: 'coll-role', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Login/Group Role...') }}',
+          category: 'create', priority: 4, label: '{{ _('Login/Group Role ...') }}',
           icon: 'wcTabIcon icon-role', data: {action: 'create'},
           enable: 'can_create_role'
         },{
           name: 'create_role', node: 'role', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Login/Group Role...') }}',
+          category: 'create', priority: 4, label: '{{ _('Login/Group Role ...') }}',
           icon: 'wcTabIcon icon-role', data: {action: 'create'},
           enable: 'can_create_role'
         }]);
diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js b/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
index 601372ee..586db647 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
@@ -35,26 +35,26 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_tablespace_on_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Tablespace...') }}',
+          category: 'create', priority: 4, label: '{{ _('Tablespace ...') }}',
           icon: 'wcTabIcon icon-tablespace', data: {action: 'create'},
           enable: 'can_create_tablespace'
         },{
           name: 'create_tablespace_on_coll', node: 'coll-tablespace', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Tablespace...') }}',
+          category: 'create', priority: 4, label: '{{ _('Tablespace ...') }}',
           icon: 'wcTabIcon pg-icon-tablespace', data: {action: 'create'},
           enable: 'can_create_tablespace'
         },{
           name: 'create_tablespace', node: 'tablespace', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 4, label: '{{ _('Tablespace...') }}',
+          category: 'create', priority: 4, label: '{{ _('Tablespace ...') }}',
           icon: 'wcTabIcon pg-icon-tablespace', data: {action: 'create'},
           enable: 'can_create_tablespace'
         },{
           name: 'move_tablespace', node: 'tablespace', module: this,
           applies: ['object', 'context'], callback: 'move_objects',
           category: 'move_tablespace', priority: 5,
-          label: '{{ _('Move objects to...') }}',
+          label: '{{ _('Move objects to ...') }}',
           icon: 'fa fa-exchange', data: {action: 'create'},
           enable: 'can_move_objects'
         }
@@ -260,7 +260,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
                         args =  this.view.model.toJSON();
                         args.old_tblspc = d.label;
                     e.cancel = true;
-                    alertify.confirm('{{ _('Move objects...') }}',
+                    alertify.confirm('{{ _('Move objects ...') }}',
                       '{{ _('Are you sure you wish to move objects ') }}'
                       + '"' + args.old_tblspc + '"'
                       + '{{ _(' to ') }}'
diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
index 59d9682f..7ffb63d2 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
+++ b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
@@ -57,12 +57,12 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         pgBrowser.add_menus([{
           name: 'create_server_on_sg', node: 'server-group', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _('Server...') }}',
+          category: 'create', priority: 1, label: '{{ _('Server ...') }}',
           data: {action: 'create'}, icon: 'wcTabIcon icon-server'
         },{
           name: 'create_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 3, label: '{{ _('Server...') }}',
+          category: 'create', priority: 3, label: '{{ _('Server ...') }}',
           data: {action: 'create'}, icon: 'wcTabIcon icon-server'
         },{
           name: 'connect_server', node: 'server', module: this,
@@ -82,12 +82,12 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
         },{
           name: 'restore_point', node: 'server', module: this,
           applies: ['tools', 'context'], callback: 'restore_point',
-          category: 'restore', priority: 9, label: '{{ _('Add Named Restore Point...') }}',
+          category: 'restore', priority: 9, label: '{{ _('Add Named Restore Point ...') }}',
           icon: 'fa fa-anchor', enable : 'is_applicable'
         },{
           name: 'change_password', node: 'server', module: this,
           applies: ['file'], callback: 'change_password',
-          label: '{{ _('Change Password...') }}',
+          label: '{{ _('Change Password ...') }}',
           icon: 'fa fa-lock', enable : 'is_connected'
         },{
           name: 'wal_replay_pause', node: 'server', module: this,
diff --git a/web/pgadmin/browser/server_groups/templates/server_groups/server_groups.js b/web/pgadmin/browser/server_groups/templates/server_groups/server_groups.js
index 39409a72..e9739fa2 100644
--- a/web/pgadmin/browser/server_groups/templates/server_groups/server_groups.js
+++ b/web/pgadmin/browser/server_groups/templates/server_groups/server_groups.js
@@ -21,7 +21,7 @@ function($, _, pgAdmin, Backbone) {
         pgAdmin.Browser.add_menus([{
           name: 'create_server_group', node: 'server-group', module: this,
           applies: ['object', 'context'], callback: 'show_obj_properties',
-          category: 'create', priority: 1, label: '{{ _('Server Group...') }}',
+          category: 'create', priority: 1, label: '{{ _('Server Group ...') }}',
           data: {'action': 'create'}, icon: 'wcTabIcon icon-server-group'
         }]);
       },
diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html
index 5bd054a2..9203bad5 100644
--- a/web/pgadmin/browser/templates/browser/index.html
+++ b/web/pgadmin/browser/templates/browser/index.html
@@ -91,7 +91,7 @@ require.onResourceLoad = function (context, map, depMaps) {
 </style>
 <div id="pg-spinner">
   <span class="pg-sp-icon fa fa-spinner fa-pulse"></span>
-  <span class="pg-sp-text">{{ _('Loading {0} v{1}...').format(config.APP_NAME, config.APP_VERSION) }}</span>
+  <span class="pg-sp-text">{{ _('Loading {0} v{1} ...').format(config.APP_NAME, config.APP_VERSION) }}</span>
 </div>
 <nav class="navbar-inverse navbar-fixed-top pg-navbar">
     <div class="container-fluid">
diff --git a/web/pgadmin/browser/templates/browser/js/collection.js b/web/pgadmin/browser/templates/browser/js/collection.js
index 5b7f4fb0..113c3eb4 100644
--- a/web/pgadmin/browser/templates/browser/js/collection.js
+++ b/web/pgadmin/browser/templates/browser/js/collection.js
@@ -33,7 +33,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
       pgAdmin.Browser.add_menus([{
         name: 'refresh', node: this.type, module: this,
         applies: ['object', 'context'], callback: 'refresh',
-        priority: 1, label: '{{ _("Refresh...") }}',
+        priority: 1, label: '{{ _("Refresh ...") }}',
         icon: 'fa fa-refresh'
       }]);
 
@@ -43,7 +43,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
           pgAdmin.Browser.add_menus([{
             name: 'show_query_tool', node: this.type, module: this,
             applies: ['context'], callback: 'show_query_tool',
-            priority: 998, label: '{{ _("Query Tool...") }}',
+            priority: 998, label: '{{ _("Query Tool ...") }}',
             icon: 'fa fa-bolt'
           }]);
         }
diff --git a/web/pgadmin/browser/templates/browser/js/messages.js b/web/pgadmin/browser/templates/browser/js/messages.js
index f8de9f3b..6dac521a 100644
--- a/web/pgadmin/browser/templates/browser/js/messages.js
+++ b/web/pgadmin/browser/templates/browser/js/messages.js
@@ -29,7 +29,7 @@ function(_, S, pgAdmin) {
     'CONNECTION_LOST': "{{ _("Connection to the server has been lost.") }}",
     'SELECT_ALL': "{{ _("Select All") }}",
     'UNSELECT_ALL': "{{ _("Unselect All") }}",
-    'LOADING_MESSAGE': "{{ _("Retrieving data from the server...") }}",
+    'LOADING_MESSAGE': "{{ _("Retrieving data from the server ...") }}",
     'LOADING_FAILED': "{{ _("Failed to retrieve data from the server.") }}"
   };
 
diff --git a/web/pgadmin/browser/templates/browser/js/node.js b/web/pgadmin/browser/templates/browser/js/node.js
index af016b5b..3f84e18d 100644
--- a/web/pgadmin/browser/templates/browser/js/node.js
+++ b/web/pgadmin/browser/templates/browser/js/node.js
@@ -83,7 +83,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
       pgAdmin.Browser.add_menus([{
         name: 'refresh', node: self.type, module: self,
         applies: ['object', 'context'], callback: 'refresh',
-        priority: 1, label: '{{ _("Refresh...") }}',
+        priority: 1, label: '{{ _("Refresh ...") }}',
         icon: 'fa fa-refresh'
       }]);
 
@@ -91,7 +91,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
         pgAdmin.Browser.add_menus([{
         name: 'show_obj_properties', node: self.type, module: self,
         applies: ['object', 'context'], callback: 'show_obj_properties',
-        priority: 999, label: '{{ _("Properties...") }}',
+        priority: 999, label: '{{ _("Properties ...") }}',
         data: {'action': 'edit'}, icon: 'fa fa-pencil-square-o'
       }]);
       }
@@ -125,7 +125,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
           pgAdmin.Browser.add_menus([{
             name: 'show_query_tool', node: self.type, module: self,
             applies: ['context'], callback: 'show_query_tool',
-            priority: 998, label: '{{ _("Query Tool...") }}',
+            priority: 998, label: '{{ _("Query Tool ...") }}',
             icon: 'fa fa-bolt',
             enable: function(itemData, item, data) {
               if (itemData._type == 'database' && itemData.allowConn)
diff --git a/web/pgadmin/browser/tests/test_logout.py b/web/pgadmin/browser/tests/test_logout.py
index fbf2ea98..7556e7b4 100644
--- a/web/pgadmin/browser/tests/test_logout.py
+++ b/web/pgadmin/browser/tests/test_logout.py
@@ -21,7 +21,7 @@ class LogoutTest(BaseTestGenerator):
 
     scenarios = [
         # This test case validate the logout page
-        ('Logging Out', dict(respdata='Redirecting...'))
+        ('Logging Out', dict(respdata='Redirecting ...'))
     ]
 
     @classmethod
diff --git a/web/pgadmin/feature_tests/connect_to_server_feature_test.py b/web/pgadmin/feature_tests/connect_to_server_feature_test.py
index 211385f8..68a30f76 100644
--- a/web/pgadmin/feature_tests/connect_to_server_feature_test.py
+++ b/web/pgadmin/feature_tests/connect_to_server_feature_test.py
@@ -52,7 +52,7 @@ class ConnectsToServerFeatureTest(BaseFeatureTest):
         ActionChains(self.page.driver) \
             .move_to_element(self.page.driver.find_element_by_link_text("Create")) \
             .perform()
-        self.page.find_by_partial_link_text("Server...").click()
+        self.page.find_by_partial_link_text("Server ...").click()
 
         server_config = self.server
         self.page.fill_input_by_field_name("name", server_config['name'])
diff --git a/web/pgadmin/feature_tests/template_selection_feature_test.py b/web/pgadmin/feature_tests/template_selection_feature_test.py
index 7b7c039f..61c0bf33 100644
--- a/web/pgadmin/feature_tests/template_selection_feature_test.py
+++ b/web/pgadmin/feature_tests/template_selection_feature_test.py
@@ -30,7 +30,7 @@ class TemplateSelectionFeatureTest(BaseFeatureTest):
         ActionChains(self.page.driver) \
             .move_to_element(self.page.driver.find_element_by_link_text("Create")) \
             .perform()
-        self.page.find_by_partial_link_text("Trigger function...").click()
+        self.page.find_by_partial_link_text("Trigger function ...").click()
         self.page.fill_input_by_field_name("name", "test-trigger-function")
         self.page.find_by_partial_link_text("Definition").click()
         self.page.fill_codemirror_area_with("some-trigger-function-content")
diff --git a/web/pgadmin/messages.pot b/web/pgadmin/messages.pot
index 128b0d94..9952d5f7 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: 2017-03-09 09:21+0000\n"
+"POT-Creation-Date: 2017-03-17 00:40+0100\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"
@@ -274,20 +274,20 @@ msgstr ""
 
 #: pgadmin/browser/server_groups/servers/__init__.py:894
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:185
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1763
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1899
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2438
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2739
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2808
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2879
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2929
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2984
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3192
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3300
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3398
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3443
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3496
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3535
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1695
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1831
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2370
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2671
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2740
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2811
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2861
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2916
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3124
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3232
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3330
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3375
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3428
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3467
 msgid ""
 "Not connected to the server or the connection to the server has been "
 "closed."
@@ -465,7 +465,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:41
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:47
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:52
-msgid "Cast..."
+msgid "Cast ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:73
@@ -687,7 +687,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:38
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:43
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:48
-msgid "Event Trigger..."
+msgid "Event Trigger ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:91
@@ -850,7 +850,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:64
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:69
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:74
-msgid "Extension..."
+msgid "Extension ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:180
@@ -1098,7 +1098,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:76
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:81
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:86
-msgid "Foreign Server..."
+msgid "Foreign Server ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:135
@@ -1178,7 +1178,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:76
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:81
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:86
-msgid "User Mapping..."
+msgid "User Mapping ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:113
@@ -1216,7 +1216,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:79
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:84
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:89
-msgid "Foreign Data Wrapper..."
+msgid "Foreign Data Wrapper ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:140
@@ -1293,7 +1293,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:42
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:48
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:53
-msgid "Language..."
+msgid "Language ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:125
@@ -1462,7 +1462,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:36
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:48
-msgid "Collation..."
+msgid "Collation ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:106
@@ -1533,7 +1533,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:39
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:45
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:51
-msgid "Domain Constraint..."
+msgid "Domain Constraint ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:79
@@ -1566,7 +1566,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:107
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:113
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:119
-msgid "Domain..."
+msgid "Domain ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:175
@@ -1658,7 +1658,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:2792
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:2841
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1211
-msgid "-- Please create column(s) first..."
+msgid "-- Please create column(s) first ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:91
@@ -1708,7 +1708,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:469
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:475
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:481
-msgid "Foreign Table..."
+msgid "Foreign Table ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:538
@@ -1806,7 +1806,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:438
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:445
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:451
-msgid "FTS Configuration..."
+msgid "FTS Configuration ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:499
@@ -1892,7 +1892,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:78
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:85
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:90
-msgid "FTS Dictionary..."
+msgid "FTS Dictionary ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:137
@@ -1950,7 +1950,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:48
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:54
-msgid "FTS Parser..."
+msgid "FTS Parser ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:98
@@ -2039,7 +2039,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:41
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:53
-msgid "FTS Template..."
+msgid "FTS Template ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:92
@@ -2118,7 +2118,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:108
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:114
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:120
-msgid "Function..."
+msgid "Function ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:192
@@ -2342,7 +2342,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:53
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:59
-msgid "Procedure..."
+msgid "Procedure ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:12
@@ -2352,7 +2352,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:41
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:53
-msgid "Trigger function..."
+msgid "Trigger function ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:55
@@ -2415,7 +2415,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:36
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:48
-msgid "Package..."
+msgid "Package ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:127
@@ -2466,7 +2466,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:40
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:46
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:52
-msgid "Sequence..."
+msgid "Sequence ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:148
@@ -2558,7 +2558,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:34
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:40
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:46
-msgid "Synonym..."
+msgid "Synonym ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:102
@@ -2685,7 +2685,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:136
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:142
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:148
-msgid "Column..."
+msgid "Column ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:185
@@ -2793,7 +2793,7 @@ msgid "Check constraint updated."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js:31
-msgid "Check..."
+msgid "Check ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js:37
@@ -2902,7 +2902,7 @@ msgid "Exclusion constraint"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js:640
-msgid "Exclusion constraint..."
+msgid "Exclusion constraint ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js:687
@@ -3007,7 +3007,7 @@ msgid "Foreign key"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js:623
-msgid "Foreign key..."
+msgid "Foreign key ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js:629
@@ -3148,7 +3148,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:234
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:240
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:246
-msgid "Index..."
+msgid "Index ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:285
@@ -3226,7 +3226,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:87
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:93
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:99
-msgid "Rule..."
+msgid "Rule ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:146
@@ -3402,7 +3402,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:45
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:51
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:57
-msgid "Table..."
+msgid "Table ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:63
@@ -3440,7 +3440,7 @@ msgid "Are you sure you want to reset the statistics for table %s?"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:332
-msgid "Select to inherit from..."
+msgid "Select to inherit from ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:414
@@ -3759,7 +3759,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:64
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:70
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:86
-msgid "Trigger..."
+msgid "Trigger ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:76
@@ -3878,7 +3878,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:302
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:307
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:312
-msgid "Schema..."
+msgid "Schema ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:349
@@ -4009,7 +4009,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:281
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:287
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:293
-msgid "Type..."
+msgid "Type ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:376
@@ -4195,7 +4195,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:71
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:77
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:83
-msgid "Materialized View..."
+msgid "Materialized View ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:87
@@ -4235,7 +4235,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:67
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:73
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:79
-msgid "View..."
+msgid "View ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:127
@@ -4277,15 +4277,15 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:46
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:52
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:58
-msgid "Database..."
+msgid "Database ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:64
-msgid "Connect Database..."
+msgid "Connect Database ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:69
-msgid "Disconnect Database..."
+msgid "Disconnect Database ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:137
@@ -4928,7 +4928,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:204
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:209
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:214
-msgid "Schedule..."
+msgid "Schedule ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:254
@@ -5001,7 +5001,7 @@ msgid "Week Days"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:353
-msgid "Select the weekdays..."
+msgid "Select the weekdays ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:363
@@ -5009,11 +5009,11 @@ msgid "Month Days"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:369
-msgid "Select the month days..."
+msgid "Select the month days ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:384
-msgid "Select the months..."
+msgid "Select the months ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:394
@@ -5023,11 +5023,11 @@ msgid "Times"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:403
-msgid "Select the hours..."
+msgid "Select the hours ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:418
-msgid "Select the minutes..."
+msgid "Select the minutes ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:451
@@ -5053,7 +5053,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:50
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:55
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:60
-msgid "Job Step..."
+msgid "Job Step ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:104
@@ -5164,7 +5164,7 @@ msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:48
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:53
-msgid "pgAgent Job..."
+msgid "pgAgent Job ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:58
@@ -5291,7 +5291,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:37
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:51
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:56
-msgid "Resource Group..."
+msgid "Resource Group ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:75
@@ -5567,7 +5567,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:362
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:368
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:374
-msgid "Login/Group Role..."
+msgid "Login/Group Role ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:411
@@ -5651,11 +5651,11 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:38
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:44
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:50
-msgid "Tablespace..."
+msgid "Tablespace ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:57
-msgid "Move objects to..."
+msgid "Move objects to ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:101
@@ -5687,7 +5687,7 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:922
 #: pgadmin/preferences/templates/preferences/preferences.js:357
 #: pgadmin/preferences/templates/preferences/preferences.js:381
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:262
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:265
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:376
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:396
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:272
@@ -5723,7 +5723,7 @@ msgid "Please select tablespace"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:263
-msgid "Move objects..."
+msgid "Move objects ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:264
@@ -5754,7 +5754,7 @@ msgstr ""
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:60
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:65
-msgid "Server..."
+msgid "Server ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:70
@@ -5770,11 +5770,11 @@ msgid "Reload Configuration"
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:85
-msgid "Add Named Restore Point..."
+msgid "Add Named Restore Point ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:90
-msgid "Change Password..."
+msgid "Change Password ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:95
@@ -5979,7 +5979,7 @@ msgid "Server Group"
 msgstr ""
 
 #: pgadmin/browser/server_groups/templates/server_groups/server_groups.js:24
-msgid "Server Group..."
+msgid "Server Group ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/templates/server_groups/server_groups.js:48
@@ -5987,7 +5987,7 @@ msgid "The ID cannot be changed."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/index.html:94
-msgid "Loading {0} v{1}..."
+msgid "Loading {0} v{1} ..."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/index.html:100
@@ -6087,12 +6087,12 @@ msgstr ""
 
 #: pgadmin/browser/templates/browser/js/collection.js:36
 #: pgadmin/browser/templates/browser/js/node.js:86
-msgid "Refresh..."
+msgid "Refresh ..."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/js/collection.js:46
 #: pgadmin/browser/templates/browser/js/node.js:128
-msgid "Query Tool..."
+msgid "Query Tool ..."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/js/collection.js:128
@@ -6182,7 +6182,7 @@ msgid "Unselect All"
 msgstr ""
 
 #: pgadmin/browser/templates/browser/js/messages.js:32
-msgid "Retrieving data from the server..."
+msgid "Retrieving data from the server ..."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/js/messages.js:33
@@ -6190,7 +6190,7 @@ msgid "Failed to retrieve data from the server."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/js/node.js:94
-msgid "Properties..."
+msgid "Properties ..."
 msgstr ""
 
 #: pgadmin/browser/templates/browser/js/node.js:103
@@ -6698,7 +6698,7 @@ msgid "Execution time"
 msgstr ""
 
 #: pgadmin/misc/bgprocess/__init__.py:55
-msgid "Running..."
+msgid "Running ..."
 msgstr ""
 
 #: pgadmin/misc/bgprocess/__init__.py:56
@@ -6715,7 +6715,7 @@ msgid "Too many logs generated!"
 msgstr ""
 
 #: pgadmin/misc/bgprocess/processes.py:76
-#: pgadmin/misc/bgprocess/processes.py:518
+#: pgadmin/misc/bgprocess/processes.py:555
 msgid "Could not find a process with the specified ID."
 msgstr ""
 
@@ -6727,7 +6727,7 @@ msgstr ""
 msgid "The process has already finished and can not be restarted."
 msgstr ""
 
-#: pgadmin/misc/bgprocess/processes.py:439
+#: pgadmin/misc/bgprocess/processes.py:476
 msgid "Status for the background process '{0}' could not be loaded."
 msgstr ""
 
@@ -6907,15 +6907,15 @@ msgid "Backup"
 msgstr ""
 
 #: pgadmin/tools/backup/__init__.py:115 pgadmin/tools/backup/__init__.py:142
-msgid "Backing up an object on the server '{0}' from database '{1}'..."
+msgid "Backing up an object on the server '{0}' from database '{1}' ..."
 msgstr ""
 
 #: pgadmin/tools/backup/__init__.py:122
-msgid "Backing up the global objects on the server - '{0}'..."
+msgid "Backing up the global objects on the server - '{0}' ..."
 msgstr ""
 
 #: pgadmin/tools/backup/__init__.py:126
-msgid "Backing up the server '{0}'..."
+msgid "Backing up the server '{0}' ..."
 msgstr ""
 
 #: pgadmin/tools/backup/__init__.py:149
@@ -6932,14 +6932,14 @@ msgstr ""
 msgid "Running command:"
 msgstr ""
 
-#: pgadmin/tools/backup/__init__.py:239 pgadmin/tools/backup/__init__.py:337
-#: pgadmin/tools/restore/__init__.py:198
+#: pgadmin/tools/backup/__init__.py:242 pgadmin/tools/backup/__init__.py:343
+#: pgadmin/tools/restore/__init__.py:201
 msgid "Could not find the specified server."
 msgstr ""
 
-#: pgadmin/tools/backup/__init__.py:252 pgadmin/tools/backup/__init__.py:350
+#: pgadmin/tools/backup/__init__.py:255 pgadmin/tools/backup/__init__.py:356
 #: pgadmin/tools/maintenance/__init__.py:206
-#: pgadmin/tools/restore/__init__.py:212
+#: pgadmin/tools/restore/__init__.py:215
 msgid "Please connect to the server first."
 msgstr ""
 
@@ -7138,18 +7138,18 @@ msgstr ""
 #: pgadmin/tools/backup/templates/backup/js/backup.js:320
 #: pgadmin/tools/backup/templates/backup/js/backup.js:330
 #: pgadmin/tools/backup/templates/backup/js/backup.js:427
-msgid "Backup Globals..."
+msgid "Backup Globals ..."
 msgstr ""
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:325
 #: pgadmin/tools/backup/templates/backup/js/backup.js:335
 #: pgadmin/tools/backup/templates/backup/js/backup.js:428
-msgid "Backup Server..."
+msgid "Backup Server ..."
 msgstr ""
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:340
 #: pgadmin/tools/backup/templates/backup/js/backup.js:349
-msgid "Backup..."
+msgid "Backup ..."
 msgstr ""
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:385
@@ -7270,7 +7270,7 @@ msgid "Paste Row"
 msgstr ""
 
 #: pgadmin/tools/datagrid/templates/datagrid/index.html:107
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2288
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2220
 msgid "Delete Row(s)"
 msgstr ""
 
@@ -7364,35 +7364,35 @@ msgstr ""
 msgid "Error fetching SQL for script: \"%s\""
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:75
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:78
 msgid "Query Tool"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:85
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:88
 msgid "View All Rows"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:90
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:93
 msgid "View First 100 Rows"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:95
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:98
 msgid "View Last 100 Rows"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:100
-msgid "View Filtered Rows..."
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:103
+msgid "View Filtered Rows ..."
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:104
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:107
 msgid "View Data"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:412
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:415
 msgid " untitled"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:461
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:464
 msgid "Query Tool Initialize Error"
 msgstr ""
 
@@ -7543,7 +7543,7 @@ msgid "Please enter a value for the parameter."
 msgstr ""
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:352
-msgid "Waiting for another session to invoke the target..."
+msgid "Waiting for another session to invoke the target ..."
 msgstr ""
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1493
@@ -7551,7 +7551,7 @@ msgid "Local variables"
 msgstr ""
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1504
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:265
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:197
 msgid "Messages"
 msgstr ""
 
@@ -7564,7 +7564,7 @@ msgid "Stack"
 msgstr ""
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1586
-msgid "Loading..."
+msgid "Loading ..."
 msgstr ""
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:66
@@ -7573,7 +7573,7 @@ msgstr ""
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:179
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:189
-msgid "Grant Wizard..."
+msgid "Grant Wizard ..."
 msgstr ""
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:586
@@ -7586,7 +7586,7 @@ msgid "Import/Export"
 msgstr ""
 
 #: pgadmin/tools/import_export/__init__.py:109
-msgid "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4})..."
+msgid "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4}) ..."
 msgstr ""
 
 #: pgadmin/tools/import_export/__init__.py:122
@@ -7599,11 +7599,11 @@ msgid "Could not find the given server"
 msgstr ""
 
 #: pgadmin/tools/import_export/__init__.py:217
-msgid "Please connect to the server first..."
+msgid "Please connect to the server first ..."
 msgstr ""
 
-#: pgadmin/tools/import_export/__init__.py:228
-#: pgadmin/tools/import_export/__init__.py:235
+#: pgadmin/tools/import_export/__init__.py:232
+#: pgadmin/tools/import_export/__init__.py:239
 msgid "Please specify a valid file"
 msgstr ""
 
@@ -7628,7 +7628,7 @@ msgid "Columns to import"
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:122
-msgid "Columns for importing..."
+msgid "Columns for importing ..."
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:126
@@ -7643,7 +7643,7 @@ msgid "Columns to export"
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:134
-msgid "Colums for exporting..."
+msgid "Colums for exporting ..."
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:162
@@ -7664,7 +7664,7 @@ msgid "Not null columns"
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:174
-msgid "Not null columns..."
+msgid "Not null columns ..."
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:177
@@ -7680,7 +7680,7 @@ msgstr ""
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:216
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:231
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:76
-msgid "Select from list..."
+msgid "Select from list ..."
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:203
@@ -7716,7 +7716,7 @@ msgid ""
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:292
-msgid "Import/Export..."
+msgid "Import/Export ..."
 msgstr ""
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:418
@@ -7828,7 +7828,7 @@ msgstr ""
 
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:177
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:187
-msgid "Maintenance..."
+msgid "Maintenance ..."
 msgstr ""
 
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:347
@@ -7843,14 +7843,14 @@ msgid "Restore"
 msgstr ""
 
 #: pgadmin/tools/restore/__init__.py:90
-msgid "Restoring backup on the server '{0}'..."
+msgid "Restoring backup on the server '{0}' ..."
 msgstr ""
 
 #: pgadmin/tools/restore/__init__.py:103
-msgid "Restoring the backup on the server '{0}'..."
+msgid "Restoring the backup on the server '{0}' ..."
 msgstr ""
 
-#: pgadmin/tools/restore/__init__.py:187
+#: pgadmin/tools/restore/__init__.py:190
 msgid "File couldn't be found!"
 msgstr ""
 
@@ -7888,7 +7888,7 @@ msgstr ""
 
 #: pgadmin/tools/restore/templates/restore/js/restore.js:278
 #: pgadmin/tools/restore/templates/restore/js/restore.js:287
-msgid "Restore..."
+msgid "Restore ..."
 msgstr ""
 
 #: pgadmin/tools/restore/templates/restore/js/restore.js:524
@@ -7923,7 +7923,7 @@ msgstr ""
 #: pgadmin/tools/sqleditor/__init__.py:96
 #: pgadmin/tools/sqleditor/__init__.py:102
 #: pgadmin/tools/sqleditor/__init__.py:108
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:255
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:187
 msgid "Explain"
 msgstr ""
 
@@ -8013,173 +8013,173 @@ msgstr ""
 msgid "Data cannot be saved for the current object."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:245
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:177
 msgid "Data Output"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:275
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:207
 msgid "History"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:307
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1679
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:239
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1611
 msgid ""
 "The data has been modified, but not saved. Are you sure you wish to "
 "discard the changes?"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:311
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:243
 msgid ""
 "The query has been modified, but not saved. Are you sure you wish to "
 "discard the changes?"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:460
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1363
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1678
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2508
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:392
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1295
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1610
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2440
 msgid "Unsaved changes"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1364
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2509
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1296
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2441
 msgid "Are you sure you wish to discard the current changes?"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1386
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1318
 msgid "Clear history"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1387
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1319
 msgid "Are you sure you wish to clear the history?"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1703
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1635
 msgid "Initializing query execution."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1710
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3273
-msgid "Waiting for the query execution to complete..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1642
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3205
+msgid "Waiting for the query execution to complete ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1827
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1759
 #, python-format
 msgid "Query returned successfully in %s."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1863
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1967
-msgid "Loading data from the database server and rendering..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1795
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1899
+msgid "Loading data from the database server and rendering ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1974
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1906
 #, python-format
 msgid "Total query runtime: %s."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1975
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1907
 #, python-format
 msgid "%s rows retrieved."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2053
-msgid "Retrieving information about the columns returned..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1985
+msgid "Retrieving information about the columns returned ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2279
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2211
 msgid "Row(s) deleted"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2283
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2215
 msgid "Operation failed"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2284
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2216
 msgid ""
 "There are unsaved changes in grid, Please save them first to avoid "
 "inconsistency in data"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2289
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2221
 msgid "Are you sure you wish to delete selected row(s)?"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2351
-msgid "Saving the updated data..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2283
+msgid "Saving the updated data ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2407
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2339
 #, python-format
 msgid "%s."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2543
-msgid "Loading the file..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2475
+msgid "Loading the file ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2591
-msgid "Saving the queries in the file..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2523
+msgid "Saving the queries in the file ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2602
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2534
 msgid "File saved successfully."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2709
-msgid "Loading the existing filter options..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2641
+msgid "Loading the existing filter options ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2779
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2849
-msgid "Applying the new filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2711
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2781
+msgid "Applying the new filter ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2902
-msgid "Removing the filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2834
+msgid "Removing the filter ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2953
-msgid "Applying the filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2885
+msgid "Applying the filter ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3051
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2983
 msgid "Error"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3052
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2984
 msgid "Oops, unable to copy to clipboard"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3165
-msgid "Setting the limit on the result..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3097
+msgid "Setting the limit on the result ..."
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3239
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3171
 msgid "Initializing the query execution!"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3600
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3606
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3532
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3538
 msgid "Error occurred while setting verbose option in explain"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3638
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3644
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3570
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3576
 msgid "Error occurred while setting costs option in explain"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3675
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3681
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3607
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3613
 msgid "Error occurred while setting buffers option in explain"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3711
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3717
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3643
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3649
 msgid "Error occurred while setting timing option in explain"
 msgstr ""
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3795
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3727
 msgid "Error occurred while getting query tool options "
 msgstr ""
 
diff --git a/web/pgadmin/misc/bgprocess/__init__.py b/web/pgadmin/misc/bgprocess/__init__.py
index 80dbcfbe..986e790c 100644
--- a/web/pgadmin/misc/bgprocess/__init__.py
+++ b/web/pgadmin/misc/bgprocess/__init__.py
@@ -52,7 +52,7 @@ class BGProcessModule(PgAdminModule):
             'START_TIME': _('Start time'),
             'STATUS': _('Status'),
             'EXECUTION_TIME': _('Execution time'),
-            'running': _('Running...'),
+            'running': _('Running ...'),
             'successfully_finished': _("Successfully completed."),
             'failed_with_exit_code': _("Failed (exit code: %s)."),
             'BG_TOO_MANY_LOGS': _("Too many logs generated!")
diff --git a/web/pgadmin/misc/depends/static/js/depends.js b/web/pgadmin/misc/depends/static/js/depends.js
index 1de9c6e2..a5aa42e6 100644
--- a/web/pgadmin/misc/depends/static/js/depends.js
+++ b/web/pgadmin/misc/depends/static/js/depends.js
@@ -309,7 +309,7 @@ define([
           self.dependentsPanels,
           node.generate_url(item, 'dependent', data, true),
           ['No object selected.', 'No dependent information is available for the current object.',
-            'Fetching dependent information from the server...'],
+            'Fetching dependent information from the server ...'],
           node,
           item,
           data._type
@@ -353,7 +353,7 @@ define([
           self.dependenciesPanels,
           node.generate_url(item, 'dependency', data, true),
           ['Please select an object in the tree view.', 'No dependency information is available for the current object.',
-            'Fetching dependency information from the server...'],
+            'Fetching dependency information from the server ...'],
           node,
           item,
           data._type
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js b/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js
index cc2b91b4..cc19c29e 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/js/languages/en.js
@@ -2,7 +2,7 @@
     "LANGUAGE_FILE_NOT_FOUND": "Language file not found.",
     "upload_success": "File uploaded successfully.",
     "upload_error": "Error uploading file",
-    "browse": "Browse...",
+    "browse": "Browse ...",
     "bytes": " bytes",
     "cancel": "Cancel",
     "close": "Close",
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js b/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js
index ff2504c6..00da1e22 100755
--- a/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js
@@ -30,7 +30,7 @@ var getFileExtension = function(name) {
 var getFileName = function(name) {
   var fm_filename = name;
   if (fm_filename.length > 15 ) {
-    fm_filename = name.substr(0, 10) +'...';
+    fm_filename = name.substr(0, 10) + '...';
   }
   return fm_filename;
 };
@@ -734,7 +734,7 @@ var getFolderInfo = function(path, file_type) {
 
             var fm_filename = (data[key]).Filename;
             if (fm_filename.length > 15 ) {
-              fm_filename = (data[key]).Filename.substr(0, 10) +'...';
+              fm_filename = (data[key]).Filename.substr(0, 10) + '...';
             }
 
             var file_name_original = encodeURI((data[key]).Filename);
@@ -814,7 +814,7 @@ var getFolderInfo = function(path, file_type) {
 
             var fm_filename = (data[key]).Filename;
             if (fm_filename.length > 48) {
-              fm_filename = (data[key]).Filename.substr(0, 48) +'...';
+              fm_filename = (data[key]).Filename.substr(0, 48) + '...';
             }
 
             result += '<td title="' + path + '" class="'+class_type+'">';
diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py
index 87e011c7..d3d01565 100644
--- a/web/pgadmin/tools/backup/__init__.py
+++ b/web/pgadmin/tools/backup/__init__.py
@@ -113,17 +113,17 @@ class BackupMessage(IProcessDesc):
 
         if self.backup_type == BACKUP.OBJECT:
             return _(
-                "Backing up an object on the server '{0}' from database '{1}'..."
+                "Backing up an object on the server '{0}' from database '{1}' ..."
             ).format(
                 "{0} ({1}:{2})".format(s.name, s.host, s.port),
                 self.database
             )
         if self.backup_type == BACKUP.GLOBALS:
-            return _("Backing up the global objects on the server - '{0}'...").format(
+            return _("Backing up the global objects on the server - '{0}' ...").format(
                 "{0} ({1}:{2})".format(s.name, s.host, s.port)
             )
         elif self.backup_type == BACKUP.SERVER:
-            return _("Backing up the server '{0}'...").format(
+            return _("Backing up the server '{0}' ...").format(
                 "{0} ({1}:{2})".format(s.name, s.host, s.port)
             )
         else:
@@ -140,7 +140,7 @@ class BackupMessage(IProcessDesc):
 
         if self.backup_type == BACKUP.OBJECT:
             res += _(
-                "Backing up an object on the server '{0}' from database '{1}'..."
+                "Backing up an object on the server '{0}' from database '{1}' ..."
             ).format(
                 "{0} ({1}:{2})".format(s.name, s.host, s.port),
                 self.database
diff --git a/web/pgadmin/tools/backup/templates/backup/js/backup.js b/web/pgadmin/tools/backup/templates/backup/js/backup.js
index f1a29d15..f6f7c849 100644
--- a/web/pgadmin/tools/backup/templates/backup/js/backup.js
+++ b/web/pgadmin/tools/backup/templates/backup/js/backup.js
@@ -317,27 +317,27 @@ TODO LIST FOR BACKUP:
         var menus = [{
           name: 'backup_global', module: this,
           applies: ['tools'], callback: 'start_backup_global',
-          priority: 12, label: '{{_("Backup Globals...") }}',
+          priority: 12, label: '{{_("Backup Globals ...") }}',
           icon: 'fa fa-floppy-o', enable: menu_enabled_server
         },{
           name: 'backup_server', module: this,
           applies: ['tools'], callback: 'start_backup_server',
-          priority: 12, label: '{{_("Backup Server...") }}',
+          priority: 12, label: '{{_("Backup Server ...") }}',
           icon: 'fa fa-floppy-o', enable: menu_enabled_server
         },{
           name: 'backup_global_ctx', module: this, node: 'server',
           applies: ['context'], callback: 'start_backup_global',
-          priority: 12, label: '{{_("Backup Globals...") }}',
+          priority: 12, label: '{{_("Backup Globals ...") }}',
           icon: 'fa fa-floppy-o', enable: menu_enabled_server
         },{
           name: 'backup_server_ctx', module: this, node: 'server',
           applies: ['context'], callback: 'start_backup_server',
-          priority: 12, label: '{{_("Backup Server...") }}',
+          priority: 12, label: '{{_("Backup Server ...") }}',
           icon: 'fa fa-floppy-o', enable: menu_enabled_server
         },{
           name: 'backup_object', module: this,
           applies: ['tools'], callback: 'backup_objects',
-          priority: 11, label: '{{_("Backup...") }}',
+          priority: 11, label: '{{_("Backup ...") }}',
           icon: 'fa fa-floppy-o', enable: menu_enabled
         }];
 
@@ -346,7 +346,7 @@ TODO LIST FOR BACKUP:
             name: 'backup_' + backup_supported_nodes[idx],
             node: backup_supported_nodes[idx], module: this,
             applies: ['context'], callback: 'backup_objects',
-            priority: 11, label: '{{_("Backup...") }}',
+            priority: 11, label: '{{_("Backup ...") }}',
             icon: 'fa fa-floppy-o', enable: menu_enabled
             });
         }
@@ -424,8 +424,8 @@ TODO LIST FOR BACKUP:
 
         var DialogName = 'BackupDialog_' + of_type,
             DialogTitle = ((of_type == 'globals') ?
-              '{{ _('Backup Globals...') }}' :
-              '{{ _('Backup Server...') }}');
+              '{{ _('Backup Globals ...') }}' :
+              '{{ _('Backup Server ...') }}');
 
         if(!alertify[DialogName]) {
           alertify.dialog(DialogName ,function factory() {
diff --git a/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js b/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
index f568fa1d..ca08f43a 100644
--- a/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
@@ -100,7 +100,7 @@ define(
             name: 'view_filtered_rows_context_' + supported_nodes[idx],
             node: supported_nodes[idx], module: this, data: {mnuid: 4},
             applies: ['context', 'object'], callback: 'show_filtered_row', enable: view_menu_enabled,
-            category: 'view_data', priority: 104, label: '{{ _('View Filtered Rows...') }}'
+            category: 'view_data', priority: 104, label: '{{ _('View Filtered Rows ...') }}'
          });
         }
 
diff --git a/web/pgadmin/tools/debugger/templates/debugger/js/direct.js b/web/pgadmin/tools/debugger/templates/debugger/js/direct.js
index 971b1135..d74aa8f5 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/js/direct.js
+++ b/web/pgadmin/tools/debugger/templates/debugger/js/direct.js
@@ -349,7 +349,7 @@ define(
               pgTools.DirectDebug.polling_timeout_idle = true;
               // If status is Busy then poll the result by recursive call to the poll function
               if (!pgTools.DirectDebug.debug_type) {
-                pgTools.DirectDebug.docker.startLoading('{{ _('Waiting for another session to invoke the target...') }}');
+                pgTools.DirectDebug.docker.startLoading('{{ _('Waiting for another session to invoke the target ...') }}');
 
                 // As we are waiting for another session to invoke the target,disable all the buttons
                 self.enable('stop', false);
@@ -1583,7 +1583,7 @@ define(
           self.editor.on("gutterClick", self.onBreakPoint.bind(self), self);
         };
 
-        self.docker.startLoading('{{ _('Loading...') }}');
+        self.docker.startLoading('{{ _('Loading ...') }}');
         self.docker.on(wcDocker.EVENT.LOADED, onLoad);
 
         // Create the toolbar view for debugging the function
diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js
index db6cfd0f..550d762c 100644
--- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js
@@ -176,7 +176,7 @@ define([
         var menus = [{
           name: 'grant_wizard_schema', module: this,
           applies: ['tools'], callback: 'start_grant_wizard',
-          priority: 14, label: '{{_("Grant Wizard...") }}',
+          priority: 14, label: '{{_("Grant Wizard ...") }}',
           icon: 'fa fa-unlock-alt', enable: menu_enabled
         }];
 
@@ -186,7 +186,7 @@ define([
             name: 'grant_wizard_schema_context_' + supported_nodes[idx],
             node: supported_nodes[idx], module: this,
             applies: ['context'], callback: 'start_grant_wizard',
-            priority: 14, label: '{{_("Grant Wizard...") }}',
+            priority: 14, label: '{{_("Grant Wizard ...") }}',
             icon: 'fa fa-unlock-alt', enable: menu_enabled
             });
         }
@@ -634,7 +634,7 @@ define([
                   disable_prev: true,
                   disable_next: true,
                   show_description: _('Please select objects from the list below.'),
-                  show_progress_bar: _('Please wait while fetching records...'),
+                  show_progress_bar: _('Please wait while fetching records ...'),
                   model: newModel,
                   view: new (function() {
 
diff --git a/web/pgadmin/tools/import_export/__init__.py b/web/pgadmin/tools/import_export/__init__.py
index e5bd7089..40c0e416 100644
--- a/web/pgadmin/tools/import_export/__init__.py
+++ b/web/pgadmin/tools/import_export/__init__.py
@@ -107,7 +107,7 @@ class IEMessage(IProcessDesc):
         ).first()
 
         return _(
-            "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4})..."
+            "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4}) ..."
         ).format(
             self.schema, self.table, self.database, s.host, s.port
         )
@@ -214,7 +214,7 @@ def create_import_export_job(sid):
     connected = conn.connected()
 
     if not connected:
-        return bad_request(errormsg=_("Please connect to the server first..."))
+        return bad_request(errormsg=_("Please connect to the server first ..."))
 
     # Get the utility path from the connection manager
     utility = manager.utility('sql')
diff --git a/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js b/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
index 612992c0..2592fa75 100644
--- a/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
+++ b/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
@@ -119,7 +119,7 @@ define(
         node: 'column', url: 'nodes', group: '{{ _('Columns')}}',
         select2: {
           multiple: true, allowClear: false,
-          placeholder: '{{ _('Columns for importing...') }}',
+          placeholder: '{{ _('Columns for importing ...') }}',
           first_empty: false
         }, visible: 'importing',
         helpMessage:
@@ -131,7 +131,7 @@ define(
         node: 'column', url: 'nodes', group: '{{ _('Columns')}}',
         select2: {
           multiple: true, allowClear: true,
-          placeholder: '{{ _('Colums for exporting...') }}'
+          placeholder: '{{ _('Colums for exporting ...') }}'
         }, visible: 'exporting',
         transform: function(rows) {
           var self = this,
@@ -171,7 +171,7 @@ define(
         type: 'array', first_empty: false,
         select2: {
           multiple: true, allowClear: true, first_empty: true,
-          placeholder: '{{ _('Not null columns...') }}'
+          placeholder: '{{ _('Not null columns ...') }}'
         },
         helpMessage:
           '{{ _('Do not match the specified columns values against the null string. In the default case where the null string is empty, this means that empty values will be read as zero-length strings rather than nulls, even when they are not quoted. This option is allowed only in import, and only when using CSV format.') }}'
@@ -198,7 +198,7 @@ define(
             tags: true,
             allowClear: false,
             width: "100%",
-            placeholder: '{{ _('Select from list...') }}'
+            placeholder: '{{ _('Select from list ...') }}'
           }, helpMessage:
             '{{ _('Specifies the character that separates columns within each row (line) of the file. The default is a tab character in text format, a comma in CSV format. This must be a single one-byte character. This option is not allowed when using binary format.') }}'
         },
@@ -213,7 +213,7 @@ define(
             tags: true,
             allowClear: false,
             width: "100%",
-            placeholder: '{{ _('Select from list...') }}'
+            placeholder: '{{ _('Select from list ...') }}'
           }, helpMessage:
             '{{ _('Specifies the quoting character to be used when a data value is quoted. The default is double-quote. This must be a single one-byte character. This option is allowed only when using CSV format.') }}'
         },
@@ -228,7 +228,7 @@ define(
             tags: true,
             allowClear: false,
             width: "100%",
-            placeholder: '{{ _('Select from list...') }}'
+            placeholder: '{{ _('Select from list ...') }}'
           }, helpMessage:
             '{{ _('Specifies the character that should appear before a data character that matches the QUOTE value. The default is the same as the QUOTE value (so that the quoting character is doubled if it appears in the data). This must be a single one-byte character. This option is allowed only when using CSV format.') }}'
         }]
@@ -289,7 +289,7 @@ define(
         pgBrowser.add_menus([{
           name: 'import', node: 'table', module: this,
           applies: ['tools', 'context'], callback: 'callback_import_export',
-          category: 'import', priority: 10, label: '{{ _('Import/Export...') }}',
+          category: 'import', priority: 10, label: '{{ _('Import/Export ...') }}',
           icon: 'fa fa-shopping-cart', enable: menu_enabled
         }]);
       },
diff --git a/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js b/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
index 0466e74e..dd10b490 100644
--- a/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
@@ -73,7 +73,7 @@ define(
         select2: {
           allowClear: false,
           width: "100%",
-          placeholder: '{{ _('Select from list...') }}'
+          placeholder: '{{ _('Select from list ...') }}'
         },
       },
       {
@@ -174,7 +174,7 @@ define(
         var menus = [{
           name: 'maintenance', module: this,
           applies: ['tools'], callback: 'callback_maintenace',
-          priority: 10, label: '{{ _('Maintenance...') }}',
+          priority: 10, label: '{{ _('Maintenance ...') }}',
           icon: 'fa fa-wrench', enable: menu_enabled
         }];
 
@@ -184,7 +184,7 @@ define(
             name: 'maintenance_context_' + maintenance_supported_nodes[idx],
             node: maintenance_supported_nodes[idx], module: this,
             applies: ['context'], callback: 'callback_maintenace',
-            priority: 10, label: '{{_("Maintenance...") }}',
+            priority: 10, label: '{{_("Maintenance ...") }}',
             icon: 'fa fa-wrench', enable: menu_enabled
           });
         }
 
diff --git a/web/pgadmin/tools/restore/__init__.py b/web/pgadmin/tools/restore/__init__.py
index 393639bd..57ed37e4 100644
--- a/web/pgadmin/tools/restore/__init__.py
+++ b/web/pgadmin/tools/restore/__init__.py
@@ -87,7 +87,7 @@ class RestoreMessage(IProcessDesc):
             id=self.sid, user_id=current_user.id
         ).first()
 
-        return _("Restoring backup on the server '{0}'...").format(
+        return _("Restoring backup on the server '{0}' ...").format(
             "{0} ({1}:{2})".format(s.name, s.host, s.port),
         )
 
@@ -101,7 +101,7 @@ class RestoreMessage(IProcessDesc):
 
         res += html.safe_str(
             _(
-                "Restoring the backup on the server '{0}'..."
+                "Restoring the backup on the server '{0}' ..."
             ).format(
                 "{0} ({1}:{2})".format(s.name, s.host, s.port)
             )
diff --git a/web/pgadmin/tools/restore/templates/restore/js/restore.js b/web/pgadmin/tools/restore/templates/restore/js/restore.js
index b76927c0..d14c996a 100644
--- a/web/pgadmin/tools/restore/templates/restore/js/restore.js
+++ b/web/pgadmin/tools/restore/templates/restore/js/restore.js
@@ -275,7 +275,7 @@ define([
         var menus = [{
           name: 'restore_object', module: this,
           applies: ['tools'], callback: 'restore_objects',
-          priority: 13, label: '{{_("Restore...") }}',
+          priority: 13, label: '{{_("Restore ...") }}',
           icon: 'fa fa-upload', enable: menu_enabled
         }];
 
@@ -284,7 +284,7 @@ define([
             name: 'restore_' + restore_supported_nodes[idx],
             node: restore_supported_nodes[idx], module: this,
             applies: ['context'], callback: 'restore_objects',
-            priority: 13, label: '{{_("Restore...") }}',
+            priority: 13, label: '{{_("Restore ...") }}',
             icon: 'fa fa-upload', enable: menu_enabled
             });
         }
diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
index db7482d7..8dded549 100644
--- a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
@@ -1639,7 +1639,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:message',
-              '{{ _('Waiting for the query execution to complete...') }}'
+              '{{ _('Waiting for the query execution to complete ...') }}'
           );
 
           $.ajax({
@@ -1792,7 +1792,7 @@ define(
                   if (res.data.status === 'Success') {
                     self.trigger(
                       'pgadmin-sqleditor:loading-icon:message',
-                      '{{ _('Loading data from the database server and rendering...') }}'
+                      '{{ _('Loading data from the database server and rendering ...') }}'
                     );
                     self.get_columns(res.data);
                   }
@@ -1896,7 +1896,7 @@ define(
 
               self.trigger(
                 'pgadmin-sqleditor:loading-icon:message',
-                '{{ _('Loading data from the database server and rendering...') }}',
+                '{{ _('Loading data from the database server and rendering ...') }}',
                 self
               );
 
@@ -1982,7 +1982,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:message',
-            '{{ _('Retrieving information about the columns returned...') }}'
+            '{{ _('Retrieving information about the columns returned ...') }}'
           );
 
           // Make ajax call to fetch the pg types to map numeric data type
@@ -2280,7 +2280,7 @@ define(
 
             self.trigger(
               'pgadmin-sqleditor:loading-icon:show',
-              '{{ _('Saving the updated data...') }}'
+              '{{ _('Saving the updated data ...') }}'
             );
 
             // Add the columns to the data so the server can remap the data
@@ -2472,7 +2472,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Loading the file...') }}'
+            '{{ _('Loading the file ...') }}'
           );
           // set cursor to progress before file load
           var $busy_icon_div = $('.sql-editor-busy-fetching');
@@ -2520,7 +2520,7 @@ define(
           }
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Saving the queries in the file...') }}'
+            '{{ _('Saving the queries in the file ...') }}'
           );
 
           // Make ajax call to save the data to file
@@ -2638,7 +2638,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Loading the existing filter options...') }}'
+            '{{ _('Loading the existing filter options ...') }}'
           );
           $.ajax({
             url: "{{ url_for('sqleditor.index') }}" + "filter/get/" + self.transId,
@@ -2708,7 +2708,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Applying the new filter...') }}'
+            '{{ _('Applying the new filter ...') }}'
           );
 
           // Make ajax call to include the filter by selection
@@ -2778,7 +2778,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Applying the new filter...') }}'
+            '{{ _('Applying the new filter ...') }}'
           );
 
           // Make ajax call to exclude the filter by selection.
@@ -2831,7 +2831,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Removing the filter...') }}'
+            '{{ _('Removing the filter ...') }}'
           );
 
           // Make ajax call to exclude the filter by selection.
@@ -2882,7 +2882,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Applying the filter...') }}'
+            '{{ _('Applying the filter ...') }}'
           );
 
           // Make ajax call to include the filter by selection
@@ -3094,7 +3094,7 @@ define(
 
           self.trigger(
             'pgadmin-sqleditor:loading-icon:show',
-            '{{ _('Setting the limit on the result...') }}'
+            '{{ _('Setting the limit on the result ...') }}'
           );
           // Make ajax call to change the limit
           $.ajax({
@@ -3202,7 +3202,7 @@ define(
               if (res.data.status) {
                 self.trigger(
                   'pgadmin-sqleditor:loading-icon:message',
-                   '{{ _('Waiting for the query execution to complete...') }}'
+                   '{{ _('Waiting for the query execution to complete ...') }}'
                 );
 
                 self.can_edit = res.data.can_edit;
diff --git a/web/pgadmin/translations/pl/LC_MESSAGES/messages.mo b/web/pgadmin/translations/pl/LC_MESSAGES/messages.mo
index 675b07ba..041fcb5c 100644
Binary files a/web/pgadmin/translations/pl/LC_MESSAGES/messages.mo and b/web/pgadmin/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/web/pgadmin/translations/pl/LC_MESSAGES/messages.po b/web/pgadmin/translations/pl/LC_MESSAGES/messages.po
index ba23e94d..e3d054bd 100644
--- a/web/pgadmin/translations/pl/LC_MESSAGES/messages.po
+++ b/web/pgadmin/translations/pl/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-09 09:21+0000\n"
+"POT-Creation-Date: 2017-03-17 00:40+0100\n"
 "PO-Revision-Date: 2017-03-09 18:02+0200\n"
 "Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
 "Language-Team: begina.felicysym@wp.eu\n"
@@ -280,20 +280,20 @@ msgstr "Przeładowano konfigurację serwera."
 
 #: pgadmin/browser/server_groups/servers/__init__.py:894
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:185
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1763
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1899
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2438
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2739
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2808
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2879
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2929
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2984
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3192
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3300
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3398
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3443
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3496
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3535
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1695
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1831
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2370
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2671
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2740
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2811
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2861
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2916
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3124
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3232
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3330
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3375
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3428
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3467
 msgid ""
 "Not connected to the server or the connection to the server has been "
 "closed."
@@ -474,7 +474,8 @@ msgstr "Rzutowanie"
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:41
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:47
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:52
-msgid "Cast..."
+#, fuzzy
+msgid "Cast ..."
 msgstr "Rzutowanie..."
 
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:73
@@ -696,7 +697,8 @@ msgstr "Wyzwalacz Zdarzeniowy"
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:38
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:43
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:48
-msgid "Event Trigger..."
+#, fuzzy
+msgid "Event Trigger ..."
 msgstr "Wyzwalacz Zdarzeniowy..."
 
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:91
@@ -859,7 +861,8 @@ msgstr "Rozszerzenie"
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:64
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:69
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:74
-msgid "Extension..."
+#, fuzzy
+msgid "Extension ..."
 msgstr "Rozszerzenie..."
 
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:180
@@ -1107,7 +1110,8 @@ msgstr "Serwer Obcy"
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:76
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:81
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:86
-msgid "Foreign Server..."
+#, fuzzy
+msgid "Foreign Server ..."
 msgstr "Serwer Obcy..."
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:135
@@ -1187,7 +1191,8 @@ msgstr "Mapowanie Użytkownika"
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:76
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:81
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:86
-msgid "User Mapping..."
+#, fuzzy
+msgid "User Mapping ..."
 msgstr "Mapowanie Użytkownika..."
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:113
@@ -1225,7 +1230,8 @@ msgstr "Opakowanie Obcych Danych"
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:79
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:84
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:89
-msgid "Foreign Data Wrapper..."
+#, fuzzy
+msgid "Foreign Data Wrapper ..."
 msgstr "Opakowanie Obcych Danych..."
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:140
@@ -1302,7 +1308,8 @@ msgstr "Język"
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:42
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:48
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:53
-msgid "Language..."
+#, fuzzy
+msgid "Language ..."
 msgstr "Język..."
 
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:125
@@ -1480,7 +1487,8 @@ msgstr "Porównanie skasowane"
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:36
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:48
-msgid "Collation..."
+#, fuzzy
+msgid "Collation ..."
 msgstr "Porównanie..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:106
@@ -1557,7 +1565,8 @@ msgstr "Ograniczenie Domeny skasowane"
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:39
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:45
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:51
-msgid "Domain Constraint..."
+#, fuzzy
+msgid "Domain Constraint ..."
 msgstr "Ograniczenie Domeny..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:79
@@ -1590,7 +1599,8 @@ msgstr "Domena"
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:107
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:113
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:119
-msgid "Domain..."
+#, fuzzy
+msgid "Domain ..."
 msgstr "Domena..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:175
@@ -1693,7 +1703,8 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:2792
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:2841
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1211
-msgid "-- Please create column(s) first..."
+#, fuzzy
+msgid "-- Please create column(s) first ..."
 msgstr "-- Należy najpierw utworzyć kolumnę(y)... "
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:91
@@ -1743,7 +1754,8 @@ msgstr "Tabela Obca"
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:469
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:475
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:481
-msgid "Foreign Table..."
+#, fuzzy
+msgid "Foreign Table ..."
 msgstr "Tabela Obca..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:538
@@ -1850,7 +1862,8 @@ msgstr "Konfiguracja FTS"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:438
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:445
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:451
-msgid "FTS Configuration..."
+#, fuzzy
+msgid "FTS Configuration ..."
 msgstr "Konfiguracja FTS..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:499
@@ -1944,7 +1957,8 @@ msgstr "Słownik FTS"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:78
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:85
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:90
-msgid "FTS Dictionary..."
+#, fuzzy
+msgid "FTS Dictionary ..."
 msgstr "Słownik FTS..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:137
@@ -2007,7 +2021,8 @@ msgstr "Parser FTS"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:48
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:54
-msgid "FTS Parser..."
+#, fuzzy
+msgid "FTS Parser ..."
 msgstr "Parser FTS..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:98
@@ -2098,7 +2113,8 @@ msgstr "Szablon FTS"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:41
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:53
-msgid "FTS Template..."
+#, fuzzy
+msgid "FTS Template ..."
 msgstr "Szablon FTS..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:92
@@ -2181,7 +2197,8 @@ msgstr "Wartość Domyślna"
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:108
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:114
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:120
-msgid "Function..."
+#, fuzzy
+msgid "Function ..."
 msgstr "Funkcja..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:192
@@ -2405,7 +2422,8 @@ msgstr "Procedura"
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:53
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:59
-msgid "Procedure..."
+#, fuzzy
+msgid "Procedure ..."
 msgstr "Procedura..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:12
@@ -2415,7 +2433,8 @@ msgstr "Funkcje wyzwalacza"
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:41
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:53
-msgid "Trigger function..."
+#, fuzzy
+msgid "Trigger function ..."
 msgstr "Funkcja wyzwalacza..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:55
@@ -2478,7 +2497,8 @@ msgstr "Pakiet"
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:36
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:48
-msgid "Package..."
+#, fuzzy
+msgid "Package ..."
 msgstr "Pakiet..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:127
@@ -2529,7 +2549,8 @@ msgstr "Sekwencja"
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:40
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:46
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:52
-msgid "Sequence..."
+#, fuzzy
+msgid "Sequence ..."
 msgstr "Sekwencja..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:148
@@ -2621,7 +2642,8 @@ msgstr "Synonim"
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:34
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:40
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:46
-msgid "Synonym..."
+#, fuzzy
+msgid "Synonym ..."
 msgstr "Synonim..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:102
@@ -2748,7 +2770,8 @@ msgstr "Należy dostarczyć wejście dla zmiennej. "
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:136
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:142
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:148
-msgid "Column..."
+#, fuzzy
+msgid "Column ..."
 msgstr "Kolumna..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:185
@@ -2856,7 +2879,8 @@ msgid "Check constraint updated."
 msgstr "Ograniczenie sprawdzające zmodyfikowane."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js:31
-msgid "Check..."
+#, fuzzy
+msgid "Check ..."
 msgstr "Sprawdzenie..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js:37
@@ -2965,7 +2989,8 @@ msgid "Exclusion constraint"
 msgstr "Ograniczenie wykluczające"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js:640
-msgid "Exclusion constraint..."
+#, fuzzy
+msgid "Exclusion constraint ..."
 msgstr "Ograniczenie wykluczające..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js:687
@@ -3070,7 +3095,8 @@ msgid "Foreign key"
 msgstr "Klucz obcy"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js:623
-msgid "Foreign key..."
+#, fuzzy
+msgid "Foreign key ..."
 msgstr "Klucz obcy..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js:629
@@ -3211,7 +3237,8 @@ msgstr "Nazwa Kolumny nie może być pusta."
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:234
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:240
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:246
-msgid "Index..."
+#, fuzzy
+msgid "Index ..."
 msgstr "Indeks..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:285
@@ -3289,7 +3316,8 @@ msgstr "reguła"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:87
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:93
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:99
-msgid "Rule..."
+#, fuzzy
+msgid "Rule ..."
 msgstr "Reguła..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:146
@@ -3465,7 +3493,8 @@ msgstr "Rozmiar"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:45
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:51
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:57
-msgid "Table..."
+#, fuzzy
+msgid "Table ..."
 msgstr "Tabela..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:63
@@ -3503,7 +3532,8 @@ msgid "Are you sure you want to reset the statistics for table %s?"
 msgstr "Czy na pewno chcesz zresetować statystyki na tabeli %s?"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:332
-msgid "Select to inherit from..."
+#, fuzzy
+msgid "Select to inherit from ..."
 msgstr "Wybór dziedziczenia z..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:414
@@ -3822,7 +3852,8 @@ msgstr "Wyzwalacz"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:64
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:70
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:86
-msgid "Trigger..."
+#, fuzzy
+msgid "Trigger ..."
 msgstr "Wyzwalacz..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:76
@@ -3941,7 +3972,8 @@ msgstr "Tabela Odkurzenia Toast"
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:302
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:307
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:312
-msgid "Schema..."
+#, fuzzy
+msgid "Schema ..."
 msgstr "Schemat..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:349
@@ -4072,7 +4104,8 @@ msgstr "Należy określić wartość etykiety."
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:281
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:287
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:293
-msgid "Type..."
+#, fuzzy
+msgid "Type ..."
 msgstr "Typ..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:376
@@ -4258,7 +4291,8 @@ msgstr "Odśwież Widok"
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:71
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:77
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:83
-msgid "Materialized View..."
+#, fuzzy
+msgid "Materialized View ..."
 msgstr "Widok Zmaterializowany..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:87
@@ -4298,7 +4332,8 @@ msgstr "Proszę wprowadzić definicję widoku."
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:67
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:73
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:79
-msgid "View..."
+#, fuzzy
+msgid "View ..."
 msgstr "Widok..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:127
@@ -4340,15 +4375,18 @@ msgstr "Baza danych"
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:46
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:52
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:58
-msgid "Database..."
+#, fuzzy
+msgid "Database ..."
 msgstr "Baza danych..."
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:64
-msgid "Connect Database..."
+#, fuzzy
+msgid "Connect Database ..."
 msgstr "Połącz z Bazą Danych..."
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:69
-msgid "Disconnect Database..."
+#, fuzzy
+msgid "Disconnect Database ..."
 msgstr "&Rozłącz Bazę danych..."
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:137
@@ -4991,7 +5029,8 @@ msgstr "Plan"
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:204
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:209
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:214
-msgid "Schedule..."
+#, fuzzy
+msgid "Schedule ..."
 msgstr "Plan..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:254
@@ -5075,7 +5114,8 @@ msgid "Week Days"
 msgstr "Dni Tygodnia"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:353
-msgid "Select the weekdays..."
+#, fuzzy
+msgid "Select the weekdays ..."
 msgstr "Wybierz dni tygodnia..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:363
@@ -5083,11 +5123,13 @@ msgid "Month Days"
 msgstr "Dni Miesiąca"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:369
-msgid "Select the month days..."
+#, fuzzy
+msgid "Select the month days ..."
 msgstr "Wybierz dni miesiąca..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:384
-msgid "Select the months..."
+#, fuzzy
+msgid "Select the months ..."
 msgstr "Wybierz miesiące..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:394
@@ -5097,11 +5139,13 @@ msgid "Times"
 msgstr "Czasy"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:403
-msgid "Select the hours..."
+#, fuzzy
+msgid "Select the hours ..."
 msgstr "Wybierz godziny..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:418
-msgid "Select the minutes..."
+#, fuzzy
+msgid "Select the minutes ..."
 msgstr "Wybierz minuty..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:451
@@ -5127,7 +5171,8 @@ msgstr "Nie udało się znaleźć wskazanego kroku zadania."
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:50
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:55
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:60
-msgid "Job Step..."
+#, fuzzy
+msgid "Job Step ..."
 msgstr "Krok Zadania..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:104
@@ -5249,7 +5294,8 @@ msgstr "Zadanie pgAgenta"
 
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:48
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:53
-msgid "pgAgent Job..."
+#, fuzzy
+msgid "pgAgent Job ..."
 msgstr "Zadanie pgAgenta..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:58
@@ -5381,7 +5427,8 @@ msgstr "Grupa zasobów"
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:37
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:51
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:56
-msgid "Resource Group..."
+#, fuzzy
+msgid "Resource Group ..."
 msgstr "Grupa zasobów..."
 
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:75
@@ -5778,7 +5825,7 @@ msgstr "Grupa Roli"
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:362
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:368
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:374
-msgid "Login/Group Role..."
+msgid "Login/Group Role ..."
 msgstr ""
 
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:411
@@ -5862,11 +5909,13 @@ msgstr "-- Niepełna definicja"
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:38
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:44
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:50
-msgid "Tablespace..."
+#, fuzzy
+msgid "Tablespace ..."
 msgstr "Przestrzeń Tabel..."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:57
-msgid "Move objects to..."
+#, fuzzy
+msgid "Move objects to ..."
 msgstr "Przenieś obiekty do..."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:101
@@ -5898,7 +5947,7 @@ msgstr "Użytkownicy"
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:922
 #: pgadmin/preferences/templates/preferences/preferences.js:357
 #: pgadmin/preferences/templates/preferences/preferences.js:381
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:262
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:265
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:376
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:396
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:272
@@ -5934,7 +5983,8 @@ msgid "Please select tablespace"
 msgstr "Proszę wybrać przestrzeń tabel."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:263
-msgid "Move objects..."
+#, fuzzy
+msgid "Move objects ..."
 msgstr "Przenieś obiekty..."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:264
@@ -5965,7 +6015,8 @@ msgstr "Etykieta musi być określona."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:60
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:65
-msgid "Server..."
+#, fuzzy
+msgid "Server ..."
 msgstr "Serwer..."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:70
@@ -5981,11 +6032,13 @@ msgid "Reload Configuration"
 msgstr "Przeładuj Konfigurację"
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:85
-msgid "Add Named Restore Point..."
+#, fuzzy
+msgid "Add Named Restore Point ..."
 msgstr "Dodaj Nazwany Punkt Przywrócenia..."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:90
-msgid "Change Password..."
+#, fuzzy
+msgid "Change Password ..."
 msgstr "Zmień hasło..."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:95
@@ -6190,7 +6243,8 @@ msgid "Server Group"
 msgstr "Grupa Serwerów"
 
 #: pgadmin/browser/server_groups/templates/server_groups/server_groups.js:24
-msgid "Server Group..."
+#, fuzzy
+msgid "Server Group ..."
 msgstr "Grupa Serwerów..."
 
 #: pgadmin/browser/server_groups/templates/server_groups/server_groups.js:48
@@ -6198,7 +6252,8 @@ msgid "The ID cannot be changed."
 msgstr "ID nie może zostać zmieniony."
 
 #: pgadmin/browser/templates/browser/index.html:94
-msgid "Loading {0} v{1}..."
+#, fuzzy
+msgid "Loading {0} v{1} ..."
 msgstr "Wczytywanie {0} v{1}..."
 
 #: pgadmin/browser/templates/browser/index.html:100
@@ -6301,12 +6356,14 @@ msgstr "Czy na pewno zamknąć przeglądarkę z %(appname)s?"
 
 #: pgadmin/browser/templates/browser/js/collection.js:36
 #: pgadmin/browser/templates/browser/js/node.js:86
-msgid "Refresh..."
+#, fuzzy
+msgid "Refresh ..."
 msgstr "Odśwież..."
 
 #: pgadmin/browser/templates/browser/js/collection.js:46
 #: pgadmin/browser/templates/browser/js/node.js:128
-msgid "Query Tool..."
+#, fuzzy
+msgid "Query Tool ..."
 msgstr "Narzędzie Zapytania..."
 
 #: pgadmin/browser/templates/browser/js/collection.js:128
@@ -6396,7 +6453,8 @@ msgid "Unselect All"
 msgstr "Odznacz Wszystko"
 
 #: pgadmin/browser/templates/browser/js/messages.js:32
-msgid "Retrieving data from the server..."
+#, fuzzy
+msgid "Retrieving data from the server ..."
 msgstr "Odczyt danych z serwera..."
 
 #: pgadmin/browser/templates/browser/js/messages.js:33
@@ -6404,7 +6462,8 @@ msgid "Failed to retrieve data from the server."
 msgstr "NIe udało się odczytać danych z serwera."
 
 #: pgadmin/browser/templates/browser/js/node.js:94
-msgid "Properties..."
+#, fuzzy
+msgid "Properties ..."
 msgstr "Właściwości..."
 
 #: pgadmin/browser/templates/browser/js/node.js:103
@@ -6921,7 +6980,8 @@ msgid "Execution time"
 msgstr "Czas wykonania"
 
 #: pgadmin/misc/bgprocess/__init__.py:55
-msgid "Running..."
+#, fuzzy
+msgid "Running ..."
 msgstr "Uruchomiony..."
 
 #: pgadmin/misc/bgprocess/__init__.py:56
@@ -6938,7 +6998,7 @@ msgid "Too many logs generated!"
 msgstr "Wytworzono za wiele logów!"
 
 #: pgadmin/misc/bgprocess/processes.py:76
-#: pgadmin/misc/bgprocess/processes.py:518
+#: pgadmin/misc/bgprocess/processes.py:555
 msgid "Could not find a process with the specified ID."
 msgstr "Nie znaleziono procesu o wskazanym ID."
 
@@ -6950,7 +7010,7 @@ msgstr "Proces został już uruchomiony."
 msgid "The process has already finished and can not be restarted."
 msgstr "Proces został już zakończony i nie może być uruchomiony ponownie."
 
-#: pgadmin/misc/bgprocess/processes.py:439
+#: pgadmin/misc/bgprocess/processes.py:476
 msgid "Status for the background process '{0}' could not be loaded."
 msgstr "Status procesu w tle '{0}' nie może być wczytany."
 
@@ -7134,15 +7194,18 @@ msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #: pgadmin/tools/backup/__init__.py:115 pgadmin/tools/backup/__init__.py:142
-msgid "Backing up an object on the server '{0}' from database '{1}'..."
+#, fuzzy
+msgid "Backing up an object on the server '{0}' from database '{1}' ..."
 msgstr "Tworzenie kopii zapasowej obiektu na serwerze '{0}' z bazy danych '{1}'..."
 
 #: pgadmin/tools/backup/__init__.py:122
-msgid "Backing up the global objects on the server - '{0}'..."
+#, fuzzy
+msgid "Backing up the global objects on the server - '{0}' ..."
 msgstr "Tworzenie kopii zapasowej obiektów globalnych serwera - '{0}'..."
 
 #: pgadmin/tools/backup/__init__.py:126
-msgid "Backing up the server '{0}'..."
+#, fuzzy
+msgid "Backing up the server '{0}' ..."
 msgstr "Tworzenie kopii zapasowej serwera '{0}'..."
 
 #: pgadmin/tools/backup/__init__.py:149
@@ -7159,14 +7222,14 @@ msgstr "Tworzenie kopii zapasowej serwera '{0}'"
 msgid "Running command:"
 msgstr "Wykonywane polecenie:"
 
-#: pgadmin/tools/backup/__init__.py:239 pgadmin/tools/backup/__init__.py:337
-#: pgadmin/tools/restore/__init__.py:198
+#: pgadmin/tools/backup/__init__.py:242 pgadmin/tools/backup/__init__.py:343
+#: pgadmin/tools/restore/__init__.py:201
 msgid "Could not find the specified server."
 msgstr "Nie udało się znaleźć wskazanego serwera."
 
-#: pgadmin/tools/backup/__init__.py:252 pgadmin/tools/backup/__init__.py:350
+#: pgadmin/tools/backup/__init__.py:255 pgadmin/tools/backup/__init__.py:356
 #: pgadmin/tools/maintenance/__init__.py:206
-#: pgadmin/tools/restore/__init__.py:212
+#: pgadmin/tools/restore/__init__.py:215
 msgid "Please connect to the server first."
 msgstr "Należy najpierw połączyć z serwerem."
 
@@ -7367,18 +7430,21 @@ msgstr "Użyj SET SESSION AUTHORIZATION"
 #: pgadmin/tools/backup/templates/backup/js/backup.js:320
 #: pgadmin/tools/backup/templates/backup/js/backup.js:330
 #: pgadmin/tools/backup/templates/backup/js/backup.js:427
-msgid "Backup Globals..."
+#, fuzzy
+msgid "Backup Globals ..."
 msgstr "Globalna Kopia Zapasowa..."
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:325
 #: pgadmin/tools/backup/templates/backup/js/backup.js:335
 #: pgadmin/tools/backup/templates/backup/js/backup.js:428
-msgid "Backup Server..."
+#, fuzzy
+msgid "Backup Server ..."
 msgstr "Serwer Kopii Zapasowej..."
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:340
 #: pgadmin/tools/backup/templates/backup/js/backup.js:349
-msgid "Backup..."
+#, fuzzy
+msgid "Backup ..."
 msgstr "Tworzenie Kopii Zapasowej..."
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:385
@@ -7503,7 +7569,7 @@ msgid "Paste Row"
 msgstr "Wklej Wiersz"
 
 #: pgadmin/tools/datagrid/templates/datagrid/index.html:107
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2288
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2220
 msgid "Delete Row(s)"
 msgstr "Usuń Wiersz(e)"
 
@@ -7597,35 +7663,36 @@ msgstr "Zastosuj"
 msgid "Error fetching SQL for script: \"%s\""
 msgstr "Błąd pobrania SQL skryptu: \"%s\""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:75
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:78
 msgid "Query Tool"
 msgstr "Narzędzie Zapytania"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:85
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:88
 msgid "View All Rows"
 msgstr "Podgląd Wszystkich Wierszy"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:90
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:93
 msgid "View First 100 Rows"
 msgstr "Podgląd Pierwszych 100 Wierszy"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:95
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:98
 msgid "View Last 100 Rows"
 msgstr "Podgląd Ostatnich 100 Wierszy"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:100
-msgid "View Filtered Rows..."
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:103
+#, fuzzy
+msgid "View Filtered Rows ..."
 msgstr "Podgląd Filtrowanych Wierszy..."
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:104
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:107
 msgid "View Data"
 msgstr "Podgląd danych"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:412
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:415
 msgid " untitled"
 msgstr ""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:461
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:464
 msgid "Query Tool Initialize Error"
 msgstr "Błąd Uruchomienia Narzędzia Zapytania"
 
@@ -7781,7 +7848,8 @@ msgid "Please enter a value for the parameter."
 msgstr "Należy wprowadzić wartość parametru."
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:352
-msgid "Waiting for another session to invoke the target..."
+#, fuzzy
+msgid "Waiting for another session to invoke the target ..."
 msgstr "Oczekiwanie na inną sesję by wywołała cel..."
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1493
@@ -7789,7 +7857,7 @@ msgid "Local variables"
 msgstr "Zmienne lokalne"
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1504
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:265
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:197
 msgid "Messages"
 msgstr "Komunikaty"
 
@@ -7802,7 +7870,8 @@ msgid "Stack"
 msgstr "Stos"
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1586
-msgid "Loading..."
+#, fuzzy
+msgid "Loading ..."
 msgstr "Ładowanie..."
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:66
@@ -7811,7 +7880,8 @@ msgstr "Należy wybrać jakiś obiekt bazy danych/"
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:179
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:189
-msgid "Grant Wizard..."
+#, fuzzy
+msgid "Grant Wizard ..."
 msgstr "Kreator Uprawnień..."
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:586
@@ -7824,7 +7894,8 @@ msgid "Import/Export"
 msgstr "Import/Eksport"
 
 #: pgadmin/tools/import_export/__init__.py:109
-msgid "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4})..."
+#, fuzzy
+msgid "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4}) ..."
 msgstr ""
 "Kopiowanie danych tabeli - '{0}.{1}' na bazie danych '{2}' i serwerze "
 "({3}{4})..."
@@ -7839,11 +7910,12 @@ msgid "Could not find the given server"
 msgstr "Nie udało się znaleźć wskazanego serwera"
 
 #: pgadmin/tools/import_export/__init__.py:217
-msgid "Please connect to the server first..."
+#, fuzzy
+msgid "Please connect to the server first ..."
 msgstr "Należy najpierw połączyć z serwerem..."
 
-#: pgadmin/tools/import_export/__init__.py:228
-#: pgadmin/tools/import_export/__init__.py:235
+#: pgadmin/tools/import_export/__init__.py:232
+#: pgadmin/tools/import_export/__init__.py:239
 msgid "Please specify a valid file"
 msgstr "Należy określić poprawny plik"
 
@@ -7868,7 +7940,8 @@ msgid "Columns to import"
 msgstr "Kolumny do zaimportowania"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:122
-msgid "Columns for importing..."
+#, fuzzy
+msgid "Columns for importing ..."
 msgstr "Kolumny do importu..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:126
@@ -7885,7 +7958,8 @@ msgid "Columns to export"
 msgstr "Kolumny do wyeksportowania"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:134
-msgid "Colums for exporting..."
+#, fuzzy
+msgid "Colums for exporting ..."
 msgstr "Kolumny do eksportu..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:162
@@ -7911,7 +7985,8 @@ msgid "Not null columns"
 msgstr "Kolumny bez null"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:174
-msgid "Not null columns..."
+#, fuzzy
+msgid "Not null columns ..."
 msgstr "Kolumny bez null..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:177
@@ -7932,7 +8007,8 @@ msgstr ""
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:216
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:231
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:76
-msgid "Select from list..."
+#, fuzzy
+msgid "Select from list ..."
 msgstr "Wybierz z listy..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:203
@@ -7979,7 +8055,8 @@ msgstr ""
 "Opcja ta dostępna jest tylko przy formacie CSV."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:292
-msgid "Import/Export..."
+#, fuzzy
+msgid "Import/Export ..."
 msgstr "Import/Eksport..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:418
@@ -8091,7 +8168,8 @@ msgstr "Szczegółowe Komunikaty"
 
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:177
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:187
-msgid "Maintenance..."
+#, fuzzy
+msgid "Maintenance ..."
 msgstr "Porządkowanie..."
 
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:347
@@ -8106,14 +8184,16 @@ msgid "Restore"
 msgstr "Przywrócenie"
 
 #: pgadmin/tools/restore/__init__.py:90
-msgid "Restoring backup on the server '{0}'..."
+#, fuzzy
+msgid "Restoring backup on the server '{0}' ..."
 msgstr "Odtworzenie kopii zapasowej na serwerze '{0}'..."
 
 #: pgadmin/tools/restore/__init__.py:103
-msgid "Restoring the backup on the server '{0}'..."
+#, fuzzy
+msgid "Restoring the backup on the server '{0}' ..."
 msgstr "Odtworzenie kopii zapasowej na serwerze '{0}'..."
 
-#: pgadmin/tools/restore/__init__.py:187
+#: pgadmin/tools/restore/__init__.py:190
 msgid "File couldn't be found!"
 msgstr "Plik nie został znaleziony!"
 
@@ -8151,7 +8231,8 @@ msgstr "Wyjście jeśli błąd"
 
 #: pgadmin/tools/restore/templates/restore/js/restore.js:278
 #: pgadmin/tools/restore/templates/restore/js/restore.js:287
-msgid "Restore..."
+#, fuzzy
+msgid "Restore ..."
 msgstr "Przywróć..."
 
 #: pgadmin/tools/restore/templates/restore/js/restore.js:524
@@ -8190,7 +8271,7 @@ msgstr "Obszerne komunikaty?"
 #: pgadmin/tools/sqleditor/__init__.py:96
 #: pgadmin/tools/sqleditor/__init__.py:102
 #: pgadmin/tools/sqleditor/__init__.py:108
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:255
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:187
 msgid "Explain"
 msgstr "Plan zapytania"
 
@@ -8287,22 +8368,22 @@ msgstr "Ciąg znaków filtra jest pusty."
 msgid "Data cannot be saved for the current object."
 msgstr "Nie można zapisać danych tego obiektu."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:245
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:177
 msgid "Data Output"
 msgstr "Wyjście Danych"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:275
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:207
 msgid "History"
 msgstr "Historia"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:307
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1679
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:239
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1611
 msgid ""
 "The data has been modified, but not saved. Are you sure you wish to "
 "discard the changes?"
 msgstr "Dane zostały zmienione ale nie zapisane. Czy na pewno odrzucić zmiany?"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:311
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:243
 msgid ""
 "The query has been modified, but not saved. Are you sure you wish to "
 "discard the changes?"
@@ -8310,68 +8391,71 @@ msgstr ""
 "Zapytanie zostało zmienione ale nie zapisane. Czy na pewno odrzucić "
 "zmiany?"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:460
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1363
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1678
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2508
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:392
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1295
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1610
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2440
 msgid "Unsaved changes"
 msgstr "Niezapisane zmiany"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1364
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2509
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1296
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2441
 msgid "Are you sure you wish to discard the current changes?"
 msgstr "Czy na pewno porzucić ostatnie zmiany?"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1386
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1318
 msgid "Clear history"
 msgstr "Wyczyść historię"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1387
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1319
 msgid "Are you sure you wish to clear the history?"
 msgstr "Czy na pewno wyczyścić historię?"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1703
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1635
 msgid "Initializing query execution."
 msgstr "Początek wykonywania zapytania."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1710
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3273
-msgid "Waiting for the query execution to complete..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1642
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3205
+#, fuzzy
+msgid "Waiting for the query execution to complete ..."
 msgstr "Oczekiwanie na zakończenie wykonania zapytania..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1827
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1759
 #, python-format
 msgid "Query returned successfully in %s."
 msgstr "Zapytanie zakończone z powodzeniem w czasie %s."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1863
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1967
-msgid "Loading data from the database server and rendering..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1795
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1899
+#, fuzzy
+msgid "Loading data from the database server and rendering ..."
 msgstr "Pobieranie danych z serwera bazy i wyświetlanie..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1974
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1906
 #, python-format
 msgid "Total query runtime: %s."
 msgstr "Całkowity czas wykonania zapytania: %s\n"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1975
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1907
 #, python-format
 msgid "%s rows retrieved."
 msgstr "%s wierszy zwróconych."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2053
-msgid "Retrieving information about the columns returned..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1985
+#, fuzzy
+msgid "Retrieving information about the columns returned ..."
 msgstr "Odczyt informacji o zwróconych kolumnach..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2279
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2211
 msgid "Row(s) deleted"
 msgstr "Wiersz(e) usunięto"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2283
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2215
 msgid "Operation failed"
 msgstr "Niepowodzenie operacji"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2284
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2216
 msgid ""
 "There are unsaved changes in grid, Please save them first to avoid "
 "inconsistency in data"
@@ -8379,85 +8463,93 @@ msgstr ""
 "Są niezapisane dane w siatce danych, Należy je najpierw zapisać by "
 "uniknąć niespójności danych"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2289
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2221
 msgid "Are you sure you wish to delete selected row(s)?"
 msgstr "Czy na pewno usunąć wybrany wiersz(e)?"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2351
-msgid "Saving the updated data..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2283
+#, fuzzy
+msgid "Saving the updated data ..."
 msgstr "Zapis zmodyfikowanych danych..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2407
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2339
 #, python-format
 msgid "%s."
 msgstr "%s."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2543
-msgid "Loading the file..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2475
+#, fuzzy
+msgid "Loading the file ..."
 msgstr "Ładowanie pliku..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2591
-msgid "Saving the queries in the file..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2523
+#, fuzzy
+msgid "Saving the queries in the file ..."
 msgstr "Zapis zapytań do pliku..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2602
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2534
 msgid "File saved successfully."
 msgstr "Udany zapis do pliku."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2709
-msgid "Loading the existing filter options..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2641
+#, fuzzy
+msgid "Loading the existing filter options ..."
 msgstr "Pobieranie istniejących opcji filtrowania..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2779
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2849
-msgid "Applying the new filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2711
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2781
+#, fuzzy
+msgid "Applying the new filter ..."
 msgstr "Zastosowanie nowego filtru..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2902
-msgid "Removing the filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2834
+#, fuzzy
+msgid "Removing the filter ..."
 msgstr "Usuwanie filtru..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2953
-msgid "Applying the filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2885
+#, fuzzy
+msgid "Applying the filter ..."
 msgstr "Zastosowanie filtru..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3051
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2983
 msgid "Error"
 msgstr "Błąd"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3052
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2984
 msgid "Oops, unable to copy to clipboard"
 msgstr "Niestety nie da się skopiować do schowka"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3165
-msgid "Setting the limit on the result..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3097
+#, fuzzy
+msgid "Setting the limit on the result ..."
 msgstr "Ustawianie limitu na wynik..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3239
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3171
 msgid "Initializing the query execution!"
 msgstr "Początek wykonywania zapytania!"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3600
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3606
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3532
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3538
 msgid "Error occurred while setting verbose option in explain"
 msgstr "Wystąpił błąd podczas ustawienia opcji szczegółowości w planie zapytania"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3638
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3644
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3570
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3576
 msgid "Error occurred while setting costs option in explain"
 msgstr "Wystąpił błąd podczas ustawienia opcji kosztów w planie zapytania"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3675
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3681
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3607
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3613
 msgid "Error occurred while setting buffers option in explain"
 msgstr "Wystąpił błąd podczas ustawienia opcji buforów w planie zapytania"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3711
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3717
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3643
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3649
 msgid "Error occurred while setting timing option in explain"
 msgstr "Wystąpił błąd podczas ustawienia opcji timingu w planie zapytania"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3795
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3727
 msgid "Error occurred while getting query tool options "
 msgstr "Wystąpił błąd podczas odczytu opcji narzędzia zapytania"
 
@@ -8727,3 +8819,6 @@ msgstr "Nie znaleziono wskazanej bazy danych."
 #~ msgid "Couldn't generate reversed engineered query for FTS Dictionary node!"
 #~ msgstr ""
 
+#~ msgid "Login/Group Role..."
+#~ msgstr ""
+
diff --git a/web/pgadmin/translations/zh/LC_MESSAGES/messages.mo b/web/pgadmin/translations/zh/LC_MESSAGES/messages.mo
index c2f6c964..2b570e32 100644
Binary files a/web/pgadmin/translations/zh/LC_MESSAGES/messages.mo and b/web/pgadmin/translations/zh/LC_MESSAGES/messages.mo differ
diff --git a/web/pgadmin/translations/zh/LC_MESSAGES/messages.po b/web/pgadmin/translations/zh/LC_MESSAGES/messages.po
index 77b8706e..d7b3dc49 100644
--- a/web/pgadmin/translations/zh/LC_MESSAGES/messages.po
+++ b/web/pgadmin/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-09 09:21+0000\n"
+"POT-Creation-Date: 2017-03-17 00:40+0100\n"
 "PO-Revision-Date: 2017-11-14 23:55+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: zh_Hans_CN <LL@li.org>\n"
@@ -279,20 +279,20 @@ msgstr "已经重新加载服务器配置"
 
 #: pgadmin/browser/server_groups/servers/__init__.py:894
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:185
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1763
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1899
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2438
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2739
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2808
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2879
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2929
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2984
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3192
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3300
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3398
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3443
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3496
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3535
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1695
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1831
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2370
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2671
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2740
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2811
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2861
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2916
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3124
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3232
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3330
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3375
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3428
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3467
 msgid ""
 "Not connected to the server or the connection to the server has been "
 "closed."
@@ -474,7 +474,8 @@ msgstr "转换"
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:41
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:47
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:52
-msgid "Cast..."
+#, fuzzy
+msgid "Cast ..."
 msgstr "转换中..."
 
 #: pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js:73
@@ -697,7 +698,8 @@ msgstr "事件触发器"
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:38
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:43
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:48
-msgid "Event Trigger..."
+#, fuzzy
+msgid "Event Trigger ..."
 msgstr "事件触发器..."
 
 #: pgadmin/browser/server_groups/servers/databases/event_triggers/templates/event_triggers/js/event_trigger.js:91
@@ -861,7 +863,8 @@ msgstr "拓展"
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:64
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:69
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:74
-msgid "Extension..."
+#, fuzzy
+msgid "Extension ..."
 msgstr "拓展..."
 
 #: pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/js/extensions.js:180
@@ -1110,7 +1113,8 @@ msgstr "外部服务器"
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:76
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:81
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:86
-msgid "Foreign Server..."
+#, fuzzy
+msgid "Foreign Server ..."
 msgstr "外部服务器..."
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/js/foreign_servers.js:135
@@ -1191,7 +1195,8 @@ msgstr "用户映射"
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:76
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:81
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:86
-msgid "User Mapping..."
+#, fuzzy
+msgid "User Mapping ..."
 msgstr "用户映射..."
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/js/user_mappings.js:113
@@ -1229,7 +1234,8 @@ msgstr "外部数据包装"
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:79
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:84
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:89
-msgid "Foreign Data Wrapper..."
+#, fuzzy
+msgid "Foreign Data Wrapper ..."
 msgstr "外部数据包装..."
 
 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/js/foreign_data_wrappers.js:140
@@ -1307,7 +1313,8 @@ msgstr "语言"
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:42
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:48
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:53
-msgid "Language..."
+#, fuzzy
+msgid "Language ..."
 msgstr "语言..."
 
 #: pgadmin/browser/server_groups/servers/databases/languages/templates/languages/js/languages.js:125
@@ -1479,7 +1486,8 @@ msgstr "排序规则已经被删除"
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:36
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:48
-msgid "Collation..."
+#, fuzzy
+msgid "Collation ..."
 msgstr "排序规则..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/js/collation.js:106
@@ -1553,7 +1561,8 @@ msgstr "域约束被删除"
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:39
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:45
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:51
-msgid "Domain Constraint..."
+#, fuzzy
+msgid "Domain Constraint ..."
 msgstr "域约束..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/js/domain_constraints.js:79
@@ -1586,7 +1595,8 @@ msgstr "域"
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:107
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:113
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:119
-msgid "Domain..."
+#, fuzzy
+msgid "Domain ..."
 msgstr "域..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/js/domains.js:175
@@ -1683,7 +1693,8 @@ msgstr ""
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:2792
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:2841
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1211
-msgid "-- Please create column(s) first..."
+#, fuzzy
+msgid "-- Please create column(s) first ..."
 msgstr "--请先创建列..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:91
@@ -1733,7 +1744,8 @@ msgstr "外部表"
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:469
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:475
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:481
-msgid "Foreign Table..."
+#, fuzzy
+msgid "Foreign Table ..."
 msgstr "外部表..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/js/foreign_tables.js:538
@@ -1835,7 +1847,8 @@ msgstr "FTS配置"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:438
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:445
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:451
-msgid "FTS Configuration..."
+#, fuzzy
+msgid "FTS Configuration ..."
 msgstr "FTS配置..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js:499
@@ -1923,7 +1936,8 @@ msgstr "FTS 词典"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:78
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:85
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:90
-msgid "FTS Dictionary..."
+#, fuzzy
+msgid "FTS Dictionary ..."
 msgstr "FTS 字典..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/js/fts_dictionary.js:137
@@ -1981,7 +1995,8 @@ msgstr "FTS 分析器"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:48
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:54
-msgid "FTS Parser..."
+#, fuzzy
+msgid "FTS Parser ..."
 msgstr "FTS 分析器..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/templates/fts_parser/js/fts_parser.js:98
@@ -2075,7 +2090,8 @@ msgstr "FTS 模板"
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:41
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:53
-msgid "FTS Template..."
+#, fuzzy
+msgid "FTS Template ..."
 msgstr "FTS 模板..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/js/fts_templates.js:92
@@ -2154,7 +2170,8 @@ msgstr "默认值"
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:108
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:114
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:120
-msgid "Function..."
+#, fuzzy
+msgid "Function ..."
 msgstr "函数..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js:192
@@ -2381,7 +2398,8 @@ msgstr "存储过程"
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:53
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/js/procedures.js:59
-msgid "Procedure..."
+#, fuzzy
+msgid "Procedure ..."
 msgstr "存储过程..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:12
@@ -2391,7 +2409,8 @@ msgstr "触发器函数"
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:41
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:47
 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/js/trigger_functions.js:53
-msgid "Trigger function..."
+#, fuzzy
+msgid "Trigger function ..."
 msgstr "触发器函数..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:55
@@ -2457,7 +2476,8 @@ msgstr "包"
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:36
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:42
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:48
-msgid "Package..."
+#, fuzzy
+msgid "Package ..."
 msgstr "包..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/js/package.js:127
@@ -2510,7 +2530,8 @@ msgstr "序列"
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:40
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:46
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:52
-msgid "Sequence..."
+#, fuzzy
+msgid "Sequence ..."
 msgstr "序列..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/js/sequence.js:148
@@ -2602,7 +2623,8 @@ msgstr "同义词"
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:34
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:40
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:46
-msgid "Synonym..."
+#, fuzzy
+msgid "Synonym ..."
 msgstr "同义词..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/js/synonym.js:102
@@ -2733,7 +2755,8 @@ msgstr "请提供输入变量"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:136
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:142
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:148
-msgid "Column..."
+#, fuzzy
+msgid "Column ..."
 msgstr "列..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js:185
@@ -2841,7 +2864,8 @@ msgid "Check constraint updated."
 msgstr "更新Check 约束"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js:31
-msgid "Check..."
+#, fuzzy
+msgid "Check ..."
 msgstr "检查..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js:37
@@ -2950,7 +2974,8 @@ msgid "Exclusion constraint"
 msgstr "排除约束"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js:640
-msgid "Exclusion constraint..."
+#, fuzzy
+msgid "Exclusion constraint ..."
 msgstr "排除约束..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js:687
@@ -3056,7 +3081,8 @@ msgid "Foreign key"
 msgstr "外键"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js:623
-msgid "Foreign key..."
+#, fuzzy
+msgid "Foreign key ..."
 msgstr "外键..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js:629
@@ -3197,7 +3223,8 @@ msgstr "列名称不能为空"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:234
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:240
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:246
-msgid "Index..."
+#, fuzzy
+msgid "Index ..."
 msgstr "索引..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js:285
@@ -3275,7 +3302,8 @@ msgstr "规则"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:87
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:93
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:99
-msgid "Rule..."
+#, fuzzy
+msgid "Rule ..."
 msgstr "规则"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js:146
@@ -3451,7 +3479,8 @@ msgstr "大小"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:45
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:51
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:57
-msgid "Table..."
+#, fuzzy
+msgid "Table ..."
 msgstr "表..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:63
@@ -3490,7 +3519,8 @@ msgid "Are you sure you want to reset the statistics for table %s?"
 msgstr "你确实要重置表 %s的统计信息？"
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:332
-msgid "Select to inherit from..."
+#, fuzzy
+msgid "Select to inherit from ..."
 msgstr "选择要从其继承..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/js/table.js:414
@@ -3810,7 +3840,8 @@ msgstr "触发器"
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:64
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:70
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:86
-msgid "Trigger..."
+#, fuzzy
+msgid "Trigger ..."
 msgstr "触发器..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js:76
@@ -3929,7 +3960,8 @@ msgstr "回收Toast表"
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:302
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:307
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:312
-msgid "Schema..."
+#, fuzzy
+msgid "Schema ..."
 msgstr "模式..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/js/schema.js:349
@@ -4060,7 +4092,8 @@ msgstr "请指定标签的值"
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:281
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:287
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:293
-msgid "Type..."
+#, fuzzy
+msgid "Type ..."
 msgstr "类型..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/js/type.js:376
@@ -4246,7 +4279,8 @@ msgstr "刷新视图"
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:71
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:77
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:83
-msgid "Materialized View..."
+#, fuzzy
+msgid "Materialized View ..."
 msgstr "物化视图..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/js/mview.js:87
@@ -4286,7 +4320,8 @@ msgstr "请输入视图定义"
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:67
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:73
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:79
-msgid "View..."
+#, fuzzy
+msgid "View ..."
 msgstr "视图..."
 
 #: pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/js/view.js:127
@@ -4328,15 +4363,18 @@ msgstr "数据库"
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:46
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:52
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:58
-msgid "Database..."
+#, fuzzy
+msgid "Database ..."
 msgstr "数据库"
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:64
-msgid "Connect Database..."
+#, fuzzy
+msgid "Connect Database ..."
 msgstr "连接数据库"
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:69
-msgid "Disconnect Database..."
+#, fuzzy
+msgid "Disconnect Database ..."
 msgstr "断开数据库..."
 
 #: pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js:137
@@ -4980,7 +5018,8 @@ msgstr "调度"
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:204
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:209
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:214
-msgid "Schedule..."
+#, fuzzy
+msgid "Schedule ..."
 msgstr "调度"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:254
@@ -5058,7 +5097,8 @@ msgid "Week Days"
 msgstr "工作日"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:353
-msgid "Select the weekdays..."
+#, fuzzy
+msgid "Select the weekdays ..."
 msgstr "选择工作日..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:363
@@ -5066,11 +5106,13 @@ msgid "Month Days"
 msgstr "日期"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:369
-msgid "Select the month days..."
+#, fuzzy
+msgid "Select the month days ..."
 msgstr "选择日期..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:384
-msgid "Select the months..."
+#, fuzzy
+msgid "Select the months ..."
 msgstr "选择月..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:394
@@ -5080,11 +5122,13 @@ msgid "Times"
 msgstr "次数"
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:403
-msgid "Select the hours..."
+#, fuzzy
+msgid "Select the hours ..."
 msgstr "选择小时..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:418
-msgid "Select the minutes..."
+#, fuzzy
+msgid "Select the minutes ..."
 msgstr "选择分钟..."
 
 #: pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/js/pga_schedule.js:451
@@ -5111,7 +5155,8 @@ msgstr "找不到指定的任务步骤"
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:50
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:55
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:60
-msgid "Job Step..."
+#, fuzzy
+msgid "Job Step ..."
 msgstr "任务步骤"
 
 #: pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/js/pga_jobstep.js:104
@@ -5226,7 +5271,8 @@ msgstr "pgAgent 任务"
 
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:48
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:53
-msgid "pgAgent Job..."
+#, fuzzy
+msgid "pgAgent Job ..."
 msgstr "pgAgent 任务"
 
 #: pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/js/pga_job.js:58
@@ -5354,7 +5400,8 @@ msgstr "资源组"
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:37
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:51
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:56
-msgid "Resource Group..."
+#, fuzzy
+msgid "Resource Group ..."
 msgstr "资源组..."
 
 #: pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js:75
@@ -5717,7 +5764,8 @@ msgstr "组角色"
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:362
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:368
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:374
-msgid "Login/Group Role..."
+#, fuzzy
+msgid "Login/Group Role ..."
 msgstr "登录/组角色"
 
 #: pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js:411
@@ -5801,11 +5849,13 @@ msgstr "-- 不完整的定义"
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:38
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:44
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:50
-msgid "Tablespace..."
+#, fuzzy
+msgid "Tablespace ..."
 msgstr "表空间..."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:57
-msgid "Move objects to..."
+#, fuzzy
+msgid "Move objects to ..."
 msgstr "移动对象到..."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:101
@@ -5837,7 +5887,7 @@ msgstr "用户"
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:922
 #: pgadmin/preferences/templates/preferences/preferences.js:357
 #: pgadmin/preferences/templates/preferences/preferences.js:381
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:262
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:265
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:376
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:396
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:272
@@ -5873,7 +5923,8 @@ msgid "Please select tablespace"
 msgstr "选择表空间"
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:263
-msgid "Move objects..."
+#, fuzzy
+msgid "Move objects ..."
 msgstr "移动对象..."
 
 #: pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js:264
@@ -5904,7 +5955,8 @@ msgstr "标签必须被指定"
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:60
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:65
-msgid "Server..."
+#, fuzzy
+msgid "Server ..."
 msgstr "服务器..."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:70
@@ -5920,11 +5972,13 @@ msgid "Reload Configuration"
 msgstr "重新加载配置"
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:85
-msgid "Add Named Restore Point..."
+#, fuzzy
+msgid "Add Named Restore Point ..."
 msgstr "添加命名还原点..."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:90
-msgid "Change Password..."
+#, fuzzy
+msgid "Change Password ..."
 msgstr "更改密码..."
 
 #: pgadmin/browser/server_groups/servers/templates/servers/servers.js:95
@@ -6129,7 +6183,8 @@ msgid "Server Group"
 msgstr "服务器组"
 
 #: pgadmin/browser/server_groups/templates/server_groups/server_groups.js:24
-msgid "Server Group..."
+#, fuzzy
+msgid "Server Group ..."
 msgstr "服务器组..."
 
 #: pgadmin/browser/server_groups/templates/server_groups/server_groups.js:48
@@ -6137,7 +6192,8 @@ msgid "The ID cannot be changed."
 msgstr "ID 不能被更改"
 
 #: pgadmin/browser/templates/browser/index.html:94
-msgid "Loading {0} v{1}..."
+#, fuzzy
+msgid "Loading {0} v{1} ..."
 msgstr "加载{0}v{1}.."
 
 #: pgadmin/browser/templates/browser/index.html:100
@@ -6237,12 +6293,14 @@ msgstr "是否确实要清除历史记录？"
 
 #: pgadmin/browser/templates/browser/js/collection.js:36
 #: pgadmin/browser/templates/browser/js/node.js:86
-msgid "Refresh..."
+#, fuzzy
+msgid "Refresh ..."
 msgstr "刷新..."
 
 #: pgadmin/browser/templates/browser/js/collection.js:46
 #: pgadmin/browser/templates/browser/js/node.js:128
-msgid "Query Tool..."
+#, fuzzy
+msgid "Query Tool ..."
 msgstr "查询工具..."
 
 #: pgadmin/browser/templates/browser/js/collection.js:128
@@ -6332,7 +6390,8 @@ msgid "Unselect All"
 msgstr "全部取消选择"
 
 #: pgadmin/browser/templates/browser/js/messages.js:32
-msgid "Retrieving data from the server..."
+#, fuzzy
+msgid "Retrieving data from the server ..."
 msgstr "从服务器检索数据..."
 
 #: pgadmin/browser/templates/browser/js/messages.js:33
@@ -6340,7 +6399,8 @@ msgid "Failed to retrieve data from the server."
 msgstr "从服务器中检索数据失败"
 
 #: pgadmin/browser/templates/browser/js/node.js:94
-msgid "Properties..."
+#, fuzzy
+msgid "Properties ..."
 msgstr "属性"
 
 #: pgadmin/browser/templates/browser/js/node.js:103
@@ -6850,7 +6910,8 @@ msgid "Execution time"
 msgstr "执行时间"
 
 #: pgadmin/misc/bgprocess/__init__.py:55
-msgid "Running..."
+#, fuzzy
+msgid "Running ..."
 msgstr "运行..."
 
 #: pgadmin/misc/bgprocess/__init__.py:56
@@ -6867,7 +6928,7 @@ msgid "Too many logs generated!"
 msgstr ""
 
 #: pgadmin/misc/bgprocess/processes.py:76
-#: pgadmin/misc/bgprocess/processes.py:518
+#: pgadmin/misc/bgprocess/processes.py:555
 msgid "Could not find a process with the specified ID."
 msgstr "找不到具有指定 ID 的进程"
 
@@ -6879,7 +6940,7 @@ msgstr "进程已被启动。"
 msgid "The process has already finished and can not be restarted."
 msgstr "该进程过程已经结束，不能重新启动。"
 
-#: pgadmin/misc/bgprocess/processes.py:439
+#: pgadmin/misc/bgprocess/processes.py:476
 msgid "Status for the background process '{0}' could not be loaded."
 msgstr ""
 
@@ -7061,15 +7122,18 @@ msgid "Backup"
 msgstr "备份"
 
 #: pgadmin/tools/backup/__init__.py:115 pgadmin/tools/backup/__init__.py:142
-msgid "Backing up an object on the server '{0}' from database '{1}'..."
+#, fuzzy
+msgid "Backing up an object on the server '{0}' from database '{1}' ..."
 msgstr "服务器'{0}'上备份数据库'{1}'的一个对象..."
 
 #: pgadmin/tools/backup/__init__.py:122
-msgid "Backing up the global objects on the server - '{0}'..."
+#, fuzzy
+msgid "Backing up the global objects on the server - '{0}' ..."
 msgstr "在服务器- '{0}' 上备份全局对象"
 
 #: pgadmin/tools/backup/__init__.py:126
-msgid "Backing up the server '{0}'..."
+#, fuzzy
+msgid "Backing up the server '{0}' ..."
 msgstr "备份服务器'{0}'..."
 
 #: pgadmin/tools/backup/__init__.py:149
@@ -7086,14 +7150,14 @@ msgstr "备份服务器'{0}'"
 msgid "Running command:"
 msgstr "运行命令:"
 
-#: pgadmin/tools/backup/__init__.py:239 pgadmin/tools/backup/__init__.py:337
-#: pgadmin/tools/restore/__init__.py:198
+#: pgadmin/tools/backup/__init__.py:242 pgadmin/tools/backup/__init__.py:343
+#: pgadmin/tools/restore/__init__.py:201
 msgid "Could not find the specified server."
 msgstr "找不到指定的服务器"
 
-#: pgadmin/tools/backup/__init__.py:252 pgadmin/tools/backup/__init__.py:350
+#: pgadmin/tools/backup/__init__.py:255 pgadmin/tools/backup/__init__.py:356
 #: pgadmin/tools/maintenance/__init__.py:206
-#: pgadmin/tools/restore/__init__.py:212
+#: pgadmin/tools/restore/__init__.py:215
 msgid "Please connect to the server first."
 msgstr "请先连接到服务器"
 
@@ -7292,18 +7356,21 @@ msgstr "使用设置会话授权"
 #: pgadmin/tools/backup/templates/backup/js/backup.js:320
 #: pgadmin/tools/backup/templates/backup/js/backup.js:330
 #: pgadmin/tools/backup/templates/backup/js/backup.js:427
-msgid "Backup Globals..."
+#, fuzzy
+msgid "Backup Globals ..."
 msgstr "备份全局..."
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:325
 #: pgadmin/tools/backup/templates/backup/js/backup.js:335
 #: pgadmin/tools/backup/templates/backup/js/backup.js:428
-msgid "Backup Server..."
+#, fuzzy
+msgid "Backup Server ..."
 msgstr "备份服务器..."
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:340
 #: pgadmin/tools/backup/templates/backup/js/backup.js:349
-msgid "Backup..."
+#, fuzzy
+msgid "Backup ..."
 msgstr "备份..."
 
 #: pgadmin/tools/backup/templates/backup/js/backup.js:385
@@ -7425,7 +7492,7 @@ msgid "Paste Row"
 msgstr "粘贴行"
 
 #: pgadmin/tools/datagrid/templates/datagrid/index.html:107
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2288
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2220
 msgid "Delete Row(s)"
 msgstr "删除行"
 
@@ -7519,35 +7586,36 @@ msgstr "应用"
 msgid "Error fetching SQL for script: \"%s\""
 msgstr "读取 SQL 脚本出错︰ \"%s\""
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:75
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:78
 msgid "Query Tool"
 msgstr "查询工具"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:85
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:88
 msgid "View All Rows"
 msgstr "查看所有行"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:90
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:93
 msgid "View First 100 Rows"
 msgstr "查看前 100 行"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:95
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:98
 msgid "View Last 100 Rows"
 msgstr "查看最后 100 行"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:100
-msgid "View Filtered Rows..."
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:103
+#, fuzzy
+msgid "View Filtered Rows ..."
 msgstr "视图筛选行..."
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:104
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:107
 msgid "View Data"
 msgstr "查看数据"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:412
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:415
 msgid " untitled"
 msgstr "没有标题"
 
-#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:461
+#: pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js:464
 msgid "Query Tool Initialize Error"
 msgstr "查询工具初始化错误"
 
@@ -7699,7 +7767,8 @@ msgid "Please enter a value for the parameter."
 msgstr "请输入一个该参数的值"
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:352
-msgid "Waiting for another session to invoke the target..."
+#, fuzzy
+msgid "Waiting for another session to invoke the target ..."
 msgstr "等待另一个会话来调用的目标..."
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1493
@@ -7707,7 +7776,7 @@ msgid "Local variables"
 msgstr "本地变量"
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1504
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:265
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:197
 msgid "Messages"
 msgstr "消息"
 
@@ -7720,7 +7789,8 @@ msgid "Stack"
 msgstr "堆栈"
 
 #: pgadmin/tools/debugger/templates/debugger/js/direct.js:1586
-msgid "Loading..."
+#, fuzzy
+msgid "Loading ..."
 msgstr "加载中..."
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:66
@@ -7729,7 +7799,8 @@ msgstr "请选择任何数据库对象类型"
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:179
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:189
-msgid "Grant Wizard..."
+#, fuzzy
+msgid "Grant Wizard ..."
 msgstr "格兰特向导"
 
 #: pgadmin/tools/grant_wizard/templates/grant_wizard/js/grant_wizard.js:586
@@ -7742,7 +7813,8 @@ msgid "Import/Export"
 msgstr "导入/导出"
 
 #: pgadmin/tools/import_export/__init__.py:109
-msgid "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4})..."
+#, fuzzy
+msgid "Copying table data - '{0}.{1}' on database '{2}' and server ({3}{4}) ..."
 msgstr "复制表数据-'{0}.{1}' 在数据库 '{2}' 和服务器 ({3} {4})上."
 
 #: pgadmin/tools/import_export/__init__.py:122
@@ -7756,11 +7828,12 @@ msgid "Could not find the given server"
 msgstr "找不到给定的服务器"
 
 #: pgadmin/tools/import_export/__init__.py:217
-msgid "Please connect to the server first..."
+#, fuzzy
+msgid "Please connect to the server first ..."
 msgstr "请先连接到服务器..."
 
-#: pgadmin/tools/import_export/__init__.py:228
-#: pgadmin/tools/import_export/__init__.py:235
+#: pgadmin/tools/import_export/__init__.py:232
+#: pgadmin/tools/import_export/__init__.py:239
 #, fuzzy
 msgid "Please specify a valid file"
 msgstr "请指定标签的值"
@@ -7786,7 +7859,8 @@ msgid "Columns to import"
 msgstr "要导入的列"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:122
-msgid "Columns for importing..."
+#, fuzzy
+msgid "Columns for importing ..."
 msgstr "导入列..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:126
@@ -7801,7 +7875,8 @@ msgid "Columns to export"
 msgstr "要导出的列"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:134
-msgid "Colums for exporting..."
+#, fuzzy
+msgid "Colums for exporting ..."
 msgstr "导出列..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:162
@@ -7825,7 +7900,8 @@ msgid "Not null columns"
 msgstr "非空列"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:174
-msgid "Not null columns..."
+#, fuzzy
+msgid "Not null columns ..."
 msgstr "非空列"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:177
@@ -7841,7 +7917,8 @@ msgstr "不要将指定的列值与空字符串匹配。在默认情况下，空
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:216
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:231
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:76
-msgid "Select from list..."
+#, fuzzy
+msgid "Select from list ..."
 msgstr "从列表中选择..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:203
@@ -7879,7 +7956,8 @@ msgstr ""
 "仅当使用CSV格式时，才允许使用此选项。"
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:292
-msgid "Import/Export..."
+#, fuzzy
+msgid "Import/Export ..."
 msgstr "导入/导出..."
 
 #: pgadmin/tools/import_export/templates/import_export/js/import_export.js:418
@@ -7991,7 +8069,8 @@ msgstr "详细信息"
 
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:177
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:187
-msgid "Maintenance..."
+#, fuzzy
+msgid "Maintenance ..."
 msgstr "维护..."
 
 #: pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js:347
@@ -8006,14 +8085,16 @@ msgid "Restore"
 msgstr "还原"
 
 #: pgadmin/tools/restore/__init__.py:90
-msgid "Restoring backup on the server '{0}'..."
+#, fuzzy
+msgid "Restoring backup on the server '{0}' ..."
 msgstr "还原备份在服务器'{0}'"
 
 #: pgadmin/tools/restore/__init__.py:103
-msgid "Restoring the backup on the server '{0}'..."
+#, fuzzy
+msgid "Restoring the backup on the server '{0}' ..."
 msgstr "在服务器'{0}'上，还原备份"
 
-#: pgadmin/tools/restore/__init__.py:187
+#: pgadmin/tools/restore/__init__.py:190
 #, fuzzy
 msgid "File couldn't be found!"
 msgstr "找不到指定的规则。"
@@ -8052,7 +8133,8 @@ msgstr "退出由于错误"
 
 #: pgadmin/tools/restore/templates/restore/js/restore.js:278
 #: pgadmin/tools/restore/templates/restore/js/restore.js:287
-msgid "Restore..."
+#, fuzzy
+msgid "Restore ..."
 msgstr "还原中..."
 
 #: pgadmin/tools/restore/templates/restore/js/restore.js:524
@@ -8087,7 +8169,7 @@ msgstr "详细输出?"
 #: pgadmin/tools/sqleditor/__init__.py:96
 #: pgadmin/tools/sqleditor/__init__.py:102
 #: pgadmin/tools/sqleditor/__init__.py:108
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:255
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:187
 msgid "Explain"
 msgstr "解释"
 
@@ -8181,173 +8263,184 @@ msgstr "筛选字符串为空"
 msgid "Data cannot be saved for the current object."
 msgstr "当前对象的数据不能保存"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:245
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:177
 msgid "Data Output"
 msgstr "数据输出"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:275
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:207
 msgid "History"
 msgstr "历史"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:307
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1679
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:239
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1611
 msgid ""
 "The data has been modified, but not saved. Are you sure you wish to "
 "discard the changes?"
 msgstr "数据已修改，但未保存。 确定要放弃更改吗?"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:311
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:243
 msgid ""
 "The query has been modified, but not saved. Are you sure you wish to "
 "discard the changes?"
 msgstr "查询已修改，但未保存。确定要放弃更改吗？"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:460
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1363
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1678
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2508
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:392
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1295
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1610
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2440
 msgid "Unsaved changes"
 msgstr "未保存的更改"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1364
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2509
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1296
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2441
 msgid "Are you sure you wish to discard the current changes?"
 msgstr "是否确实要放弃当前更改？"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1386
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1318
 msgid "Clear history"
 msgstr "清除历史记录"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1387
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1319
 msgid "Are you sure you wish to clear the history?"
 msgstr "是否确实要清除历史记录？"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1703
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1635
 msgid "Initializing query execution."
 msgstr "初始化查询执行。"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1710
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3273
-msgid "Waiting for the query execution to complete..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1642
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3205
+#, fuzzy
+msgid "Waiting for the query execution to complete ..."
 msgstr "等待查询执行完成..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1827
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1759
 #, python-format
 msgid "Query returned successfully in %s."
 msgstr "耗时%s 成功返回查询"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1863
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1967
-msgid "Loading data from the database server and rendering..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1795
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1899
+#, fuzzy
+msgid "Loading data from the database server and rendering ..."
 msgstr "从数据库服务器加载数据并渲染.."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1974
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1906
 #, python-format
 msgid "Total query runtime: %s."
 msgstr "总查询运行时: %s."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1975
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1907
 #, python-format
 msgid "%s rows retrieved."
 msgstr "检索到%s 行"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2053
-msgid "Retrieving information about the columns returned..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1985
+#, fuzzy
+msgid "Retrieving information about the columns returned ..."
 msgstr "检索列信息时返回..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2279
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2211
 msgid "Row(s) deleted"
 msgstr "删除行"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2283
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2215
 msgid "Operation failed"
 msgstr "操作失败"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2284
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2216
 msgid ""
 "There are unsaved changes in grid, Please save them first to avoid "
 "inconsistency in data"
 msgstr "网格中有未保存的更改，请先保存它们，以避免数据不一致"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2289
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2221
 msgid "Are you sure you wish to delete selected row(s)?"
 msgstr "是否确实要删除选定的行？"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2351
-msgid "Saving the updated data..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2283
+#, fuzzy
+msgid "Saving the updated data ..."
 msgstr "保存更新后的数据..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2407
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2339
 #, python-format
 msgid "%s."
 msgstr "%s."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2543
-msgid "Loading the file..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2475
+#, fuzzy
+msgid "Loading the file ..."
 msgstr "加载文件..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2591
-msgid "Saving the queries in the file..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2523
+#, fuzzy
+msgid "Saving the queries in the file ..."
 msgstr "将查询保存在文件..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2602
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2534
 msgid "File saved successfully."
 msgstr "文件保存成功。"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2709
-msgid "Loading the existing filter options..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2641
+#, fuzzy
+msgid "Loading the existing filter options ..."
 msgstr "加载现有的筛选器选项..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2779
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2849
-msgid "Applying the new filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2711
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2781
+#, fuzzy
+msgid "Applying the new filter ..."
 msgstr "应用新的筛选器..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2902
-msgid "Removing the filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2834
+#, fuzzy
+msgid "Removing the filter ..."
 msgstr "移除筛选器..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2953
-msgid "Applying the filter..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2885
+#, fuzzy
+msgid "Applying the filter ..."
 msgstr "应用筛选器..."
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3051
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2983
 msgid "Error"
 msgstr "错误"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3052
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:2984
 msgid "Oops, unable to copy to clipboard"
 msgstr "哎呀，不能复制到剪贴板"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3165
-msgid "Setting the limit on the result..."
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3097
+#, fuzzy
+msgid "Setting the limit on the result ..."
 msgstr "设置限制的结果......"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3239
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3171
 msgid "Initializing the query execution!"
 msgstr "初始化查询执行！"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3600
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3606
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3532
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3538
 msgid "Error occurred while setting verbose option in explain"
 msgstr "在解释设置verbose选项时发生错误"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3638
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3644
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3570
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3576
 msgid "Error occurred while setting costs option in explain"
 msgstr "在解释设置成本选项时发生错误"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3675
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3681
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3607
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3613
 msgid "Error occurred while setting buffers option in explain"
 msgstr "在解释设置缓冲区选项时发生错误"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3711
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3717
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3643
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3649
 msgid "Error occurred while setting timing option in explain"
 msgstr "在解释设置计时选项时发生错误"
 
-#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3795
+#: pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:3727
 msgid "Error occurred while getting query tool options "
 msgstr "获取查询工具选项时发生错误"
 
diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py
index 96c28210..22546fa6 100644
--- a/web/regression/feature_utils/pgadmin_page.py
+++ b/web/regression/feature_utils/pgadmin_page.py
@@ -34,7 +34,7 @@ class PgadminPage:
         ActionChains(self.driver) \
             .move_to_element(self.driver.find_element_by_link_text("Create")) \
             .perform()
-        self.find_by_partial_link_text("Server...").click()
+        self.find_by_partial_link_text("Server ...").click()
 
         self.fill_input_by_field_name("name", server_config['name'])
         self.find_by_partial_link_text("Connection").click()
diff --git a/web/setup.py b/web/setup.py
index c5a329c5..1aa5f535 100755
--- a/web/setup.py
+++ b/web/setup.py
@@ -166,12 +166,12 @@ def do_upgrade(app, datastore, version):
             print(u"""
 The database schema version is {0}, whilst the version required by the \
 software is {1}.
-Exiting...""".format(version.value, config.SETTINGS_SCHEMA_VERSION))
+Exiting ...""".format(version.value, config.SETTINGS_SCHEMA_VERSION))
             sys.exit(1)
         elif int(version.value) == int(config.SETTINGS_SCHEMA_VERSION):
             print(u"""
 The database schema version is {0} as required.
-Exiting...""".format(version.value))
+Exiting ...""".format(version.value))
             sys.exit(1)
 
         app.logger.info(
@@ -231,7 +231,7 @@ FROM server_old""")
 
         if int(version.value) < 8:
             app.logger.info(
-                "Creating the preferences tables..."
+                "Creating the preferences tables ..."
             )
             db.engine.execute("""
 CREATE TABLE module_preference(
@@ -420,7 +420,7 @@ if __name__ == '__main__':
                 config.SQLITE_PATH
             )
         )
-        print(u"Entering upgrade mode...")
+        print(u"Entering upgrade mode ...")
 
         # Setup Flask-Security
         user_datastore = SQLAlchemyUserDatastore(db, User, Role)
@@ -434,12 +434,12 @@ if __name__ == '__main__':
                 print(u"""
 The database schema version is %d, whilst the version required by the \
 software is %d.
-Exiting...""" % (version.value, config.SETTINGS_SCHEMA_VERSION))
+Exiting ...""" % (version.value, config.SETTINGS_SCHEMA_VERSION))
                 sys.exit(1)
             elif int(version.value) == int(config.SETTINGS_SCHEMA_VERSION):
                 print(u"""
 The database schema version is %d as required.
-Exiting...""" % (version.value))
+Exiting ...""" % (version.value))
                 sys.exit(1)
 
             print(u"NOTE: Upgrading database schema from version %d to %d." % (
@@ -464,6 +464,6 @@ Exiting...""" % (version.value))
 
         print(u"""
 The configuration database - '{0}' does not exist.
-Entering initial setup mode...""".format(config.SQLITE_PATH))
+Entering initial setup mode ...""".format(config.SQLITE_PATH))
 
         do_setup(app)