diff --git a/web/pgadmin/dashboard/static/js/Dashboard.jsx b/web/pgadmin/dashboard/static/js/Dashboard.jsx index 8be4ae50878..885bb6849a2 100644 --- a/web/pgadmin/dashboard/static/js/Dashboard.jsx +++ b/web/pgadmin/dashboard/static/js/Dashboard.jsx @@ -868,7 +868,7 @@ function Dashboard({ }) .then((res) => { if (res?.data?.['logs_disabled']) { - setSsMsg(gettext('Please enable the logging to view the server logs or check the log file is in place or not.')); + setSsMsg(gettext('Please enable logging to view the server logs, or check if the log file is in place.')); } else { setDashData(parseData(res.data)); } diff --git a/web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx b/web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx index e10f761bc69..cdb70544552 100644 --- a/web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx +++ b/web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx @@ -136,7 +136,7 @@ export default function Summary({preferences, sid, did, pageVisible, enablePoll= { icon: '', name: gettext('Host name'), value: gettext(os_info_obj['host_name']) }, { icon: '', name: gettext('Domain name'), value: gettext(os_info_obj['domain_name']) }, { icon: '', name: gettext('Architecture'), value: gettext(os_info_obj['architecture']) }, - { icon: '', name: gettext('Os up since seconds'), value: gettext(os_info_obj['os_up_since_seconds']) }, + { icon: '', name: gettext('OS uptime (seconds)'), value: gettext(os_info_obj['os_up_since_seconds']) }, ]; setOsStats(os_info_list); @@ -145,7 +145,7 @@ export default function Summary({preferences, sid, did, pageVisible, enablePoll= { icon: '', name: gettext('Vendor'), value: gettext(cpu_info_obj['vendor']) }, { icon: '', name: gettext('Description'), value: gettext(cpu_info_obj['description']) }, { icon: '', name: gettext('Model name'), value: gettext(cpu_info_obj['model_name']) }, - { icon: '', name: gettext('No of cores'), value: gettext(cpu_info_obj['no_of_cores']) }, + { icon: '', name: gettext('Number of cores'), value: gettext(cpu_info_obj['no_of_cores']) }, { icon: '', name: gettext('Architecture'), value: gettext(cpu_info_obj['architecture']) }, { icon: '', name: gettext('Clock speed Hz'), value: gettext(cpu_info_obj['clock_speed_hz']) }, { icon: '', name: gettext('L1 dcache size'), value: gettext(cpu_info_obj['l1dcache_size']) }, diff --git a/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx b/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx index c8f3ff51b65..7c581fcc3dc 100644 --- a/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx +++ b/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx @@ -412,8 +412,8 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose, cloudPanelId} {cloudProvider == CLOUD_PROVIDERS.BIGANIMAL && - {gettext('The verification code to authenticate the pgAdmin to EDB BigAnimal is: ')} {verificationCode} -
{gettext('By clicking the below button, you will be redirected to the EDB BigAnimal authentication page in a new tab.')} + {gettext('The verification code to authenticate pgAdmin to EDB BigAnimal is: ')} {verificationCode} +
{gettext('By clicking the button below, you will be redirected to the EDB BigAnimal authentication page in a new tab.')}
} {cloudProvider == CLOUD_PROVIDERS.BIGANIMAL && diff --git a/web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx b/web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx index f1c56eff60b..1bcb6ea7abe 100644 --- a/web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx +++ b/web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx @@ -89,13 +89,13 @@ export default function WorkspaceWelcomePage({ mode }) { let welcomeIcon = ; let welcomeTitle = gettext('Welcome to the Query Tool Workspace!'); let welcomeFirst = gettext('The Query Tool is a robust and versatile environment designed for executing SQL commands and reviewing result sets efficiently.'); - let welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple query tabs, making it easier to organize your work. You can select the existing servers or create a completely new ad-hoc connection to any database server as needed.'); + let welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple query tabs, making it easier to organize your work. You can connect to existing servers or create an ad-hoc connection to any database server as needed.'); if (mode == WORKSPACES.PSQL_TOOL) { welcomeIcon = ; welcomeTitle = gettext('Welcome to the PSQL Workspace!'); welcomeFirst = gettext('The PSQL tool allows users to connect to PostgreSQL or EDB Advanced server using the psql command line interface.'); - welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple PSQL tabs, making it easier to organize your work. You can select the existing servers or create a completely new ad-hoc connection to any database server as needed.'); + welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple PSQL tabs, making it easier to organize your work. You can connect to existing servers or create an ad-hoc connection to any database server as needed.'); } return ( diff --git a/web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx b/web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx index 796e0247154..029fea97f60 100644 --- a/web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx +++ b/web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx @@ -32,7 +32,7 @@ export async function reloadPgAdmin() { export function getNoteField(node, subNode, nodeData, 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 object explorer.'); + note = gettext('This setting is used to show/hide nodes in the Object Explorer.'); } if (note.length > 0) { diff --git a/web/pgadmin/preferences/static/js/components/RightPreference.jsx b/web/pgadmin/preferences/static/js/components/RightPreference.jsx index cc7003d51a3..36a303b5ceb 100644 --- a/web/pgadmin/preferences/static/js/components/RightPreference.jsx +++ b/web/pgadmin/preferences/static/js/components/RightPreference.jsx @@ -46,7 +46,7 @@ export default function RightPreference({ schema, filteredItemIds, selectedItem, return ( - {gettext('Navigate to any below item to view or edit its preferences.')} + {gettext('Select an item below to view or edit its preferences.')} {selectedItem.children.map((child) => ( setSelectedItem(child)} underline="hover">{child.name} diff --git a/web/pgadmin/static/js/Dialogs/index.jsx b/web/pgadmin/static/js/Dialogs/index.jsx index d34b45798f5..a15163d69cc 100644 --- a/web/pgadmin/static/js/Dialogs/index.jsx +++ b/web/pgadmin/static/js/Dialogs/index.jsx @@ -89,7 +89,7 @@ export function checkMasterPassword(data, masterpass_callback_queue, cancel_call if(isKeyring) { if(error){ pgAdmin.Browser.notifier.alert(gettext('Migration failed'), - gettext(`Passwords previously saved can not be re-encrypted using encryption key stored in the ${res.data.data.keyring_name}. due to ${error}`)); + gettext(`Passwords previously saved cannot be re-encrypted using the encryption key stored in the ${res.data.data.keyring_name} due to ${error}.`)); }else{ pgAdmin.Browser.notifier.alert(gettext('Migration successful'), gettext(`Passwords previously saved are re-encrypted using encryption key stored in the ${res.data.data.keyring_name}.`)); diff --git a/web/pgadmin/static/js/Explain/index.jsx b/web/pgadmin/static/js/Explain/index.jsx index b070721d50e..b780fe3b8b1 100644 --- a/web/pgadmin/static/js/Explain/index.jsx +++ b/web/pgadmin/static/js/Explain/index.jsx @@ -506,7 +506,7 @@ function parsePlanData(data, ctx) { } export default function Explain({plans=[], - emptyMessage=gettext('Use Explain/Explain analyze button to generate the plan for a query. Alternatively, you can also execute "EXPLAIN (FORMAT JSON) [QUERY]".') + emptyMessage=gettext('Use the Explain/Explain Analyze button to generate the plan for a query. Alternatively, you can also execute "EXPLAIN (FORMAT JSON) [QUERY]".') }) { const [tabValue, setTabValue] = React.useState(0); diff --git a/web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx b/web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx index 0f982badfaa..93181bcecd5 100644 --- a/web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx +++ b/web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx @@ -72,7 +72,7 @@ export const createFieldControls = ({ if (field.isFullTab) { if (field.type === inlineGroup) - throw new Error('Inline group can not be full tab control'); + throw new Error('Inline group cannot be a full tab control.'); const { visible } = schemaState.options(accessPath.concat(field.id)); currentGroup = createGroup( @@ -107,11 +107,11 @@ export const createFieldControls = ({ if (field.type === inlineGroup) { if (inlineGroupId) { - throw new Error('inline-group can not be created within inline-group'); + throw new Error('An inline-group cannot be created within an inline-group.'); } inlineGroup = currentGroup.inlineGroups[inlineGroupId]; if (inlineGroup) { - throw new Error('inline-group must be unique-id within a tab group'); + throw new Error('An inline-group must have a unique ID within a tab group.'); } inlineGroup = currentGroup.inlineGroups[inlineGroupId] = { control: View('InlineView'), diff --git a/web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx b/web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx index 2980fecf70d..70fbd73a7d1 100644 --- a/web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx +++ b/web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx @@ -13,7 +13,7 @@ export default function ForgotPasswordPage({csrfToken, actionUrl, ...props}) { }; return ( - } {...props} > + } {...props} >
{gettext('Enter the email address for the user account you wish to recover the password for:')}
diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx index 6c9861d5f42..f3d46b0ccbe 100644 --- a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx +++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx @@ -430,7 +430,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug, .catch(() => { pgAdmin.Browser.notifier.alert( gettext('Debugger Error'), - gettext('Unable to fetch the arguments from server') + gettext('Unable to fetch the arguments from the server.') ); }); } diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx index b50be416363..e8755fc0d1c 100644 --- a/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx +++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx @@ -225,7 +225,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panelId, messages(transId); } else if (res.data.data.status === 'NotConnected') { pgAdmin.Browser.notifier.alert( - gettext('Not connected to server or connection with the server has been closed.'), + gettext('Not connected to the server or the connection to the server has been closed.'), res.data.result ); } diff --git a/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx b/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx index f2e201ff93e..9daf9982fe9 100644 --- a/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx +++ b/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx @@ -647,9 +647,9 @@ export default class ERDTool extends React.Component { onDeleteNode() { pgAdmin.Browser.notifier.confirmDelete( - gettext('Delete ?'), + gettext('Delete?'), gettext('You have selected %s tables and %s links.', this.diagram.getSelectedNodes().length, this.diagram.getSelectedLinks().length) - + '
' + gettext('Are you sure you want to delete ?'), + + '
' + gettext('Are you sure you want to delete?'), () => { this.diagram.getSelectedNodes().forEach((node)=>{ this.diagram.removeNode(node); diff --git a/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx b/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx index bce77a25d8f..e0a0850f213 100644 --- a/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx +++ b/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx @@ -107,7 +107,7 @@ export default function ImportExportServers({onClose}) { pgAdmin.Browser.notifier.alert(gettext('Import Servers'), msg); }) .catch((err) => { - pgAdmin.Browser.notifier.alert(gettext('Import error'), err.response.data.errormsg); + pgAdmin.Browser.notifier.alert(gettext('Import Error'), err.response.data.errormsg); }); } diff --git a/web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx b/web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx index 01fd2d70cc3..303c59fa2df 100644 --- a/web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx +++ b/web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx @@ -86,7 +86,7 @@ function psql_terminal_io(term, socket, platform, pgAdmin) { if(result.state === 'granted' || result.state === 'prompt') { copyToClipboard(selected_text); } else { - pgAdmin.Browser.notifier.alert(gettext('Clipboard write permission required'), gettext('To copy data from PSQL terminal, Clipboard write permission required.')); + pgAdmin.Browser.notifier.alert(gettext('Clipboard Write Permission Required'), gettext('To copy data from the PSQL terminal, clipboard write permission is required.')); } }); } else { @@ -106,7 +106,7 @@ function psql_terminal_io(term, socket, platform, pgAdmin) { } }); } else{ - pgAdmin.Browser.notifier.alert(gettext('Clipboard read permission required'), gettext('To paste data on the PSQL terminal, Clipboard read permission required.')); + pgAdmin.Browser.notifier.alert(gettext('Clipboard Read Permission Required'), gettext('To paste data on the PSQL terminal, clipboard read permission is required.')); } }); }); diff --git a/web/pgadmin/tools/schema_diff/static/js/components/Results.jsx b/web/pgadmin/tools/schema_diff/static/js/components/Results.jsx index a895c5e73f2..3c34047ccf4 100644 --- a/web/pgadmin/tools/schema_diff/static/js/components/Results.jsx +++ b/web/pgadmin/tools/schema_diff/static/js/components/Results.jsx @@ -80,7 +80,7 @@ export function Results() { return ( ( - {gettext('DDL Comparision')} + {gettext('DDL Comparison')} {gettext('Source')} diff --git a/web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx b/web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx index ab14919a5f6..3fcfa416d0c 100644 --- a/web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx +++ b/web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx @@ -352,9 +352,9 @@ export function SchemaDiffCompare({ params }) { let generatedScript, scriptHeader; scriptHeader = gettext('-- This script was generated by the Schema Diff utility in pgAdmin 4. \n'); - scriptHeader += gettext('-- For the circular dependencies, the order in which Schema Diff writes the objects is not very sophisticated \n'); - scriptHeader += gettext('-- and may require manual changes to the script to ensure changes are applied in the correct order.\n'); - scriptHeader += gettext('-- Please report an issue for any failure with the reproduction steps. \n'); + scriptHeader += gettext('-- Due to circular dependencies, the order in which Schema Diff writes objects may not be optimal \n'); + scriptHeader += gettext('-- and manual changes to the script may be required to ensure changes are applied in the correct order.\n'); + scriptHeader += gettext('-- Please report any issues along with steps to reproduce. \n'); if (selectedIds.length > 0) { let script_array = { 1: [], 2: [], 3: [], 4: [], 5: [] }, @@ -828,12 +828,12 @@ export function SchemaDiffCompare({ params }) { : - {gettext(' Source and Target database server must be of the same major version.')}
- {gettext(' Database Compare:')} - {gettext(' Select the server and database for the source and target and Click')} {gettext('Compare.')} + {' '}{gettext('Source and Target database servers must be of the same major version.')}
+ {gettext('Database Compare:')} + {' '}{gettext('Select the server and database for the source and target and click')} {gettext('Compare.')}
{gettext('Schema Compare:')} - {gettext(' Select the server, database and schema for the source and target and Click')} {gettext('Compare.')} + {' '}{gettext('Select the server, database and schema for the source and target and click')} {gettext('Compare.')}
{gettext('Note:')} {gettext('The dependencies will not be resolved in the Schema comparison.')}
diff --git a/web/pgadmin/tools/user_management/static/js/RoleDialog.jsx b/web/pgadmin/tools/user_management/static/js/RoleDialog.jsx index 7f31f4fc583..5646b00c802 100644 --- a/web/pgadmin/tools/user_management/static/js/RoleDialog.jsx +++ b/web/pgadmin/tools/user_management/static/js/RoleDialog.jsx @@ -47,7 +47,7 @@ export default function RoleDialog({role, onClose}) { try { api.post(url_for('user_management.role_save'), changeData) .then(()=>{ - pgAdmin.Browser.notifier.success(gettext('Role Saved Successfully')); + pgAdmin.Browser.notifier.success(gettext('Role saved successfully.')); resolve(); onClose(null, true); }) diff --git a/web/pgadmin/tools/user_management/static/js/Roles.jsx b/web/pgadmin/tools/user_management/static/js/Roles.jsx index c9fc93bdf8c..75b79049866 100644 --- a/web/pgadmin/tools/user_management/static/js/Roles.jsx +++ b/web/pgadmin/tools/user_management/static/js/Roles.jsx @@ -144,7 +144,7 @@ export default function Roles({roles, updateRoles}) { minSize: 50, }, { - header: gettext('Decscription'), + header: gettext('Description'), accessorKey: 'description', size: 100, minSize: 100, diff --git a/web/pgadmin/tools/user_management/static/js/UserDialog.jsx b/web/pgadmin/tools/user_management/static/js/UserDialog.jsx index 7e51cf91220..35d72343c0d 100644 --- a/web/pgadmin/tools/user_management/static/js/UserDialog.jsx +++ b/web/pgadmin/tools/user_management/static/js/UserDialog.jsx @@ -200,7 +200,7 @@ export default function UserDialog({user, options, onClose}) { try { api.post(url_for('user_management.save'), changeData) .then(()=>{ - pgAdmin.Browser.notifier.success(gettext('Users Saved Successfully')); + pgAdmin.Browser.notifier.success(gettext('User saved successfully.')); resolve(); onClose(null, true); })