@succsoft/succapp 5.0.1 → 5.0.2

package/dist/cli/l10n/bundle.l10n.json

@@ -6,6 +6,17 @@
 	"err.net.connectionFailed": "Cannot connect to server: {url}{causeMessage}",
 	"err.net.connectionFailed.desc": "Check the server address and network connection, then retry or log in again.",
 	"err.login.notlogin": "Authentication failed, please log in again",
+	"err.oauth2.tokenExpired": "OAuth2 access token expired.",
+	"err.login.oauthTimeout": "OAuth2 authorization timed out.",
+	"err.login.oauthTimeout.desc": "Restart login, complete authorization in the browser, or use PAT login in environments without a browser.",
+	"err.login.oauthStateMismatch": "OAuth2 authorization state does not match.",
+	"err.login.oauthStateMismatch.desc": "Restart login and complete authorization from the newly opened browser page.",
+	"err.login.oauthInvalidCallback": "Invalid OAuth2 authorization callback.",
+	"err.login.oauthInvalidCallback.desc": "Restart login and complete authorization in the browser.",
+	"err.login.oauthLoopbackFailed": "Cannot start local OAuth2 callback server.",
+	"err.login.oauthLoopbackFailed.desc": "Check whether local loopback access is blocked, then retry or use PAT login.",
+	"err.login.oauthTokenInvalid": "Invalid OAuth2 token response.",
+	"err.login.oauthTokenInvalid.desc": "Check the server version and OAuth2 configuration, then retry.",
 	"err.sync.conflict": "Remote version has changed: {remotePath}",
 	"err.sync.conflict.desc": "Please pull or diff before pushing. Reason: {reason}",
 	"err.sync.projectUnavailable": "Cannot {actionName} unavailable remote project(s): {paths}",
@@ -21,7 +32,7 @@
 	"err.extension.rootUnresolved.desc": "Provide an extensionName or a path inside an extension.",
 	"err.extension.rootNotFound": "Extension directory does not exist: {extensionRoot}",
 	"err.workspace.problem": "Workspace sync problem detected.",
-	"err.workspace.problem.desc": "Run workspace check or repair before retrying operations that require a complete local baseline.",
+	"err.workspace.problem.desc": "Run 'succapp workspace repair --dry-run' or 'succapp workspace repair' before retrying operations that require a complete local sync baseline.",
 	"err.net.invalidUrl": "Invalid URL: {url}",
 	"err.meta.invalidPath": "Invalid metadata path",
 	"err.meta.invalidPath.desc": "Use a valid absolute metadata path and try again.",
@@ -32,10 +43,29 @@
 	"err.file.notDirectory": "Path is not a directory: {path}",
 	"err.workspace.sameServerUrl": "New server URL must be different from the current URL.",
 	"err.workspace.serverAlreadyExists": "Server already exists: {duplicatedServer}",
+	"err.workspace.issue.E201": "workspace config is missing",
+	"err.workspace.issue.E202": "workspace config is not valid JSON",
+	"err.workspace.issue.E203": "workspace config is missing the requested server",
+	"err.workspace.issue.E204": "workspace active server does not match the requested server",
+	"err.workspace.issue.E205": "active server is required for this workspace maintenance task",
+	"err.workspace.issue.E206": "workspace maintenance task is not implemented",
+	"err.workspace.issue.E301": "local sync baseline resource type does not match .meta",
+	"err.workspace.issue.E302": "local sync baseline records a resource that is missing on disk",
+	"err.workspace.issue.E303": "local sync baseline .meta is missing",
+	"err.workspace.issue.E304": "local sync baseline .meta is unreadable",
+	"err.workspace.issue.E305": "workspace project is missing local sync baseline",
+	"err.workspace.issue.E306": "local sync baseline is still incomplete after fetch",
+	"err.workspace.issue.E307": "current login cannot see matching project on current server",
+	"err.workspace.issue.E401": "recommended workspace settings are missing",
+	"err.workspace.issue.E402": "SuccApp .gitignore rules are missing",
+	"err.workspace.issue.E403": "AI agent workspace files are missing",
+	"err.workspace.issue.E404": "TypeScript support files are missing",
+	"err.workspace.issue.E405": "JSON Schema support files are missing",
+	"err.workspace.issue.E406": "frontend development skill files are missing",
 	"err.lock.busy": "Cannot {attemptedCommand}: workspace scope {conflictScope} is held by another process.",
 	"err.lock.busy.desc": "Stop the running process and retry; locks left by crashed processes are cleaned up automatically on the next attempt.",
 	"err.lock.compromised": "Workspace lock was taken over by another process; the current {attemptedCommand} has been aborted.",
-	"err.lock.compromised.desc": "Run status to verify consistency before retrying.",
+	"err.lock.compromised.desc": "Run 'succapp workspace status' to verify consistency before retrying.",
 	"err.workspace.activeConnectionRequired": "Cannot {actionName} without an active server connection.",
 	"err.base.operationFailed": "Operation failed",
 	"err.base.operationFailed.desc": "The operation could not be completed. Check the error details or contact the administrator.",
@@ -44,7 +74,8 @@
 	"err.net.invalidResponse.dbTableDescribeEmpty.hint": "Check whether data source {dataSource} and table {tableName} exist.",
 	"err.db.tableNotFound": "Database table does not exist: {tableName}",
 	"err.cli.unknownCommand": "Unknown command: {commandName}",
-	"err.cli.unknownCommand.hint": "Run {helpCommand} to view available commands.",
+	"err.cli.unknownCommand.hint": "Run '{helpCommand}' to view available commands.",
+	"err.cli.unknownCommand.suggestion.hint": "Did you mean:{commands}",
 	"err.cli.invalidInvocation": "Found {count} usage issue(s).",
 	"err.cli.invalidInvocation.hint": "Fix the listed usage issues and retry.",
 	"err.cli.unknownOption": "Unknown option: {option}",
@@ -75,13 +106,13 @@
 	"err.cli.invalidReadableFile": "Input file is not readable: {source}.",
 	"err.cli.invalidRegularFile": "Input path is not a regular file: {source}.",
 	"err.cli.invalidWorkspace": "Not a SuccApp workspace: {source}.",
-	"err.cli.invalidWorkspace.hint": "Run succapp workspace init first, or use -C <workspace> to choose an existing workspace.",
+	"err.cli.invalidWorkspace.hint": "Run 'succapp workspace init --server <url>' first, or use '-C <workspace>' to choose an existing workspace.",
 	"err.cli.invalidWorkspaceConfigJson": "Workspace config is corrupted: {source}.",
 	"err.cli.unconfiguredServer": "Server is not configured in the current workspace: {value}.",
 	"err.cli.serverMismatch": "Server does not match the active workspace server: {value}.",
 	"err.cli.serverMismatch.hint": "Expected active server: {expected}.",
 	"err.cli.unsupportedAuthFlow": "Authentication flow is not implemented yet: {authType}.",
-	"err.cli.unsupportedAuthFlow.hint": "Use succapp auth login --pat <url> and enter the PAT when prompted. Piped stdin is still supported for scripts.",
+	"err.cli.unsupportedAuthFlow.hint": "Use 'succapp auth login --pat <url>' and enter the PAT when prompted. Piped stdin is still supported for scripts.",
 	"err.cli.invalidExtensionName": "Invalid extension name: {value}.",
 	"err.cli.invalidExtensionName.hint": "Use <companyName>-<extensionPoint>-<shortName>.",
 	"err.cli.unknownExtensionTemplate": "Extension template is not available: {value}.",
@@ -90,7 +121,7 @@
 	"err.cli.confirmationRequired.dbSourceDelete": "Deleting this data source requires confirmation.",
 	"err.cli.confirmationRequired.dbSourceDelete.hint": "Confirm the data source can be deleted, then pass {flag}.",
 	"err.cli.confirmationRequired.dbQueryWriteSql": "db query only runs read-only SQL. Use db exec for SQL that may change data or schema.",
-	"err.cli.confirmationRequired.dbQueryWriteSql.hint": "Review the SQL impact, then run succapp db exec with {flag}.",
+	"err.cli.confirmationRequired.dbQueryWriteSql.hint": "Review the SQL impact, then run 'succapp db exec {flag}'.",
 	"err.cli.confirmationRequired.dbSqlMutation": "This SQL may change data or schema and requires confirmation.",
 	"err.cli.confirmationRequired.dbSqlMutation.hint": "Review the SQL impact, then pass {flag} to execute it.",
 	"err.cli.confirmationRequired.outputOverwrite": "The output file already exists and would be overwritten.",
@@ -100,18 +131,67 @@
 	"err.cli.confirmationRequired.cloneOverwrite.hint": "Confirm the local project can be overwritten, then pass {flag}.",
 	"err.cli.confirmationRequired.projRemove": "Removing local workspace project(s) requires confirmation: {projectNames}.",
 	"err.cli.confirmationRequired.projRemove.hint": "Confirm the local project files and mirror baselines can be removed, then pass {flag}.",
+	"err.cli.confirmationRequired.discardAll": "Discarding all workspace changes requires confirmation.",
+	"err.cli.confirmationRequired.discardAll.hint": "Confirm all local workspace changes can be discarded, then pass {flag}.",
 	"err.db.nonReadOnlySql": "db query only runs read-only SQL. Use db exec for SQL that may change data or schema.",
-	"err.db.nonReadOnlySql.hint": "Review the SQL impact, then run succapp db exec with {flag}.",
+	"err.db.nonReadOnlySql.hint": "Review the SQL impact, then run 'succapp db exec {flag}'.",
 	"err.net.httpStatusUnexpected": "Unexpected HTTP response status",
 	"err.net.httpStatusUnexpected.desc": "The remote service returned an HTTP status that the caller cannot classify. Check the error details or contact the administrator.",
 	"workspace.compat.connectedServerAppears": "The connected server appears older than this workspace's recorded baseline. You may have connected to the wrong server.",
 	"workspace.compat.serverVersion": "Server version: {0} < {1}",
+	"workspace.extension.progress.create.done": "Created extension {0}.",
+	"workspace.extension.progress.create.running": "Creating extension {0}",
+	"workspace.extension.progress.templates": "Loading extension templates",
+	"workspace.maintenance.progress.checkingAll": "Checking workspace",
+	"workspace.maintenance.progress.blocked": "Blocked {0}.",
+	"workspace.maintenance.progress.checked": "Checked {0}.",
+	"workspace.maintenance.progress.checking": "Checking {0} ({1}/{2})",
+	"workspace.maintenance.progress.failed": "Failed {0}.",
+	"workspace.maintenance.progress.skipped": "Skipped {0}: {1}.",
+	"workspace.maintenance.progress.skipReason": "skipped",
+	"workspace.maintenance.progress.updated": "Updated {0}.",
+	"workspace.maintenance.progress.updatingAll": "Updating workspace",
+	"workspace.maintenance.progress.upToDate": "{0} is up to date.",
+	"workspace.maint.task.frontendDevelopmentSkill": "frontend development skill",
+	"workspace.maint.task.jsonSchemaSupport": "JSON schema support",
+	"workspace.maint.task.syncBaseline": "sync baseline",
+	"workspace.maint.task.typescriptSupport": "TypeScript support",
+	"workspace.maint.task.workspaceAgentFiles": "workspace agent files",
+	"workspace.maint.task.workspaceConfig": "workspace config",
+	"workspace.maint.task.workspaceGitignore": "workspace gitignore",
+	"workspace.maint.task.workspaceSettings": "workspace VS Code settings",
 	"workspace.repair.baseline.invisible": "current login cannot see matching project on current server: {0}",
-	"workspace.repair.baseline.mirrorMissing": "workspace project mirror baseline is still missing after fetch: {0}",
-	"workspace.repair.baseline.missing": "workspace project is missing local mirror baseline: {0}",
+	"workspace.repair.baseline.metaMissing": "local sync baseline .meta is missing: {0}",
+	"workspace.repair.baseline.metaUnreadable": "local sync baseline .meta is unreadable: {0}",
+	"workspace.repair.baseline.projectMissing": "workspace project is missing local sync baseline: {0}",
+	"workspace.repair.baseline.resourceMissing": "local sync baseline records a resource that is missing on disk: {0}",
+	"workspace.repair.baseline.stillBroken": "local sync baseline is still incomplete after fetch: {0}",
+	"workspace.repair.baseline.typeMismatch": "local sync baseline resource type does not match .meta: {0}",
 	"workspace.repair.check.notImpl": "workspace repair check is not implemented: {0}",
 	"workspace.server.serverMirrorExists": "Server mirror already exists: {0}",
 	"workspace.server.serverNotConfigured": "Server is not configured for this workspace: {0}",
+	"workspace.sync.progress.backupClear.running": "Clearing merge backups",
+	"workspace.sync.progress.backupList.running": "Listing merge backups",
+	"workspace.sync.progress.clone.done": "Cloned {0} project(s).",
+	"workspace.sync.progress.clone.running": "Cloning workspace projects",
+	"workspace.sync.progress.diff.running": "Comparing workspace files",
+	"workspace.sync.progress.history.running": "Loading file history",
+	"workspace.sync.progress.show.running": "Reading workspace file",
+	"workspace.sync.progress.pull.done": "Pulled remote changes: {0} updated, {1} deleted, {2} conflict(s).",
+	"workspace.sync.progress.pull.running": "Pulling remote changes",
+	"workspace.sync.progress.push.done": "Pushed local changes: {0} pushed, {1} rejected, {2} failed.",
+	"workspace.sync.progress.push.running": "Pushing local changes",
+	"workspace.sync.progress.push.stopped": "Push stopped before upload.",
+	"workspace.sync.progress.refresh.running": "Refreshing workspace changes",
+	"workspace.sync.progress.removeProject.done": "Removed {0} local project(s).",
+	"workspace.sync.progress.removeProject.running": "Removing local workspace projects",
+	"workspace.sync.progress.reset.done": "Discarded local changes: {0} restored, {1} deleted.",
+	"workspace.sync.progress.reset.running": "Discarding local changes",
+	"workspace.sync.progress.restore.running": "Restoring local backup",
+	"workspace.sync.progress.upgradeMeta.apply": "Upgrading metadata files",
+	"workspace.sync.progress.upgradeMeta.checked": "Checked {0} metadata file(s): {1} upgradeable.",
+	"workspace.sync.progress.upgradeMeta.done": "Upgraded metadata files: {0} changed, {1} failed, {2} checked.",
+	"workspace.sync.progress.upgradeMeta.scan": "Scanning metadata files",
 	"workspace.validation.json.invalidJson": "Invalid JSON: {0}.",
 	"workspace.validation.json.jsonFileEmpty": "JSON file is empty.",
 	"cli.cmd.common.desc": "Common commands.",
@@ -132,15 +212,17 @@
 	"cli.cmd.auth.title": "Auth",
 	"cli.cmd.auth.summary": "login, logout, and inspect stored server auth",
 	"cli.cmd.auth.desc": "Login, logout, and inspect stored server auth.",
-	"cli.cmd.auth.noStoredAuth": "No stored auth for {0}",
-	"cli.cmd.auth.storedAuth": "Stored auth for {0}: {1}",
-	"cli.cmd.auth.storedAuthNoCred": "Stored auth for {0}: no credential methods",
 	"cli.cmd.auth.login.summary": "Login to a server.",
 	"cli.cmd.auth.login.desc": "Login to a SuccBI server with OAuth2 or PAT and save local auth state.",
 	"cli.cmd.auth.login.oauth": "Use OAuth2 login. This is the default.",
 	"cli.cmd.auth.login.pat": "Use Personal Access Token login. Interactive terminals prompt for the token; piped input is read from stdin.",
 	"cli.cmd.auth.login.patPrompt": "Personal Access Token: ",
+	"cli.cmd.auth.login.openingBrowser": "Opening browser for OAuth2 authorization...",
+	"cli.cmd.auth.login.waitingForCallback": "Waiting for OAuth2 authorization...",
+	"cli.cmd.auth.login.exchangingToken": "Exchanging OAuth2 authorization code...",
+	"cli.cmd.auth.login.oauthManualUrl": "Open this URL in your browser to authorize SuccApp: {0}",
 	"cli.cmd.auth.login.loggedIn": "Logged in to {0}",
+	"cli.cmd.auth.login.loggedInAs": "Logged in to {0} as {1}",
 	"cli.cmd.auth.logout.summary": "Remove stored auth.",
 	"cli.cmd.auth.logout.desc": "Remove stored authentication information from the local auth settings.",
 	"cli.cmd.auth.logout.all": "Remove stored auth for all servers.",
@@ -150,6 +232,8 @@
 	"cli.cmd.auth.logout.storedAuth": "No stored auth for {0}",
 	"cli.cmd.auth.status.summary": "Show stored auth status.",
 	"cli.cmd.auth.status.desc": "Show local stored authentication information for a server.",
+	"cli.cmd.auth.status.noStoredOutput": "Server: {server}\nStored auth: {storedAuth}",
+	"cli.cmd.auth.status.output": "Server: {server}\nStored auth: {storedAuth}\nAuth type: {authType}\nUsername: {username}\nUser ID: {userId}\nToken: {token}\nRefresh token: {refreshToken}\nExpires at: {expiresAt}\nLast login at: {lastLoginAt}\nUpdated at: {updatedAt}",
 	"cli.cmd.db.title": "Database",
 	"cli.cmd.db.summary": "inspect and operate server databases and data sources",
 	"cli.cmd.db.desc": "Inspect and operate server databases and data sources.",
@@ -261,7 +345,7 @@
 	"cli.cmd.server.ping.summary": "Check server reachability.",
 	"cli.cmd.server.ping.desc": "Check whether the SuccApp Dev Tool v2 ping endpoint is reachable.",
 	"cli.cmd.server.info.summary": "Show server information.",
-	"cli.cmd.server.info.desc": "Show server information and Dev Tool capabilities.",
+	"cli.cmd.server.info.desc": "Show server information and metadata versions.",
 	"cli.cmd.server.cache.title": "Server cache",
 	"cli.cmd.server.cache.summary": "manage server cache",
 	"cli.cmd.server.cache.desc": "Manage server cache.",
@@ -353,33 +437,43 @@
 	"cli.cmd.server.script.exec.param": "Pass a script parameter. Repeatable.",
 	"cli.cmd.server.script.check.summary": "Check a local script on the server.",
 	"cli.cmd.server.script.check.desc": "Read a local script file and compile it through Dev Tool v2 when the server supports this capability.",
+	"cli.cmd.server.settings.title": "Server settings",
+	"cli.cmd.server.settings.summary": "get and set server settings",
+	"cli.cmd.server.settings.desc": "Get and set system, project, or app settings through Dev Tool v2.",
+	"cli.cmd.server.settings.target.system": "system",
+	"cli.cmd.server.settings.get.summary": "Get server settings.",
+	"cli.cmd.server.settings.get.desc": "Read system, project, or app settings. Omit <target> or pass system to read system settings.",
+	"cli.cmd.server.settings.get.key": "Only return the given top-level key. Repeatable.",
+	"cli.cmd.server.settings.get.header": "Settings of {0}:",
+	"cli.cmd.server.settings.set.summary": "Set server settings.",
+	"cli.cmd.server.settings.set.desc": "Merge incremental settings into system, project, or app settings. Provide at least one of --set, --file, --stdin or --unset.",
+	"cli.cmd.server.settings.set.set": "Inline incremental JSON. May set multiple top-level keys at once.",
+	"cli.cmd.server.settings.set.file": "Read incremental JSON from a local file.",
+	"cli.cmd.server.settings.set.stdin": "Read incremental JSON from stdin.",
+	"cli.cmd.server.settings.set.unset": "Delete the given top-level key. Repeatable.",
+	"cli.cmd.server.settings.set.key": "Only merge under the given top-level key.",
+	"cli.cmd.server.settings.set.expectedRevision": "Only set when the server settings revision still matches.",
+	"cli.cmd.server.settings.set.success": "Updated settings of {0}: {1}",
+	"cli.cmd.server.settings.set.noKeys": "(no keys)",
 	"cli.cmd.workspace.title": "Workspace",
 	"cli.cmd.workspace.summary": "work with a local SuccApp workspace",
 	"cli.cmd.workspace.desc": "Work with a local SuccApp workspace.",
 	"cli.cmd.workspace.init.summary": "Initialize a SuccApp workspace.",
-	"cli.cmd.workspace.init.desc": "Initialize .succapp/config.json in the target workspace directory.",
+	"cli.cmd.workspace.init.desc": "Initialize .succapp/config.json and recommended workspace support files.",
 	"cli.cmd.workspace.init.server": "Initialize the workspace with this active server.",
-	"cli.cmd.workspace.init.setup": "Apply recommended workspace support files after initialization.",
 	"cli.cmd.workspace.init.active": "Active server: {0}",
-	"cli.cmd.workspace.init.alreadyActive": "Workspace is already initialized with active server: {0}. Use workspace remote add or workspace remote use to change servers.",
+	"cli.cmd.workspace.init.alreadyActive": "Workspace is already initialized with active server: {0}. Use 'succapp workspace remote add <url>' or 'succapp workspace remote use <url>' to change servers.",
 	"cli.cmd.workspace.init.configBad": "Workspace config is corrupted: {0}",
 	"cli.cmd.workspace.init.initWorkspace": "Initialized workspace: {0}",
-	"cli.cmd.workspace.init.supportFiles": "Workspace support files applied.",
+	"cli.cmd.workspace.init.nextConfigureServer": "Next: run 'succapp workspace init --server <url>' or 'succapp workspace remote add <url>'.",
+	"cli.cmd.workspace.init.noActiveServer": "No active server configured.",
+	"cli.cmd.workspace.init.supportFiles": "Workspace support files: {0} updated, {1} skipped.",
 	"cli.cmd.workspace.init.workspaceInit": "Workspace already initialized: {0}",
-	"cli.cmd.workspace.setup.summary": "Apply recommended workspace support files.",
-	"cli.cmd.workspace.setup.desc": "Apply SuccApp recommended settings, TypeScript support, JSON Schema support, and agent files.",
-	"cli.cmd.workspace.setup.dryRun": "Preview the setup plan without changing files.",
-	"cli.cmd.workspace.setup.clean": "Workspace setup: no changes needed.",
-	"cli.cmd.workspace.setup.dry": "Workspace setup dry run: {0} pending, {1} up to date, {2} skipped.",
-	"cli.cmd.workspace.setup.updated": "Workspace setup: {0} item(s) updated, {1} confirmation request(s).",
-	"cli.cmd.workspace.check.summary": "Check workspace consistency.",
-	"cli.cmd.workspace.check.desc": "Check workspace structure and sync state without changing files.",
-	"cli.cmd.workspace.check.only": "Run only the named workspace check.",
 	"cli.cmd.workspace.status.summary": "Show workspace sync status.",
 	"cli.cmd.workspace.status.desc": "Show workspace sync status.",
 	"cli.cmd.workspace.status.forceRefresh": "Recheck server changes instead of using cached status.",
 	"cli.cmd.workspace.status.localOnly": "Show only local workspace changes; do not check the server.",
-	"cli.cmd.workspace.status.remoteAuthRequired": "You are not logged in, so only local changes are shown. Run `succapp auth login`, then retry to include server changes.",
+	"cli.cmd.workspace.status.remoteAuthRequired": "You are not logged in, so only local changes are shown. Run 'succapp auth login', then retry to include server changes.",
 	"cli.cmd.workspace.upgrade.summary": "Plan workspace structure migrations.",
 	"cli.cmd.workspace.upgrade.desc": "Plan SuccApp workspace structure migrations. The current implementation has no migrations.",
 	"cli.cmd.workspace.upgrade.targetVersion": "Plan migration to the target workspace structure version.",
@@ -405,17 +499,23 @@
 	"cli.cmd.workspace.push.pushResultPushed": "Push result: {0} pushed, {1} rejected, {2} failed",
 	"cli.cmd.workspace.push.targetVersion": "Target version",
 	"cli.cmd.workspace.push.version": "Current version",
-	"cli.cmd.workspace.repair.summary": "Repair workspace consistency issues.",
-	"cli.cmd.workspace.repair.desc": "Repair workspace structure and sync state issues that can be fixed automatically.",
-	"cli.cmd.workspace.repair.only": "Repair only issues from the named workspace check.",
-	"cli.cmd.workspace.repair.dryRun": "Preview the repair plan without changing files.",
-	"cli.cmd.workspace.repair.badCheck": "Invalid workspace check id: {0}",
-	"cli.cmd.workspace.repair.check": "Check",
-	"cli.cmd.workspace.repair.checkClean": "Workspace check: no problems found.",
-	"cli.cmd.workspace.repair.checkIssue": "Workspace check: {0} issue(s), {1} repairable.",
+	"cli.cmd.workspace.discard.summary": "Discard local workspace changes.",
+	"cli.cmd.workspace.discard.desc": "Restore workspace files from the local mirror baseline and discard local changes.",
+	"cli.cmd.workspace.discard.force": "Confirm discarding all workspace changes when no path is given.",
+	"cli.cmd.workspace.discard.deletedFiles": "Deleted files: {0}",
+	"cli.cmd.workspace.discard.noLocalChanges": "No local changes to discard",
+	"cli.cmd.workspace.discard.restoredFiles": "Restored files: {0}",
+	"cli.cmd.workspace.discard.result": "Discard result: {0} restored, {1} deleted",
+	"cli.cmd.workspace.repair.summary": "Check or repair workspace consistency issues.",
+	"cli.cmd.workspace.repair.desc": "Check or repair workspace structure and sync state issues that can be fixed automatically.",
+	"cli.cmd.workspace.repair.only": "Run only the named workspace repair check.",
+	"cli.cmd.workspace.repair.dryRun": "Preview repairable workspace issues without changing files.",
+	"cli.cmd.workspace.repair.badCheck": "Invalid workspace repair check: {0}",
+	"cli.cmd.workspace.repair.checkColumn": "Check",
+	"cli.cmd.workspace.repair.codeColumn": "Code",
+	"cli.cmd.workspace.repair.dryRunClean": "Workspace repair dry-run: no problems found.",
+	"cli.cmd.workspace.repair.dryRunIssue": "Workspace repair dry-run: {0} issue(s), {1} repairable, {2} unrepairable.",
 	"cli.cmd.workspace.repair.clean": "Workspace repair: no changes needed.",
-	"cli.cmd.workspace.repair.dryRunClean": "Workspace repair dry run: no changes needed.",
-	"cli.cmd.workspace.repair.dryRunIssues": "Workspace repair dry run: {0} issue(s), {1} repairable, {2} unrepairable.",
 	"cli.cmd.workspace.repair.remotePaths": "Remote paths",
 	"cli.cmd.workspace.repair.repairable": "Repairable",
 	"cli.cmd.workspace.repair.repaired": "Workspace repair: {0} repaired, {1} unresolved.",
@@ -430,9 +530,9 @@
 	"cli.cmd.workspace.proj.clone.summary": "Clone server projects into the workspace.",
 	"cli.cmd.workspace.proj.clone.desc": "Clone projects from the active server into the current workspace.",
 	"cli.cmd.workspace.proj.clone.force": "Allow clone to overwrite existing local workspace projects.",
+	"cli.cmd.workspace.proj.clone.configuredActive": "Active server configured: {0}",
 	"cli.cmd.workspace.proj.clone.cloned": "Cloned projects: {0}",
-	"cli.cmd.workspace.proj.clone.oldMeta": "Old metadata files: {0}",
-	"cli.cmd.workspace.proj.clone.upgradeCommand": "Upgrade command: {0}",
+	"cli.cmd.workspace.proj.clone.oldMetaNotice": "Note: {count} metadata file(s) use an older format.\nOptional: run '{command}' to modernize them.\nThis may update many files; run with `--dry-run` first to review the scope.\nSkip this if you only want to inspect the project.",
 	"cli.cmd.workspace.proj.remove.summary": "Remove workspace projects.",
 	"cli.cmd.workspace.proj.remove.desc": "Remove local workspace projects and mirror baselines without deleting server projects.",
 	"cli.cmd.workspace.proj.remove.force": "Confirm removal of local project files and mirror baselines.",
@@ -487,18 +587,14 @@
 	"cli.cmd.workspace.file.history.desc": "Show server-side file history for a workspace file.",
 	"cli.cmd.workspace.file.history.limit": "Limit the number of history records.",
 	"cli.cmd.workspace.file.upgrade.summary": "Upgrade old SuccApp metadata files.",
-	"cli.cmd.workspace.file.upgrade.desc": "Check or upgrade old SuccApp metadata files in local workspace projects. If no path is given, all local projects are processed.",
-	"cli.cmd.workspace.file.upgrade.check": "Check upgrade candidates without changing files.",
+	"cli.cmd.workspace.file.upgrade.desc": "Preview or upgrade old SuccApp metadata files in local workspace projects. If no path is given, all local projects are processed.",
+	"cli.cmd.workspace.file.upgrade.dryRun": "Preview upgrade candidates without changing files.",
 	"cli.cmd.workspace.file.upgrade.cands": "Upgrade candidates: {0}",
-	"cli.cmd.workspace.file.upgrade.checkRes": "Metadata upgrade check: {0} checked, {1} candidate(s), {2} skipped, {3} failed",
+	"cli.cmd.workspace.file.upgrade.dryRunRes": "Metadata upgrade dry-run: {0} checked, {1} candidate(s), {2} skipped, {3} failed",
 	"cli.cmd.workspace.file.upgrade.failed": "Failed files: {0}",
-	"cli.cmd.workspace.file.upgrade.itemFailed": "[{0}/{1}] failed {2}: {3}",
-	"cli.cmd.workspace.file.upgrade.itemSkipped": "[{0}/{1}] skipped {2}: {3}",
-	"cli.cmd.workspace.file.upgrade.itemUpgraded": "[{0}/{1}] upgraded {2}",
-	"cli.cmd.workspace.file.upgrade.noCands": "No metadata files need upgrade.",
 	"cli.cmd.workspace.file.upgrade.reason": "Reason",
 	"cli.cmd.workspace.file.upgrade.result": "Metadata upgrade result: {0} checked, {1} changed, {2} skipped, {3} failed",
-	"cli.cmd.workspace.file.upgrade.upgradeStart": "Upgrading metadata files...",
+	"cli.cmd.workspace.file.upgrade.skipped": "Skipped files: {0}",
 	"cli.cmd.workspace.file.upgrade.upgraded": "Upgraded files: {0}",
 	"cli.cmd.workspace.lock.title": "Workspace lock",
 	"cli.cmd.workspace.lock.summary": "inspect workspace locks",
@@ -550,13 +646,17 @@
 	"cli.out.common.active": "Active",
 	"cli.out.common.api": "Dev Tool API",
 	"cli.out.common.baseline": "Baseline",
-	"cli.out.common.capabilities": "Capabilities",
 	"cli.out.common.changes": "No changes.",
 	"cli.out.common.changesLocalRemote": "Changes: {0} (local {1}, remote {2}, conflicts {3})",
 	"cli.out.common.id": "ID",
+	"cli.out.common.jvmInfo": "JVM properties",
+	"cli.out.common.metaVersions": "Metadata versions",
 	"cli.out.common.noServers": "No servers configured.",
 	"cli.out.common.product": "Product",
+	"cli.out.common.productInfo": "Product information",
 	"cli.out.common.server": "Server",
+	"cli.out.common.sysInspectInfo": "System diagnostics",
+	"cli.out.common.systemEnvirInfo": "Environment variables",
 	"cli.out.common.targetVersion": "Target version",
 	"cli.out.common.version": "Current version",
 	"cli.out.common.workspace": "Workspace",
@@ -572,7 +672,9 @@
 	"cli.out.header.extra": "Extra",
 	"cli.out.header.field": "Field",
 	"cli.out.header.key": "Key",
+	"cli.out.header.latestVersion": "Latest version",
 	"cli.out.header.message": "Message",
+	"cli.out.header.metaType": "Metadata type",
 	"cli.out.header.modified": "Modified",
 	"cli.out.header.modifier": "Modifier",
 	"cli.out.header.null": "Null",
@@ -586,6 +688,7 @@
 	"cli.out.header.status": "Status",
 	"cli.out.header.table": "Table",
 	"cli.out.header.type": "Type",
+	"cli.out.header.upgrade": "Upgradeable",
 	"cli.out.header.value": "Value",
 	"cli.out.header.version": "Version",
 	"cli.out.help.commandHelpRead": "Run 'succapp {0} <command> --help' to read about a specific command.",
@@ -640,11 +743,13 @@
 	"cli.err.context.exampleUrl": "pass <url>",
 	"cli.err.context.text": "set {envName}",
 	"cli.err.context.workspaceRemoteAdd": "succapp workspace remote add <url>",
+	"cli.err.context.sourceListPair": "{first} or {second}",
+	"cli.err.context.sourceListMany": "{head}, or {tail}",
+	"cli.err.context.sourceListSeparator": ", ",
 	"cli.input.accessKeyId": "access key id",
 	"cli.input.accessKeySecret": "access key secret",
 	"cli.input.activeServer": "active server",
 	"cli.input.contentSource": "content source",
-	"cli.input.credentialType": "credential type",
 	"cli.input.dataSourceConfig": "data source config",
 	"cli.input.exportTarget": "export target",
 	"cli.input.extensionName": "extension name",
@@ -657,6 +762,8 @@
 	"cli.input.projectName": "project name",
 	"cli.input.server": "server",
 	"cli.input.serverFilePath": "server file path",
+	"cli.input.settingsPatch": "settings patch",
+	"cli.input.settingsTarget": "settings target",
 	"cli.input.sql": "SQL",
 	"cli.input.token": "token",
 	"cli.input.user": "user",
@@ -664,10 +771,9 @@
 	"cli.input.workspace": "workspace",
 	"cli.input.workspaceConfig": "workspace config",
 	"cli.input.revisionOrForce": "revision or --force",
-	"vs.cmd.config.apply.applied": "SuccApp workspace configuration applied.",
-	"vs.cmd.config.apply.succAppExisting": "SuccApp found existing TypeScript diagnostics files. Update them with the recommended config?",
-	"vs.cmd.config.apply.update": "Update",
-	"vs.cmd.config.apply.upToDate": "SuccApp workspace configuration is already up to date.",
+	"vs.cmd.workspace.init.done": "SuccApp workspace initialized. {0} item(s) updated.",
+	"vs.cmd.workspace.init.partial": "SuccApp workspace initialized with {0} item(s) updated and {1} item(s) skipped or blocked.",
+	"vs.cmd.workspace.init.upToDate": "SuccApp workspace is already initialized.",
 	"vs.cmd.misc.copyMeta.fileHaveMeta": "This file does not have a metadata ID.",
 	"vs.cmd.misc.history.changeHaveRemote": "This change does not have a remote file history.",
 	"vs.cmd.misc.history.fileHaveRemote": "This file does not have a remote metadata record.",
@@ -720,7 +826,6 @@
 	"vs.cmd.sync.clone.clone": "Clone",
 	"vs.cmd.sync.clone.cloned": "cloned",
 	"vs.cmd.sync.clone.cloneProject": "Clone project {0}?",
-	"vs.cmd.sync.clone.cloningProjectS": "Cloning {0} project(s)...",
 	"vs.cmd.sync.clone.complete": "Clone complete: {0} project(s).",
 	"vs.cmd.sync.clone.completeOldMeta": "Clone complete: {0} project(s), {1} old metadata file(s). Upgrade before editing.",
 	"vs.cmd.sync.clone.noWorkspace": "Target workspace does not exist: {0}",
@@ -744,13 +849,11 @@
 	"vs.cmd.sync.discard.moreFiles": "... and {0} more file(s)",
 	"vs.cmd.sync.discard.overwriteFiles": "This will overwrite or delete local files:\n{0}",
 	"vs.cmd.sync.discard.overwriteWorkspaces": "This will overwrite or delete local files in these workspace(s):\n{0}",
-	"vs.cmd.sync.discard.progress": "Discarding changes...",
 	"vs.cmd.sync.discard.prompt": "Discard local changes?",
 	"vs.cmd.sync.discard.selectFiles": "Select one or more files from the Changes view.",
 	"vs.cmd.sync.pull.changePulled": "This change was not pulled.",
 	"vs.cmd.sync.pull.mayOverwriteLocal": "This may overwrite local changes:\n{0}",
 	"vs.cmd.sync.pull.moreFiles": "... and {0} more file(s)",
-	"vs.cmd.sync.pull.progress": "Pulling...",
 	"vs.cmd.sync.pull.pullServerVersion": "Pull server version for selected file(s)?",
 	"vs.cmd.sync.pull.selectFiles": "Select one or more files from the Changes view.",
 	"vs.cmd.sync.push.addedRemotely": "was added remotely",
@@ -770,7 +873,6 @@
 	"vs.cmd.sync.push.newMetaVersions": "{0} pushed metadata file(s) use newer content versions than this server. Verify compatibility.",
 	"vs.cmd.sync.push.noLocalChanges": "No local changes to push",
 	"vs.cmd.sync.push.oldMetaVersions": "{0} pushed metadata file(s) use older content versions. Upgrade is recommended.",
-	"vs.cmd.sync.push.progress": "Pushing...",
 	"vs.cmd.sync.push.pushedBlockedFailed": "{0} pushed, {1} blocked, {2} failed",
 	"vs.cmd.sync.push.pushFileS": "Push {0} file(s) to the server?",
 	"vs.cmd.sync.push.renamedOrMoved": "was renamed or moved remotely",
@@ -778,36 +880,29 @@
 	"vs.cmd.sync.push.serverHasNewer": "The server has newer changes. Return to the Changes view or command palette to pull or compare before pushing again.",
 	"vs.cmd.sync.push.showLogs": "Show Logs",
 	"vs.cmd.sync.push.successPushedFile": "Successfully pushed {0} file(s)",
-	"vs.cmd.sync.refresh.progress": "Refreshing changes...",
 	"vs.cmd.sync.removeProject.confirm": "Remove local project(s)?",
 	"vs.cmd.sync.removeProject.empty": "No local projects to remove",
 	"vs.cmd.sync.removeProject.localProjectS": "{0} local project(s) removed",
-	"vs.cmd.sync.removeProject.progress": "Removing {0} local project(s)...",
 	"vs.cmd.sync.removeProject.projectSWill": "These project(s) will be removed from workspace and local mirror only. Remote server projects will not be deleted:\n{0}",
 	"vs.cmd.sync.removeProject.select": "Select local project to remove",
 	"vs.cmd.sync.removeProject.selectProject": "Select project",
 	"vs.cmd.sync.repair.cannotRepairWorkspace": "Cannot repair workspace before connecting to the server. Connect or re-login to the server, then run Repair Workspace again.",
-	"vs.cmd.sync.repair.checking": "Checking workspace",
 	"vs.cmd.sync.repair.complete": "Workspace repair complete: {0} issue(s) repaired.",
 	"vs.cmd.sync.repair.completeClean": "Workspace repair complete: no changes needed.",
-	"vs.cmd.sync.repair.fetched": "Workspace repair fetched from the current server, but local baselines are still missing. See logs for details.",
+	"vs.cmd.sync.repair.fetched": "Workspace repair fetched from the current server, but local sync baselines are still incomplete. See logs for details.",
 	"vs.cmd.sync.repair.finished": "Workspace repair finished: {0} repaired, {1} unresolved. See logs for details.",
 	"vs.cmd.sync.repair.ifServerConnected": "If the server is not connected, connect or re-login first, then repair again.",
 	"vs.cmd.sync.repair.moreFiles": "...and {0} more issue(s).",
-	"vs.cmd.sync.repair.progress": "Repairing workspace",
-	"vs.cmd.sync.repair.repairRefreshesLocal": "Current repair only refreshes local mirror baselines and does not overwrite workspace files.",
+	"vs.cmd.sync.repair.repairRefreshesLocal": "Current repair only refreshes local sync baselines and does not overwrite workspace files.",
 	"vs.cmd.sync.repair.repairWorkspace": "Repair Workspace",
 	"vs.cmd.sync.repair.repairWorkspaceIssue": "Repair {0} workspace issue(s)?",
 	"vs.cmd.sync.repair.showLogs": "Show Logs",
-	"vs.cmd.sync.repair.workspaceFsckComplete": "Workspace fsck complete: no problems found.",
-	"vs.cmd.sync.repair.workspaceFsckIssue": "Workspace fsck found {0} issue(s). See logs for details.",
+	"vs.cmd.sync.repair.workspaceCheckComplete": "Workspace repair check complete: no problems found.",
 	"vs.cmd.sync.resetProject.confirm": "Reset local project from server?",
 	"vs.cmd.sync.resetProject.empty": "No local projects to reset",
 	"vs.cmd.sync.resetProject.noWorkspace": "Target workspace does not exist: {0}",
 	"vs.cmd.sync.resetProject.overwriteDetail": "All local changes in these project(s) will be overwritten, and local files that do not exist on the server may be deleted:\n{0}",
-	"vs.cmd.sync.resetProject.progress": "Resetting {0} project(s)...",
 	"vs.cmd.sync.resetProject.resetProject": "Reset Project",
-	"vs.cmd.sync.upgradeMeta.action": "Upgrade metadata",
 	"vs.cmd.sync.upgradeMeta.done": "Metadata upgraded in the local workspace. Remote server data was not changed.",
 	"vs.cmd.sync.upgradeMeta.empty": "No upgradeable metadata files found.",
 	"vs.cmd.sync.upgradeMeta.failed": "Metadata upgrade failed: {0}",
@@ -818,12 +913,10 @@
 	"vs.cmd.sync.upgradeMeta.metaUpDate": "Metadata is already up to date.",
 	"vs.cmd.sync.upgradeMeta.noFile": "No active file to upgrade.",
 	"vs.cmd.sync.upgradeMeta.result": "Metadata upgrade finished: {0} changed, {1} checked.",
-	"vs.cmd.sync.upgradeMeta.scan": "Scan metadata files",
 	"vs.cmd.sync.upgradeMeta.upgrade": "Upgrade",
 	"vs.cmd.sync.upgradeMeta.upgradeMetaFile": "Upgrade {0} metadata file(s) under this folder?",
 	"vs.cmd.ext.create.cannotCreateExt": "Cannot create an extension because the sysdata project is not cloned in this workspace.",
 	"vs.cmd.ext.create.createdExt": "Created extension {0}.",
-	"vs.cmd.ext.create.creatingExt": "Creating extension {0}",
 	"vs.cmd.ext.create.dirNamedSame": "A directory named the same already exists under sysdata/extensions/.",
 	"vs.cmd.ext.create.enterNewExt": "Enter the New Extension Name",
 	"vs.cmd.ext.create.extNameMust": "Extension name must follow the pattern {0}.",
@@ -840,7 +933,6 @@
 	"vs.cmd.ext.push.pickExtDir": "Pick the extension directory to push to the server",
 	"vs.cmd.ext.push.pushExtComplete": "Push extension complete: {0} pushed.",
 	"vs.cmd.ext.push.pushExtFinished": "Push extension finished with issues: {0} pushed, {1} rejected, {2} failed.",
-	"vs.cmd.ext.push.pushingExt": "Pushing extension {0}",
 	"vs.cmd.ext.push.selectExtPush": "Select Extension to Push",
 	"vs.view.changes.backup": "No backup found for {0}",
 	"vs.view.changes.localAdded": "Local added",
@@ -857,7 +949,6 @@
 	"vs.view.changes.openFile": "Open File",
 	"vs.view.changes.path": "Path: {0}",
 	"vs.view.changes.previousPath": "Previous path: {0}",
-	"vs.view.changes.refreshingChanges": "Refreshing changes...",
 	"vs.view.changes.remoteAdded": "Remote added",
 	"vs.view.changes.remoteChanges": "Remote Changes",
 	"vs.view.changes.remoteDeleted": "Remote deleted",
@@ -907,7 +998,15 @@
 	"vs.ui.error.showLogs": "Show Logs",
 	"vs.ui.error.unknownErrorOccurred": "An unknown error occurred",
 	"vs.ui.login.login": "Login to {0}",
+	"vs.ui.login.method": "Choose a login method",
+	"vs.ui.login.oauth": "OAuth2",
+	"vs.ui.login.oauthDesc": "Open the browser and authorize SuccApp.",
+	"vs.ui.login.openingBrowser": "Opening browser",
+	"vs.ui.login.waitingForCallback": "Waiting for authorization",
+	"vs.ui.login.exchangingToken": "Signing in",
+	"vs.ui.login.oauthManualUrl": "Open this URL in your browser: {0}",
 	"vs.ui.login.pat": "Personal Access Token",
+	"vs.ui.login.patDesc": "Paste a PAT manually.",
 	"vs.ui.login.patRequired": "Enter a Personal Access Token.",
 	"vs.ui.remote.remoteServerFiles": "Remote server files are read-only in the Servers view. Use sync commands to edit local workspace files.",
 	"vs.ui.status.clickReconnectOr": "Click to reconnect or switch servers",
@@ -929,59 +1028,58 @@
 	"vs.ui.workspaceProblem.staleBaseline": "SuccApp detected a stale local sync baseline. See logs for details before changing the workspace.",
 	"vs.ui.workspaceProblem.syncProblem": "SuccApp detected a workspace sync problem. See logs for details.",
 	"vs.cmd.title.addServer": "Add Server",
-	"vs.cmd.title.switchServer": "Switch Server",
-	"vs.cmd.title.relogin": "Re-login",
+	"vs.cmd.title.useServer": "Use Server",
+	"vs.cmd.title.loginServer": "Login Server",
 	"vs.cmd.title.disconnectServer": "Disconnect Server",
 	"vs.cmd.title.removeServer": "Remove Server",
-	"vs.cmd.title.changeServerUrl": "Change Server URL",
+	"vs.cmd.title.setServerUrl": "Set Server URL",
 	"vs.cmd.title.openServerConfig": "Open Server Config",
 	"vs.cmd.title.cloneProject": "Clone Project",
-	"vs.cmd.title.removeProject": "Remove Local Project",
+	"vs.cmd.title.removeLocalProject": "Remove Local Project",
 	"vs.cmd.title.pullChanges": "Pull Changes",
 	"vs.cmd.title.pushChanges": "Push Changes",
 	"vs.cmd.title.pushCurrentFile": "Push Current File",
-	"vs.cmd.title.meta.upgradeFile": "Upgrade Metadata File",
-	"vs.cmd.title.refreshSyncStatus": "Rescan Sync Changes",
-	"vs.cmd.title.workspace.fsck": "Workspace Fsck",
-	"vs.cmd.title.workspace.repair": "Workspace Repair",
+	"vs.cmd.title.upgradeFile": "Upgrade File",
+	"vs.cmd.title.refreshChanges": "Refresh Changes",
+	"vs.cmd.title.repairWorkspace": "Repair Workspace",
 	"vs.cmd.title.enableAutoPush": "Enable Auto Push",
 	"vs.cmd.title.disableAutoPush": "Disable Auto Push",
-	"vs.cmd.title.diffWithRemote": "Compare with Server",
+	"vs.cmd.title.compareFileWithServer": "Compare File with Server",
 	"vs.cmd.title.configureSyncIgnore": "Configure Sync Ignore Rules",
-	"vs.cmd.title.applyWorkspaceConfiguration": "Apply Workspace Configuration",
+	"vs.cmd.title.initWorkspace": "Initialize Workspace",
 	"vs.cmd.title.showLogs": "Show Logs",
 	"vs.cmd.title.createExtension": "Create Extension from Template",
-	"vs.cmd.title.pushExtension": "Push Extension to Server",
-	"vs.cmd.title.pushFile": "Push to Server",
-	"vs.cmd.title.pullFile": "Pull from Server",
-	"vs.cmd.title.discardChanges": "Discard Local Changes",
-	"vs.cmd.title.copyMetaPath": "Copy Metadata Path",
-	"vs.cmd.title.copyMetaId": "Copy Metadata ID",
-	"vs.cmd.title.openRemoteView": "Open Server Page",
-	"vs.cmd.title.openRemoteEdit": "Open Server Edit Page",
+	"vs.cmd.title.pushExtension": "Push Extension",
+	"vs.cmd.title.pushFile": "Push File",
+	"vs.cmd.title.pullFile": "Pull File",
+	"vs.cmd.title.discardChanges": "Discard Changes",
+	"vs.cmd.title.copyMetaPath": "Copy Meta Path",
+	"vs.cmd.title.copyMetaId": "Copy Meta ID",
+	"vs.cmd.title.openServerViews": "Open Server Views",
+	"vs.cmd.title.openServerEditPage": "Open Server Edit Page",
 	"vs.cmd.title.views.refreshServers": "Refresh Servers",
 	"vs.cmd.title.views.refreshChanges": "Refresh Changes",
 	"vs.cmd.title.views.pushChanges": "Push Changes",
 	"vs.cmd.title.views.pullChanges": "Pull Changes",
-	"vs.cmd.title.views.discardChanges": "Discard Local Changes",
+	"vs.cmd.title.views.discardChanges": "Discard Changes",
 	"vs.cmd.title.views.toggleChangesViewMode": "Toggle Tree/List View",
 	"vs.cmd.title.views.connectServer": "Connect Server",
 	"vs.cmd.title.views.removeServer": "Remove Server",
-	"vs.cmd.title.views.changeServerUrl": "Change Server URL",
+	"vs.cmd.title.views.setServerUrl": "Set Server URL",
 	"vs.cmd.title.views.cloneProject": "Clone Project",
-	"vs.cmd.title.views.openRemoteFile": "Open Server Source",
-	"vs.cmd.title.views.loadFileHistory": "Load File History",
-	"vs.cmd.title.views.refreshFileHistory": "Refresh File History",
+	"vs.cmd.title.views.openServerSource": "Open Server Source",
+	"vs.cmd.title.views.loadServerFileHistory": "Load Server File History",
+	"vs.cmd.title.views.refreshServerFileHistory": "Refresh Server File History",
 	"vs.cmd.title.views.compareHistoryWithPrevious": "Compare with Previous Version",
 	"vs.cmd.title.views.compareHistoryWithWorkspace": "Compare with Workspace",
-	"vs.cmd.title.views.diffChange": "Open File",
-	"vs.cmd.title.views.pushChange": "Push to Server",
-	"vs.cmd.title.views.pullChange": "Pull from Server",
-	"vs.cmd.title.views.discardChange": "Discard Local Changes",
+	"vs.cmd.title.views.compareFileWithServer": "Compare File with Server",
+	"vs.cmd.title.views.pushFile": "Push File",
+	"vs.cmd.title.views.pullFile": "Pull File",
+	"vs.cmd.title.views.discardChange": "Discard Change",
 	"vs.cmd.title.views.mergeChange": "Merge Changes",
-	"vs.cmd.title.views.acceptRemoteChange": "Use Server Version",
+	"vs.cmd.title.views.acceptServerChange": "Use Server Version",
 	"vs.cmd.title.views.restoreLocalChange": "Restore Local Version",
 	"vs.cmd.title.openServerSource": "Open Server Source",
-	"vs.cmd.title.showServerHistory": "Show Server History",
+	"vs.cmd.title.showServerFileHistory": "Show Server File History",
 	"vs.cmd.title.views.resetProjectFromServer": "Reset Local Project from Server"
 }