Nomenclature changes:

1. Rename "Properties..." context menu option of object to "Edit Object...".
2. Rename "Browser" tree to "Object Explorer". #4734

docs/en_US/cloud_aws_rds.rst

@@ -32,8 +32,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Instance name* field to add an instance name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control
+  server; the name specified will be displayed in the *Object Explorer* too.
-  too.
 
 * Use the *Public IP* field to specify the IP Address range for permitting the
   inbound traffic.
@@ -63,8 +62,8 @@ details.
 Use the fields from the Database Details tab to specify the Instance details.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
+  node for the server; the server will be displayed in the *Object Explorer*
-  control within the specified group.
+  within the specified group.
 
 * Use the *Database name* field to add the database name for the PostgreSQL
   server.

docs/en_US/cloud_azure_database.rst

@@ -41,7 +41,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Cluster name* field to add a name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control too.
+  server; the name specified will be displayed in the *Object Explorer* too.
 
 * Select a subscription from the *Subscription* options which are populated based
   on user access levels in Azure portal.
@@ -85,8 +85,8 @@ details.
 Use the fields from the Database Details tab to specify the PostgreSQL database details.
 
 * Use the drop-down list in the *pgAdmin server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
+  node for the server; the server will be displayed in the *Object Explorer*
-  control within the specified group.
+  within the specified group.
 
 * Use the *Admin username* field to add the database name for the PostgreSQL
   server.

docs/en_US/cloud_edb_biganimal.rst

@@ -44,8 +44,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Cluster name* field to add a cluster name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control
+  server; the name specified will be displayed in the *Object Explorer* too.
-  too.
 
 * Use the *Region* field to select the region.
 
@@ -75,8 +74,8 @@ details.
 Use the fields from the Database Details tab to specify the Instance details.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
+  node for the server; the server will be displayed in the *Object Explorer*
-  control within the specified group.
+  within the specified group.
 
 * Use the *Database type* field to specify the PostgreSQL
   type, EnterpriseDB PostgreSQL Advanced Server or PostgreSQL.

docs/en_US/cloud_google_cloud_sql.rst

@@ -39,7 +39,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Cluster name* field to add a name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control too.
+  server; the name specified will be displayed in the *Object Explorer* too.
 
 * Select the project from *project* dropdown under which the
   PostgreSQL instance will be created.
@@ -83,8 +83,8 @@ details.
 Use the fields from the Database Details tab to specify the PostgreSQL database details.
 
 * Use the drop-down list in the *pgAdmin server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
+  node for the server; the server will be displayed in the *Object Explorer*
-  control within the specified group.
+  within the specified group.
 
 * Admin username field will be default to postgres.
   server.

docs/en_US/code_overview.rst

@@ -194,7 +194,7 @@ Nodes
 *****
 
 Nodes are very similar to modules, it represents an individual node or,
-collection object on the browser treeview. To recognised as a node module, a
+collection object on the object explorer treeview. To recognised as a node module, a
 Python package (along with javascript modules) must be created. This must:
 
 1) Be placed within the **web/pgadmin/browser/** directory, and

docs/en_US/connect_to_server.rst

@@ -45,4 +45,4 @@ communicate. For detailed information about a specific error message, please see
 the :ref:`Connection Error <connect_error>` help page.
 
 To review or modify connection details, right-click on the name of the server,
-and select *Properties...* from the context menu.
+and select *Edit Object...* from the context menu.

docs/en_US/editgrid.rst

@@ -5,9 +5,9 @@
 `View/Edit Data`:index:
 ***********************
 
-To view or modify data, right click on a table or view name in the *Browser*
+To view or modify data, right click on a table or view name in the
-tree control.  When the context menu opens, use the *View/Edit Data* menu to
+*Object Explorer*. When the context menu opens, use the *View/Edit Data* menu
-specify the number of rows you would like to display in the editor panel.
+to specify the number of rows you would like to display in the editor panel.
 
 .. image:: images/editgrid.png
     :alt: Edit grid window

docs/en_US/erd_tool.rst

@@ -12,7 +12,7 @@ The Entity-Relationship Diagram (ERD) tool is a database design tool that provid
 * Save the diagram and open it later to continue working on it.
 * Generate ready to run SQL from the database design.
 * Generate the database diagram for an existing database.
-* Drag and drop tables from browser tree to the diagram.
+* Drag and drop tables from object explorer to the diagram.
 
 .. image:: images/erd_tool.png
     :alt: ERD tool window

docs/en_US/import_export_data.rst

@@ -20,7 +20,7 @@ Use the fields in the *General* tab to specify import and export preferences:
   server should import data to a table from a file. The default is *Import*.
 
 * Enter the name of the source or target file in the *Filename* field.
-  Optionally, select the *Browser* icon (ellipsis) to the right to navigate
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
   into a directory and select a file.
 
 * Use the drop-down listbox in the *Format* field to specify the file type.

docs/en_US/keyboard_shortcuts.rst

@@ -20,7 +20,7 @@ When using main browser window, the following keyboard shortcuts are available:
    +============================+=======================================================+
    | Shift+Ctrl+a               | Add grid row                                          |
    +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+b                | Browser tree                                          |
+   | Shift+Alt+b                | Object explorer                                       |
    +----------------------------+-------------------------------------------------------+
    | Shift+Alt+n                | Create object                                         |
    +----------------------------+-------------------------------------------------------+
@@ -50,7 +50,7 @@ When using main browser window, the following keyboard shortcuts are available:
    +----------------------------+-------------------------------------------------------+
    | Shift+Ctrl+f               | Quick Search                                          |
    +----------------------------+-------------------------------------------------------+
-   | F5                         | Refresh browser tree                                  |
+   | F5                         | Refresh object explorer                               |
    +----------------------------+-------------------------------------------------------+
    | Shift+Alt+s                | Search objects                                        |
    +----------------------------+-------------------------------------------------------+

docs/en_US/menu_bar.rst

@@ -64,7 +64,7 @@ following options (in alphabetical order):
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Drop Cascade*              | Click to delete the currently selected object and all dependent objects from the server.                                 |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Properties...*             | Click to review or modify the currently selected object's properties.                                                    |
+| *Edit Object...*            | Click to review or modify the currently selected object's properties.                                                    |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Refresh*                   | Click to refresh the currently selected object.                                                                          |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+

docs/en_US/preferences.rst

@@ -31,7 +31,7 @@ Use the fields on the *Display* panel to specify general display preferences:
   be automatically expanded if a treeview node is expanded and has only a single
   child.
 
-* Use the *Browser tree state saving interval* field to set the treeview state
+* Use the *Object explorer state saving interval* field to set the treeview state
   saving interval. A value of *-1* will disable the treeview state saving
   functionality.
 
@@ -44,7 +44,7 @@ Use the fields on the *Display* panel to specify general display preferences:
   them to continue.
 
 * When the *Hide shared servers?* switch is set to *True*, the client will hide
-  all the shared servers from the browser tree.
+  all the shared servers from the object explorer.
 
 * Use the *Lock layout* field to lock the UI layout at different levels. This
   can also be changed from File menu on the :ref:`menu bar <menu_bar>`

docs/en_US/psql_tool.rst

@@ -7,10 +7,10 @@
 The PSQL tool allows users to connect to PostgreSQL or EDB Advanced server using
 the psql command line interface through their browser.
 
-* Open the PSQL tool from the Tools or browser tree context menu, or use PSQL
+* Open the PSQL tool from the Tools or object explorer context menu, or use PSQL
-  tool button at the top of the browser tree.
+  tool button at the top of the object explorer.
 
-* PSQL will connect to the current connected database from the browser tree.
+* PSQL will connect to the current connected database from the object explorer.
 
 .. image:: images/psql_tool.png
     :alt: PSQL tool window

docs/en_US/query_tool.rst

@@ -7,7 +7,7 @@
 The Query Tool is a powerful, feature-rich environment that allows you to
 execute arbitrary SQL commands and review the result set.  You can access the
 Query Tool via the *Query Tool* menu option on the *Tools* menu, or through the
-context menu of select nodes of the Browser tree control.  The Query Tool
+context menu of select nodes of the Object explorer control.  The Query Tool
 allows you to:
 
 * Issue ad-hoc SQL queries.

docs/en_US/restore_dialog.rst

@@ -30,7 +30,7 @@ restore process:
    * Select *Directory* to restore from a compressed directory-format archive.
 
 * Enter the complete path to the backup file in the *Filename* field.
-  Optionally, select the *Browser* icon (ellipsis) to the right to navigate
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
   into a directory and select the file that contains the archive.
 * Use the *Number of Jobs* field to specify if pg_restore should use multiple
   (concurrent) jobs to process the restore.  Each job uses a separate connection

docs/en_US/schema_diff.rst

@@ -54,7 +54,7 @@ The Schema Diff Object Comparison Panel
 
 In the object comparison panel, you can select the source and target servers
 of the same major version, and databases to be compared. You can
-select any server listed under the browser tree whether it is connected or
+select any server listed under the object explorer whether it is connected or
 disconnected. If you select a server that is not connected then it will
 prompt you for the password before using the server.
 

docs/en_US/search_objects.rst

@@ -21,9 +21,9 @@ You can only search for object names currently. Examples are: abc,
 %ab%, ab%c, %%%, etc.
 
 The result is presented in the grid with object name, object type and
-the object tree path in the :ref:`browser <tree_control>`. You can double
+the object path in the :ref:`object explorer <tree_control>`. You can double
 click on a result row to select the object in the
-:ref:`browser <tree_control>`. If the object is greyed out, this means that you
+:ref:`object explorer <tree_control>`. If the object is greyed out, this means that you
 have not enabled those object types in the :ref:`preferences <preferences>`,
 so you can't double click on it. You can click on the ellipsis appended to
 the function and procedure names to see their arguments.
@@ -33,5 +33,5 @@ You can filter based on a particular object type by selecting one from the
 object type dropdown. If the search button is hit when one of the object type
 is selected then only those types will be fetch from the database.
 An object type will not be visible in the dropdown if the database server
-does not support it or if it is not enabled from the 
+does not support it or if it is not enabled from the
 :ref:`preferences <preferences>`.

docs/en_US/server_dialog.rst

@@ -15,10 +15,10 @@ allows connections from the host of the client.
 Use the fields in the *General* tab to identify the server:
 
 * Use the *Name* field to add a descriptive name for the server; the name
-  specified will be displayed in the *Browser* tree control.
+  specified will be displayed in the *Object Explorer*.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
+  node for the server; the server will be displayed in the *Object Explorer*
   control within the specified group.
 
 * Use the color-picker in the *Background* field to specify the background
@@ -42,7 +42,7 @@ Use the fields in the *General* tab to identify the server:
     * Change of host, port, and maintenance database
 
   Please note that once the server is shared, it's icon is changed in the
-  browser tree.
+  object explorer.
 
 * Provide a comment about the server in the *Comments* field.
 

docs/en_US/table_dialog.rst

@@ -470,7 +470,7 @@ Use the *Partition* tab to create that partition as a partitioned table.
 * Select a partition type from the *Partition Type* selection box.
 * Use the *Partition Keys* panel to define the partition keys.
 
-View of multi level Partitioned Table in browser tree:
+View of multi level Partitioned Table in object explorer:
 
 .. image:: images/table_partition_tree.png
     :alt: Table dialog partition tree

docs/en_US/tree_control.rst

@@ -8,7 +8,7 @@ The left pane of the main window displays a tree control (the *pgAdmin* tree
 control) that provides access to the objects that reside on a server.
 
 .. image:: /images/main_left_pane.png
-    :alt: Browser tree panel
+    :alt: object explorer panel
     :align: center
 
 You can expand nodes in the tree control to view the database objects that
@@ -63,7 +63,7 @@ following selections (options appear in alphabetical order):
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
 | *Maintenance...*          | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.              |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
-| *Properties...*           | Click to review or modify the currently selected object's properties.                                                     |
+| *Edit Object...*          | Click to review or modify the currently selected object's properties.                                                     |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
 | *Refresh...*              | Click to refresh the currently selected object.                                                                           |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+

docs/en_US/user_interface.rst

@@ -22,7 +22,7 @@ Features of pgAdmin 4 include:
 * online help and information about using pgAdmin dialogs and tools.
 
 When pgAdmin opens, the interface features a menu bar and a window divided into
-two panes: the *Browser* tree control in the left pane, and a tabbed browser in
+two panes: the *Object Explorer* tree control in the left pane, and a tabbed browser in
 the right pane.
 
 .. image:: images/welcome.png

web/pgadmin/browser/register_browser_preferences.py

@@ -47,10 +47,10 @@ def register_browser_preferences(self):
 
     self.preference.register(
         'display', 'browser_tree_state_save_interval',
-        gettext("Browser tree state saving interval"), 'integer',
+        gettext("Object explorer tree state saving interval"), 'integer',
         30, category_label=PREF_LABEL_DISPLAY,
         help_str=gettext(
-            'Browser tree state saving interval in seconds. '
+            'Object explorer state saving interval in seconds. '
             'Use -1 to disable the tree saving mechanism.'
         )
     )
@@ -139,7 +139,7 @@ def register_browser_preferences(self):
     self.preference.register(
         'keyboard_shortcuts',
         'browser_tree',
-        gettext('Browser tree'),
+        gettext('Object Explorer'),
         'keyboardshortcut',
         {
             'alt': True,
@@ -425,7 +425,7 @@ def register_browser_preferences(self):
     self.preference.register(
         'keyboard_shortcuts',
         'sub_menu_refresh',
-        gettext('Refresh browser tree'),
+        gettext('Refresh object explorer'),
         'keyboardshortcut',
         {
             'alt': False,

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/compound_trigger_test_data.json

@@ -768,7 +768,7 @@
       }
     },
     {
-      "name": "Error while updating the new compound trigger id in browser tree",
+      "name": "Error while updating the new compound trigger id in object explorer",
       "url": "/browser/compound_trigger/obj/",
       "is_positive_test": false,
       "mocking_required": true,

web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js

@@ -143,7 +143,7 @@ export default class DatabaseSchema extends BaseUISchema {
         id: 'is_template', label: gettext('Template?'),
         type: 'switch', group: gettext('Definition'),
         mode: ['properties', 'edit', 'create'], readonly: function(state) {return (state.is_sys_obj); },
-        helpMessage: gettext('Note: When the preferences setting \'show template databases\' is set to false, then template databases won\'t be displayed in the browser tree.'),
+        helpMessage: gettext('Note: When the preferences setting \'show template databases\' is set to false, then template databases won\'t be displayed in the object explorer.'),
         helpMessageMode: ['edit', 'create'],
       },{
         id: 'datallowconn', label: gettext('Allow connections?'),

web/pgadmin/browser/server_groups/servers/static/js/server.js

@@ -79,14 +79,14 @@ define('pgadmin.node.server', [
           applies: ['tools', 'context'], callback: 'reload_configuration',
           category: 'reload', priority: 10, label: gettext('Reload Configuration'),
           enable : 'enable_reload_config',data: {
-            data_disabled: gettext('Please select a server from the browser tree to reload the configuration files.'),
+            data_disabled: gettext('Please select a server from the object explorer to reload the configuration files.'),
           },
         },{
           name: 'restore_point', node: 'server', module: this,
           applies: ['tools', 'context'], callback: 'restore_point',
           category: 'restore', priority: 7, label: gettext('Add Named Restore Point...'),
           enable : 'is_applicable',data: {
-            data_disabled: gettext('Please select any server from the browser tree to Add Named Restore Point.'),
+            data_disabled: gettext('Please select any server from the object explorer to Add Named Restore Point.'),
           },
         },{
           name: 'change_password', node: 'server', module: this,

web/pgadmin/browser/static/js/browser.js

@@ -197,7 +197,7 @@ define('pgadmin.browser', [
       // Panel to keep the left hand browser tree
       'browser': new pgAdmin.Browser.Panel({
         name: 'browser',
-        title: gettext('Browser'),
+        title: gettext('Object Explorer'),
         showTitle: true,
         isCloseable: false,
         isPrivate: true,

web/pgadmin/browser/static/js/node.js

@@ -123,7 +123,7 @@ define('pgadmin.browser.node', [
           applies: ['object', 'context'],
           callback: 'show_obj_properties',
           priority: 999,
-          label: gettext('Properties...'),
+          label: gettext('Edit Object...'),
           data: {
             'action': 'edit',
           },

web/pgadmin/preferences/static/js/components/PreferencesComponent.jsx

@@ -338,7 +338,7 @@ export default function PreferencesComponent({ ...props }) {
   function addNote(node, subNode, nodeData, preferencesData, note = '') {
     // Check and add the note for the element.
     if (subNode.label == gettext('Nodes') && node.label == gettext('Browser')) {
-      note = [gettext('This settings is to Show/Hide nodes in the browser tree.')].join('');
+      note = [gettext('This settings is to Show/Hide nodes in the object explorer.')].join('');
     } if(nodeData.name == 'keyboard_shortcuts') {
       note = gettext('The Accesskey here is %s.', getBrowserAccesskey().join(' + '));
     } else {
@@ -561,8 +561,8 @@ export default function PreferencesComponent({ ...props }) {
 
         if (pref.name == 'hide_shared_server') {
           Notify.confirm(
-            gettext('Browser tree refresh required'),
+            gettext('Object explorer tree refresh required'),
-            gettext('A browser tree refresh is required. Do you wish to refresh the tree?'),
+            gettext('The object explorer tree refresh is required. Do you wish to refresh the tree?'),
             function () {
               pgAdmin.Browser.tree.destroy({
                 success: function () {

web/pgadmin/static/js/SchemaView/index.jsx

@@ -997,7 +997,7 @@ function SchemaPropertiesView({
           data-test="help" onClick={()=>props.onHelp(true, false)} icon={<InfoIcon />} disabled={props.disableSqlHelp}
           title="SQL help for this object type." className={classes.buttonMargin} />
         <PgIconButton data-test="edit"
-          onClick={props.onEdit} icon={<EditIcon />} title="Edit the object" />
+          onClick={props.onEdit} icon={<EditIcon />} title={gettext('Edit object...')} />
       </Box>
       <Box className={clsx(classes.form, classes.formProperties)}>
         <Box>

web/pgadmin/static/js/tree/tree_utils.js

@@ -50,7 +50,7 @@ export function retrieveAncestorOfTypeServer(pgBrowser, item, errorAlertTitle) {
   if (serverInformation === null) {
     Notify.alert(
       gettext(errorAlertTitle),
-      gettext('Please select server or child node from the browser tree.')
+      gettext('Please select server or child node from the object explorer.')
     );
   }
 

web/pgadmin/tools/backup/static/js/backup.js

@@ -65,7 +65,7 @@ define([
         icon: 'fa fa-save',
         enable: menuUtils.menuEnabledServer,
         data: {
-          data_disabled: gettext('Please select any server from the browser tree to take Backup of global objects.'),
+          data_disabled: gettext('Please select any server from the object explorer to take Backup of global objects.'),
         },
       }, {
         name: 'backup_server',
@@ -77,7 +77,7 @@ define([
         icon: 'fa fa-save',
         enable: menuUtils.menuEnabledServer,
         data: {
-          data_disabled: gettext('Please select any server from the browser tree to take Server Backup.'),
+          data_disabled: gettext('Please select any server from the object explorer to take Server Backup.'),
         },
       }, {
         name: 'backup_global_ctx',
@@ -90,7 +90,7 @@ define([
         icon: 'fa fa-save',
         enable: menuUtils.menuEnabledServer,
         data: {
-          data_disabled: gettext('Please select any database or schema or table from the browser tree to take Backup.'),
+          data_disabled: gettext('Please select any database or schema or table from the object explorer to take Backup.'),
         },
       }, {
         name: 'backup_server_ctx',
@@ -103,7 +103,7 @@ define([
         icon: 'fa fa-save',
         enable: menuUtils.menuEnabledServer,
         data: {
-          data_disabled: gettext('Please select any server from the browser tree to take Server Backup.'),
+          data_disabled: gettext('Please select any server from the object explorer to take Server Backup.'),
         },
       }, {
         name: 'backup_object',
@@ -117,7 +117,7 @@ define([
           null, pgBrowser.tree, menuUtils.backupSupportedNodes
         ),
         data: {
-          data_disabled: gettext('Please select any database or schema or table from the browser tree to take Backup.'),
+          data_disabled: gettext('Please select any database or schema or table from the object explorer to take Backup.'),
         },
       }];
 

web/pgadmin/tools/grant_wizard/__init__.py

@@ -40,8 +40,6 @@ class GrantWizardModule(PgAdminModule):
         It is a wizard which inherits PgAdminModule
         class and define methods to load its own
         javascript file.
-
-    LABEL = gettext('Browser')
     """
 
     def get_own_stylesheets(self):

web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js

@@ -48,7 +48,7 @@ define([
           null, pgBrowser.tree, menuUtils.supportedNodes
         ),
         data: {
-          data_disabled: gettext('Please select any database, schema or schema objects from the browser tree to access Grant Wizard Tool.'),
+          data_disabled: gettext('Please select any database, schema or schema objects from the object explorer to access Grant Wizard Tool.'),
         },
       }];
 

web/pgadmin/tools/import_export/static/js/import_export.js

@@ -51,7 +51,7 @@ define([
           null, pgBrowser.tree, ['table']
         ),
         data: {
-          data_disabled: gettext('Please select any table from the browser tree to Import/Export data.'),
+          data_disabled: gettext('Please select any table from the object explorer to Import/Export data.'),
         },
       }]);
     },

web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx

@@ -152,9 +152,9 @@ export default function ImportExportServers({onClose}) {
       } else if (selectionFormData.imp_exp == 'i') {
         setSummaryText(gettext('The following servers will be imported. Click the Finish button to complete the import process.'));
         if (selectionFormData.replace_servers) {
-          setNoteText(gettext('All existing server groups and servers will be removed before the servers above are imported. On a successful import process, the browser tree will be refreshed.'));
+          setNoteText(gettext('All existing server groups and servers will be removed before the servers above are imported. On a successful import process, the object explorer will be refreshed.'));
         } else {
-          setNoteText(gettext('On a successful import process, the browser tree will be refreshed.'));
+          setNoteText(gettext('On a successful import process, the object explorer will be refreshed.'));
         }
       }
     }
@@ -267,4 +267,4 @@ export default function ImportExportServers({onClose}) {
 }
 ImportExportServers.propTypes = {
   onClose: PropTypes.func
-};
+};

web/pgadmin/tools/maintenance/static/js/maintenance.js

@@ -50,7 +50,7 @@ define([
           null, pgBrowser.tree, menuUtils.maintenanceSupportedNodes
         ),
         data: {
-          data_disabled: gettext('Please select any database from the browser tree to do Maintenance.'),
+          data_disabled: gettext('Please select any database from the object explorer to do Maintenance.'),
         },
       }];
 
@@ -68,7 +68,7 @@ define([
             null, pgBrowser.tree, menuUtils.maintenanceSupportedNodes
           ),
           data: {
-            data_disabled: gettext('Please select any database from the browser tree to do Maintenance.'),
+            data_disabled: gettext('Please select any database from the object explorer to do Maintenance.'),
           },
         });
       }

web/pgadmin/tools/restore/static/js/restore.js

@@ -48,7 +48,7 @@ define('tools.restore', [
           null, pgBrowser.tree, menuUtils.restoreSupportedNodes
         ),
         data: {
-          data_disabled: gettext('Please select any schema or table from the browser tree to Restore data.'),
+          data_disabled: gettext('Please select any schema or table from the object explorer to Restore data.'),
         },
       }];
 

web/pgadmin/tools/search_objects/static/js/SearchObjects.jsx

@@ -134,7 +134,7 @@ const columns = [
     formatter: TypePathFormatter,
   },{
     key: 'path',
-    name: gettext('Browser path'),
+    name: gettext('Object path'),
     sortable: false,
     formatter: TypePathFormatter,
   }

web/pgadmin/tools/search_objects/static/js/index.js

@@ -48,7 +48,7 @@ export default class SearchObjectModule {
       label: gettext('Search Objects...'),
       below: true,
       data: {
-        data_disabled: gettext('Please select a database from the browser tree to search the database objects.'),
+        data_disabled: gettext('Please select a database from the object explorer to search the database objects.'),
       },
     }];
 
@@ -106,4 +106,4 @@ pgAdmin.Tools.SearchObjects = SearchObjectModule.getInstance();
 
 module.exports = {
   SearchObjects: pgAdmin.Tools.SearchObjects,
-};
+};

web/pgadmin/tools/sqleditor/static/js/SQLEditorModule.js

@@ -125,7 +125,7 @@ export default class SQLEditor {
       label: gettext('Query Tool'),
       data:{
         applies: 'tools',
-        data_disabled: gettext('Please select a database from the browser tree to access Query Tool.'),
+        data_disabled: gettext('Please select a database from the object explorer to access Query Tool.'),
       },
     }];
 

web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx

@@ -324,8 +324,8 @@ function UserManagementDialog({onClose}) {
         if (changeData['refreshBrowserTree']) {
           // Confirmation dialog to refresh the browser tree.
           Notify.confirm(
-            gettext('Browser tree refresh required'),
+            gettext('Object explorer tree refresh required'),
-            gettext('The ownership of the shared server was changed or the shared server was deleted, so a browser tree refresh is required. Do you wish to refresh the tree?'),
+            gettext('The ownership of the shared server was changed or the shared server was deleted, so the object explorer tree refresh is required. Do you wish to refresh the tree?'),
             function () {
               pgAdmin.Browser.tree.destroy();
             },

web/regression/feature_tests/xss_checks_panels_and_query_tool_test.py

@@ -121,7 +121,7 @@ class CheckForXssFeatureTest(BaseFeatureTest):
 
     def _check_xss_in_browser_tree(self):
         print(
-            "\n\tChecking the Browser tree for XSS vulnerabilities",
+            "\n\tChecking the browser tree for XSS vulnerabilities",
             file=sys.stderr, end=""
         )
         # Fetch the inner html & check for escaped characters

web/regression/feature_tests/xss_checks_roles_control_test.py

@@ -71,9 +71,9 @@ class CheckRoleMembershipControlFeatureTest(BaseFeatureTest):
     def _check_role_membership_control(self):
         self.page.driver.find_element(
             By.CSS_SELECTOR, NavMenuLocators.object_menu_css).click()
-        property_object = self.wait.until(EC.visibility_of_element_located(
+        edit_object = self.wait.until(EC.visibility_of_element_located(
-            (By.CSS_SELECTOR, NavMenuLocators.properties_obj_css)))
+            (By.CSS_SELECTOR, NavMenuLocators.edit_obj_css)))
-        property_object.click()
+        edit_object.click()
         membership_tab = WebDriverWait(self.page.driver, 4).until(
             EC.presence_of_element_located((
                 By.XPATH, "//span[normalize-space(text())='Membership']")))

web/regression/feature_utils/locators.py

@@ -8,7 +8,7 @@
 
 
 class BrowserToolBarLocators():
-    """This will contains element locators for browser tool bar"""
+    """This will contains element locators for browser tree tool bar"""
 
     open_query_tool_button_css = \
         ".wcFrameButton[aria-label='Query Tool']:not(.disabled)"
@@ -40,7 +40,7 @@ class NavMenuLocators:
 
     object_menu_css = "button[data-label='Object']"
 
-    properties_obj_css = "li[data-label='Properties...']"
+    edit_obj_css = "li[data-label='Edit Object...']"
 
     backup_obj_css = "li[data-label='Backup...']"