@hubspot/cli 7.0.0-experimental.0 → 7.0.0-experimental.1

package/lang/en.lyaml

@@ -7,14 +7,8 @@ en:
         cliUpdateNotification: "HubSpot CLI version {{#cyan}}{{#bold}}{currentVersion}{{/bold}}{{/cyan}} is outdated.\nRun {{ updateCommand }} to upgrade to version {{#cyan}}{{#bold}}{latestVersion}{{/bold}}{{/cyan}}"
       srcIsProject: "\"{{ src }}\" is in a project folder. Did you mean \"hs project {{command}}\"?"
       setDefaultAccountMoved: "This command has moved. Try `hs accounts use` instead"
-      loadConfigMiddleware:
-        configFileExists: "A configuration file already exists at {{ configPath }}. To specify a new configuration file, delete the existing one and try again."
-    completion:
-      describe: "Enable bash completion shortcuts for commands. Concat the generated script to your .bashrc, .bash_profile, or .zshrc file."
-      examples:
-        default: "Generate shell completion scripts for the zsh shell"
-    account:
-      describe: "Commands for managing configured accounts."
+    accounts:
+      describe: "Commands for working with accounts."
       subcommands:
         list:
           accounts: "{{#bold}}Accounts{{/bold}}:"
@@ -26,7 +20,7 @@ en:
             authType: "Auth Type"
             name: "Name"
         rename:
-          describe: "Rename an account in the config."
+          describe: "Rename account in config."
           positionals:
             accountName:
               describe: "Name of account to be renamed."
@@ -67,7 +61,7 @@ en:
             accountRemoved: "Account \"{{ accountName }}\" removed from the config"
         info:
           accountId: "{{#bold}}Account ID{{/bold}}: {{ accountId }}"
-          describe: "Print information about the default account, or about the account specified with the \"account\" option."
+          describe: "Print information about the default account, or about the account specified with the \"--account\" option."
           errors:
             notUsingPersonalAccessKey: "This command currently only supports fetching scopes for the personal access key auth type."
           examples:
@@ -77,7 +71,7 @@ en:
           name: "{{#bold}}Account name{{/bold}}: {{ name }}"
           scopeGroups: "{{#bold}}Scopes available{{/bold}}:"
         clean:
-          describe: "Check for inactive accounts and removes them from the CLI config."
+          describe: "Checks for inactive accounts and removes them from the CLI config"
           noResults: "No inactive accounts found to remove."
           loading:
             add: "Looking for inactive accounts…"
@@ -93,27 +87,28 @@ en:
       errors:
         noConfigFileFound: "No config file was found. To create a new config file, use the \"hs init\" command."
         unsupportedAuthType: "Unsupported auth type: {{ type }}. The only supported authentication protocols are {{ supportedProtocols }}."
-      options:
-        authType:
+      positionals:
+        type:
           describe: "Authentication mechanism"
-          defaultDescription: "\"{{ authMethod }}\": An access token tied to a specific user account. This is the recommended way of authenticating with local development tools."
+          defaultDescription: "\"{{ authMethod }}\": \nAn access token tied to a specific user account. This is the recommended way of authenticating with local development tools."
+      options:
         account:
           describe: "HubSpot account to authenticate"
       success:
         configFileUpdated: "Account \"{{ accountName }}\" updated in {{ configFilename }} using \"{{ authType }}\""
     config:
-      describe: "Commands for managing the CLI config file."
+      describe: "Commands for working with the config file."
       subcommands:
         set:
-          describe: "Set various configuration options within the hubspot.config.yml file."
+          describe: "Commands for modifying the CLI configuration"
           promptMessage: "Select a config option to update"
           examples:
             default: "Opens a prompt to select a config item to modify"
           options:
             defaultMode:
-              describe: "Set the default CMS publish mode"
-              promptMessage: "Select CMS publish mode to be used as the default"
-              error: "The CMS publish mode \"{{ mode }}\" is invalid. Valid values are {{ validModes }}."
+              describe: "Set the default mode"
+              promptMessage: "Select mode to be used as the default"
+              error: "The mode \"{{ mode }}\" is invalid. Valid values are {{ validModes }}."
               success: "Default mode updated to: {{ mode }}"
             allowUsageTracking:
               describe: "Enable or disable usage tracking"
@@ -155,10 +150,9 @@ en:
               describe: "Medium to test against"
             verbose:
               describe: "View a detailed output of the lighthouse sores"
-        getReactModule:
-          describe: "Get a specified default React module."
-          selectModulePrompt: "Select a React module to download"
-          positionals:
+        reactModule:
+          describe: "Get a specified default React module"
+          options:
             name:
               describe: "Name of the react modules to be fetched"
             dest:
@@ -168,6 +162,7 @@ en:
           errors:
             pathExists: "Folder already exists at \"{{ path }}\""
             invalidName: "Module not found with that name, please check the spelling of the module you are trying to download."
+          groupLabel: "React modules available to download:"
     create:
       describe: "Create HubSpot sample apps and CMS assets. Supported assets are {{ supportedAssetTypes }}."
       errors:
@@ -199,38 +194,35 @@ en:
             nameRequired: "The \"name\" argument is required when creating a Template."
     customObject:
       betaMessage: "The Custom Object CLI is currently in beta and is subject to change."
-      describe: "Commands for managing custom objects."
+      describe: "Manage Custom Objects. This feature is currently in beta and the CLI contract is subject to change."
       seeMoreLink: "View our docs to find out more."
       subcommands:
         create:
-          describe: "Create custom object instances."
+          describe: "Create custom object instances"
           errors:
             creationFailed: "Object creation from {{ definition }} failed"
-          options:
-            path:
-              describe: "Local path to the JSON file containing an array of object definitions"
           positionals:
+            definition:
+              describe: "Local path to the JSON file containing an array of object definitions"
             name:
               describe: "Schema name to add the object instance to"
           success:
             objectsCreated: "Objects created"
-          inputSchema: "What would you like to name the schema?"
-          inputPath: "[--path] Where is the JSON file containing the object definitions?"
         schema:
-          describe: "Commands for managing custom object schemas."
+          describe: "Manage custom object schemas"
           subcommands:
             create:
-              describe: "Create a custom object schema."
+              describe: "Create a custom object schema"
               errors:
                 creationFailed: "Schema creation from {{ definition }} failed"
-              options:
+              positionals:
                 definition:
                   describe: "Local path to the JSON file containing the schema definition"
               success:
                 schemaCreated: "Your schema has been created in account \"{{ accountId }}\""
                 schemaViewable: "Schema can be viewed at {{ url }}"
             delete:
-              describe: "Delete a custom object schema."
+              describe: "Delete a custom object schema"
               errors:
                 delete: "Unable to delete {{ name }}"
               examples:
@@ -238,16 +230,10 @@ en:
               positionals:
                 name:
                   describe: "Name of the target schema"
-              options:
-                force:
-                  describe: "Force the deletion of the schema."
               success:
                 delete: "Successfully initiated deletion of {{ name }}"
-              confirmDelete: "Are you sure you want to delete the schema \"{{ name }}\"?"
-              deleteCancelled: "Deletion of schema \"{{ name }}\" cancelled."
-              selectSchema: "Which schema would you like to delete?"
             fetchAll:
-              describe: "Fetch all custom object schemas for an account."
+              describe: "Fetch all custom object schemas for an account"
               errors:
                 fetch: "Unable to fetch schemas"
               examples:
@@ -258,9 +244,8 @@ en:
                   describe: "Local folder where schemas will be written"
               success:
                 fetch: "Saved schemas to {{ path }}"
-              inputDest: "Where would you like to save the schemas?"
             fetch:
-              describe: "Fetch a custom object schema."
+              describe: "Fetch a custom object schema"
               errors:
                 fetch: "Unable to fetch {{ name }}"
               examples:
@@ -271,29 +256,25 @@ en:
                   describe: "Local folder where schema will be written"
                 name:
                   describe: "Name of the target schema"
-              selectSchema: "Which schema would you like to fetch?"
-              inputDest: "What would you like to name the destination file?"
               success:
                 save: "The schema \"{{ name }}\" has been saved to \"{{ path }}\""
                 savedToPath: "Saved schema to {{ path }}"
             list:
-              describe: "List custom object schemas."
+              describe: "List schemas available on your account"
               errors:
                 list: "Unable to list schemas"
             update:
-              describe: "Update an existing custom object schema."
+              describe: "Update an existing custom object schema"
               errors:
                 update: "Schema update from {{ definition }} failed"
-              options:
-                path:
-                  describe: "Local path to the JSON file containing the schema definition"
               positionals:
+                definition:
+                  describe: "Local path to the JSON file containing the schema definition"
                 name:
                   describe: "Name of the target schema"
               success:
                 update: "Your schema has been updated in account \"{{ accountId }}\""
                 viewAtUrl: "Schema can be viewed at {{ url }}"
-              selectSchema: "Which schema would you like to update?"
     doctor:
       describe: "Retrieve diagnostic information about your local HubSpot configurations."
       options:
@@ -317,10 +298,10 @@ en:
         src:
           describe: "Path in HubSpot Design Tools"
     filemanager:
-      describe: "Commands for managing files in the File Manager."
+      describe: "Commands for working with the File Manager."
       subcommands:
         fetch:
-          describe: "Fetch a folder or file from the File Manager."
+          describe: "Download a folder or file from the HubSpot File Manager to your computer"
           errors:
             sourceRequired: "A source to fetch is required."
           options:
@@ -332,7 +313,7 @@ en:
             src:
               describe: "Path to the local directory you would like the files to be placed, relative to your current working directory. If omitted, this argument will default to your current working directory"
         upload:
-          describe: "Upload a folder or file to the File Manager."
+          describe: "Upload a folder or file from your computer to the HubSpot File Manager"
           errors:
             destinationRequired: "A destination path needs to be passed"
             fileIgnored: "The file \"{{ path }}\" is being ignored via an .hsignore rule"
@@ -349,8 +330,8 @@ en:
           success:
             upload: "Uploaded file from \"{{ src }}\" to \"{{ dest }}\" in the File Manager of account {{ accountId }}"
             uploadComplete: "Uploading files to \"{{ dest }}\" in the File Manager is complete"
-    function:
-      describe: "Commands for managing CMS serverless functions."
+    functions:
+      describe: "Commands for working with functions."
       subcommands:
         deploy:
           debug:
@@ -365,13 +346,13 @@ en:
           loadingFailed: "Failed to build and deploy bundle for \"{{ functionPath }}\" on {{ account }}"
           positionals:
             path:
-              describe: "Path to the \".functions\" folder"
+              describe: "Path to .functions folder"
           success:
             deployed: "Built and deployed bundle from package.json for {{ functionPath }} on account {{ accountId }} in {{ buildTimeSeconds }}s."
         list:
           debug:
             gettingFunctions: "Getting currently deployed functions"
-          describe: "List the currently deployed CMS serverless functions."
+          describe: "List currently deployed functions"
           info:
             noFunctions: "No functions found"
           options:
@@ -395,10 +376,10 @@ en:
             path:
               describe: "Path to local .functions folder"
     hubdb:
-      describe: "Commands for managing HubDB tables."
+      describe: "Manage HubDB tables."
       subcommands:
         clear:
-          describe: "Clear all rows in a HubDB table."
+          describe: "Clear all rows in a HubDB table"
           logs:
             removedRows: "Removed {{ deletedRowCount }} rows from HubDB table {{ tableId }}"
             rowCount: "HubDB table {{ tableId }} now contains {{ rowCount }} rows"
@@ -407,32 +388,25 @@ en:
             tableId:
               describe: "HubDB Table ID"
         create:
-          describe: "Create a HubDB table."
-          enterPath: "[--path] Enter the local path to the file used for import:"
+          describe: "Create a HubDB table"
           errors:
-            create: "Creating the table at \"{{ filePath }}\" failed"
-            pathRequired: "A path to a local file with a HubDB schema is required to create a HubDB table"
-            invalidCharacters: "The selected file path contains invalid characters. Please provide a new path and try again."
-          options:
-            path:
+            create: "Creating the table at \"{{ src }}\" failed"
+          positionals:
+            src:
               describe: "Local path to file used for import"
           success:
             create: "The table {{ tableId }} was created in {{ accountId }} with {{ rowCount }} rows"
         delete:
-          describe: "Delete a HubDB table."
-          shouldDeleteTable: "Proceed with deleting HubDB table {{ tableId }}?"
+          describe: "Delete a HubDB table"
           errors:
             delete: "Deleting the table {{ tableId }} failed"
           positionals:
             tableId:
               describe: "HubDB Table ID"
-          options:
-            force:
-              describe: "Skips confirmation prompt when deleting a HubDB table"
           success:
             delete: "The table {{ tableId }} was deleted from {{ accountId }}"
         fetch:
-          describe: "Fetch the schema for a HubDB table."
+          describe: "Fetch a HubDB table"
           positionals:
             dest:
               describe: "Local destination folder to fetch table to"
@@ -443,13 +417,11 @@ en:
     init:
       describe: "Initialize {{ configName }} for a HubSpot account."
       options:
-        authType:
-          describe: "Authentication mechanism"
-          defaultDescription: "\"{{ authMethod }}\":  An access token tied to a specific user account. This is the recommended way of authenticating with local development tools."
+        auth:
+          describe: "Specify auth method to use [\"personalaccesskey\", \"oauth2\"]"
+          defaultDescription: "\"{{ defaultType }}\": \nAn access token tied to a specific user account. This is the recommended way of authenticating with local development tools."
         account:
           describe: "HubSpot account to authenticate"
-        useHiddenConfig:
-          describe: "Use the new HubSpot configuration file located in a hidden file in the user's home directory"
       success:
         configFileCreated: "Created config file \"{{ configPath }}\""
         configFileUpdated: "Connected account \"{{ account }}\" using \"{{ authType }}\" and set it as the default account"
@@ -457,7 +429,6 @@ en:
         updateConfig: "To update an existing config file, use the \"hs auth\" command."
       errors:
         configFileExists: "The config file {{ configPath }} already exists."
-        bothConfigFilesNotAllowed: "Unable to create config file, because there is an existing one at \"{{ path }}\". To create a new config file, delete the existing one and try again."
     lint:
       issuesFound: "{{ count }} issues found."
       groupName: "Linting {{ path }}"
@@ -472,14 +443,13 @@ en:
         path:
           describe: "Remote directory to list contents"
     logs:
-      describe: "View logs for a CMS serverless function."
+      describe: "Get logs for a function."
       errors:
         noLogsFound: "No logs were found for the function path \"{{ functionPath }}\" in account \"{{ accountId }}\"."
       examples:
         default: "Get 5 most recent logs for function residing at /_hcms/api/my-endpoint"
         follow: "Poll for and output logs for function residing at /_hcms/api/my-endpoint immediately upon new execution"
         limit: "Get 10 most recent logs for function residing at /_hcms/api/my-endpoint"
-      endpointPrompt: "Enter a serverless function endpoint:"
       gettingLogs: "Getting {{#if latest}}latest {{/if}}logs for function with path: {{ functionPath }}."
       options:
         compact:
@@ -501,7 +471,7 @@ en:
         moveFailed: "Moving \"{{ srcPath }}\" to \"{{ destPath }}\" in account {{ accountId }} failed"
       move: "Moved \"{{ srcPath }}\" to \"{{ destPath }}\" in account {{ accountId }}"
     open:
-      describe: "Open a HubSpot page in your browser."
+      describe: "Open a HubSpot page in your browser. Run \"hs open list\" to see all available shortcuts."
       options:
         list:
           describe: "List all supported shortcuts"
@@ -510,10 +480,10 @@ en:
           describe: "Shortcut of the link you'd like to open"
       selectLink: "Select a link to open"
     project:
-      describe: "Commands for managing projects. For more information, visit our documentation: https://developers.hubspot.com/docs/platform/build-and-deploy-using-hubspot-projects"
+      describe: "Commands for working with projects. For more information, visit our documentation: https://developers.hubspot.com/docs/platform/build-and-deploy-using-hubspot-projects"
       subcommands:
         dev:
-          describe: "Start local dev for the current project."
+          describe: "Start local dev for the current project"
           logs:
             betaMessage: "HubSpot projects local development"
             placeholderAccountSelection: "Using default account as target account (for now)"
@@ -525,14 +495,14 @@ en:
           examples:
             default: "Start local dev for the current project"
         create:
-          describe: "Create a new project."
+          describe: "Create a new project"
           logs:
             welcomeMessage: "Welcome to HubSpot Developer Projects!"
           examples:
             default: "Create a new project"
           options:
-            dest:
-              describe: "Directory where the project should be created"
+            location:
+              describe: "Directory where project should be created"
             name:
               describe: "Project name (cannot be changed)"
             template:
@@ -540,14 +510,14 @@ en:
             templateSource:
               describe: "Path to custom GitHub repository from which to create project template"
         migrateApp:
-          describe: "Migrate a public app to the projects framework."
+          describe: "Migrate a public app to the projects framework"
           examples:
             default: "Migrate a public app to the projects framework"
           options:
             appId:
               describe: "The ID for the public app being migrated to the projects framework"
-            dest:
-              describe: "Directory where the project should be created"
+            location:
+              describe: "Directory where project should be created"
             name:
               describe: "Project name (cannot be changed)"
           header:
@@ -574,25 +544,25 @@ en:
             projectAlreadyExists: "A project with name {{ projectName }} already exists. Please choose another name."
             invalidApp: "Could not migrate appId {{ appId }}. This app cannot be migrated at this time. Please choose another public app."
         cloneApp:
-          describe: "Clone a public app using the projects framework."
+          describe: "Clone a public app using the projects framework"
           examples:
             default: "Clone a public app using the projects framework"
           options:
             appId:
               describe: "The ID for the public app being cloned"
-            dest:
-              describe: "Directory where the project should be created"
+            location:
+              describe: "Directory where project should be created"
           cloneStatus:
             inProgress: "Cloning app configuration to {{#bold}}public-app.json{{/bold}} component definition ..."
             done: "Cloning app configuration to public-app.json component definition ... DONE"
-            success: "Your cloned project was created in {{ dest }}"
+            success: "Your cloned project was created in {{ location }}"
             failure: "Cloning app configuration to public-app.json component definition ... FAILED"
           errors:
             invalidAccountTypeTitle: "{{#bold}}Developer account not targeted{{/bold}}"
             invalidAccountTypeDescription: "Only public apps created in a developer account can be converted to a project component. Select a connected developer account with {{useCommand}} or {{authCommand}} and try again."
             couldNotWriteConfigPath: "Failed to write project config at {{ configPath }}"
         add:
-          describe: "Create a new component within a project."
+          describe: "Create a new component within a project"
           options:
             name:
               describe: "The name for your newly created component"
@@ -608,7 +578,7 @@ en:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
         deploy:
-          describe: "Deploy a project build."
+          describe: "Deploy a project build"
           deployBuildIdPrompt: "[--build] Deploy which build?"
           debug:
             deploying: "Deploying project at path: {{ path }}"
@@ -629,23 +599,9 @@ en:
             project:
               describe: "Project name"
         listBuilds:
-          describe: "List the project's builds."
-          continueOrExitPrompt: "Press <enter> to load more, or ctrl+c to exit"
-          viewAllBuildsLink: "View all builds"
-          showingNextBuilds: "Showing the next {{ count }} builds for {{ projectName }}"
-          showingRecentBuilds: "Showing the most {{ count }} recent builds for {{ projectName }}. {{ viewAllBuildsLink }}."
-          errors:
-            noBuilds: "No builds for this project were found."
-            projectNotFound: "Project {{ projectName}} not found."
-          options:
-            project:
-              describe: "Project name"
-            limit:
-              describe: "Limit the number of builds to output"
-          examples:
-            default: "List the builds for the current project"
+          describe: "List the project's builds"
         logs:
-          describe: "Get execution logs for a serverless function within a project."
+          describe: "Get execution logs for a serverless function within a project"
           errors:
             noProjectConfig: "No project detected. Run this command again from a project directory."
             failedToFetchProjectDetails: "There was an error fetching project details"
@@ -678,9 +634,9 @@ en:
             function:
               describe: "App function name"
         upload:
-          describe: "Upload your project files and create a new build."
+          describe: "Upload your project files and create a new build"
           examples:
-            default: "Upload a project into your HubSpot account"
+            default: "Upload a project"
           logs:
             buildSucceeded: "Build #{{ buildId }} succeeded\n"
             readyToGoLive: "🚀 Ready to take your project live?"
@@ -693,10 +649,13 @@ en:
               describe: "Automatically create project if it does not exist"
             message:
               describe: "Add a message when you upload your project and create a build"
+          positionals:
+            path:
+              describe: "Path to a project folder"
         watch:
-          describe: "Watch your local project for changes and automatically upload changed files to a new build in HubSpot."
+          describe: "Watch your local project for changes and automatically upload changed files to a new build in HubSpot"
           examples:
-            default: "Start watching the current project"
+            default: "Watch a project within the myProjectFolder folder"
           logs:
             processExited: "Stopping watcher..."
             watchCancelledFromUi: "The watch process has been cancelled from the UI. Any changes made since cancelling have not been uploaded. To resume watching, rerun {{#yellow}}`hs project watch`{{/yellow}}."
@@ -706,6 +665,9 @@ en:
             deleteFolderSucceeded: "Deleted folder \"{{ remotePath }}\""
             watching: "Watcher is ready and watching \"{{ projectDir }}\". Any changes detected will be automatically uploaded."
             previousStagingBuildCancelled: "Killed the previous watch process. Please try running `hs project watch` again"
+          positionals:
+            path:
+              describe: "Path to a project folder"
           options:
             initialUpload:
               describe: "Upload directory before watching for updates"
@@ -722,7 +684,7 @@ en:
             deleteFileFailed: "Failed to delete file \"{{ remotePath }}\""
             deleteFolderFailed: "Failed to delete folder \"{{ remotePath }}\""
         download:
-          describe: "Download your project files from HubSpot."
+          describe: "Download your project files from HubSpot and write to a path on your computer"
           examples:
             default: "Download the project myProject into myProjectFolder folder"
           logs:
@@ -734,14 +696,14 @@ en:
           warnings:
             cannotDownloadWithinProject: "Cancelling project download. Please run the command again outside the context of an existing project."
           options:
-            build:
-              describe: "The build to download"
+            buildNumber:
+              describe: "The build number to download"
             project:
               describe: "The name of the project to download"
             dest:
               describe: "Destination folder for the project"
         open:
-          describe: "Open the project's details page in the browser."
+          describe: "Open the specified project's details page in the browser"
           options:
             project:
               describe: "Name of project to open"
@@ -749,7 +711,7 @@ en:
             default: "Opens the projects page for the specified account"
           success: "Successfully opened \"{{ projectName }}\""
         feedback:
-          describe: "Leave feedback on HubSpot projects or file a bug report."
+          describe: "Leave feedback on HubSpot projects or file a bug report"
           feedbackType:
             prompt: "What type of feedback would you like to leave?"
             bug: "[--bug] Report a bug"
@@ -763,7 +725,7 @@ en:
               describe: "Open Github issues in your browser to give feedback."
         installDeps:
           help:
-            describe: "Install the dependencies for your project, or add a dependency to a subcomponent of a project."
+            describe: "Install the dependencies for your project, or add a dependency to a subcomponent of a project"
             installAppDepsExample: "Install the dependencies for the project"
             addDepToSubComponentExample: "Install the dependencies to one or more project subcomponents"
           installLocationPrompt: "Choose the project components to install the dependencies:"
@@ -784,19 +746,18 @@ en:
         path:
           describe: "Remote hubspot path"
     sandbox:
-      describe: "Commands for managing sandboxes."
+      describe: "Commands for working with sandboxes."
       subcommands:
         create:
-          describe: "Create a sandbox account."
+          describe: "Create a sandbox account"
           examples:
             default: "Creates a standard sandbox account named MySandboxAccount."
+            force: "Skips all confirmation prompts when creating a sandbox account."
           debug:
             error: "Error creating sandbox:"
           info:
             auth: "Run `hs auth` to authenticate with the new sandbox account."
           options:
-            force:
-              describe: "Skips all confirmation prompts when creating a sandbox account."
             name:
               describe: "Name to use for created sandbox"
             type:
@@ -809,12 +770,13 @@ en:
               \n- Run {{#bold}}hs accounts use{{/bold}} to switch to your default account to your production account.
               \n- Run {{#bold}}hs auth{{/bold}} to connect a production account to the HubSpot CLI.\n"
         delete:
-          describe: "Delete a sandbox account."
+          describe: "Delete a sandbox account"
           debug:
             deleting: "Deleting sandbox account \"{{ account }}\""
             error: "Error deleting sandbox account:"
           examples:
             default: "Deletes the sandbox account named MySandboxAccount."
+            force: "Skips all confirmation prompts when deleting a sandbox account."
           confirm: "Delete sandbox {{#bold}}{{ account }}{{/bold}}? All data for this sandbox will be permanently deleted."
           defaultAccountWarning: "The sandbox {{#bold}}{{ account }}{{/bold}} is currently set as the default account."
           success:
@@ -830,47 +792,38 @@ en:
             noParentPortalAvailable: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{#bold}}{{ command }}{{/bold}}. You can also delete the sandbox from the HubSpot management tool: {{#bold}}{{ url }}{{/bold}}."
             invalidKey: "Your personal access key for account {{#bold}}{{ account }}{{/bold}} is inactive. To re-authenticate, please run {{#bold}}hs auth personalaccesskey{{/bold}}."
           options:
-            force:
-              describe: "Skips all confirmation prompts when deleting a sandbox account."
             account:
               describe: "Account name or id to delete"
-    secret:
-      describe: "Commands for managing secrets."
+    secrets:
+      describe: "Manage HubSpot secrets."
       subcommands:
         add:
-          describe: "Create a new secret."
+          describe: "Add a HubSpot secret"
           errors:
             add: "The secret \"{{ secretName }}\" was not added"
-            alreadyExists: "The secret \"{{ secretName }}\" already exists, it's value can be modified with {{ command }}"
           positionals:
             name:
               describe: "Name of the secret"
           success:
             add: "The secret \"{{ secretName }}\" was added to the HubSpot account: {{ accountIdentifier }}"
         delete:
-          describe: "Delete a secret."
-          selectSecret: "Select the secret you want to delete"
-          deleteCanceled: "Delete canceled"
-          confirmDelete: "Are you sure you want to delete the secret \"{{ secretName }}\"?"
+          describe: "Delete a HubSpot secret"
           errors:
             delete: "The secret \"{{ secretName }}\" was not deleted"
-            noSecret: "Unable to delete secret with name \"{{ secretName }}\", it does not exist"
           positionals:
             name:
               describe: "Name of the secret"
           success:
             delete: "The secret \"{{ secretName }}\" was deleted from the HubSpot account: {{ accountIdentifier }}"
         list:
-          describe: "List all secrets."
+          describe: "List all HubSpot secrets"
           errors:
             list: "The secrets could not be listed"
           groupLabel: "Secrets for account {{ accountIdentifier }}:"
         update:
-          describe: "Update an existing secret."
-          selectSecret: "Select the secret you want to update"
+          describe: "Update an existing HubSpot secret"
           errors:
             update: "The secret \"{{ secretName }}\" was not updated"
-            noSecret: "Unable to update secret with name \"{{ secretName }}\", it does not exist"
           positionals:
             name:
               describe: "Name of the secret to be updated"
@@ -878,7 +831,7 @@ en:
             update: "The secret \"{{ secretName }}\" was updated in the HubSpot account: {{ accountIdentifier }}"
             updateExplanation: "Existing serverless functions will start using this new value within 10 seconds."
     theme:
-      describe: "Commands for managing themes."
+      describe: "Commands for working with themes, including marketplace validation with the marketplace-validate subcommand."
       subcommands:
         generateSelectors:
           describe: "Automatically generates an editor-preview.json file for the given theme. The selectors this command generates are not perfect, so please edit editor-preview.json after running."
@@ -888,10 +841,10 @@ en:
             noSelectorsFound: "No selectors found."
           success: "Selectors generated for {{ themePath }}, please double check the selectors generated at {{ selectorsPath }} before uploading the theme."
           positionals:
-            path:
+            themePath:
               describe: "The path of the theme you'd like to generate an editor-preview.json for."
         marketplaceValidate:
-          describe: "Validate a theme for the marketplace."
+          describe: "Validate a theme for the marketplace"
           errors:
             invalidPath: "The path \"{{ path }}\" is not a path to a folder in the Design Manager"
           logs:
@@ -904,19 +857,18 @@ en:
               lineNumber: "Line number: {{ line }}"
             noErrors: "No errors"
           positionals:
-            path:
+            src:
               describe: "Path to the theme within the Design Manager."
         preview:
-          describe: "Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site."
+          describe: "Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site"
           errors:
             invalidPath: "The path \"{{ path }}\" is not a path to a directory"
             noThemeComponents: "Your project has no theme components available to preview."
-          positionals:
+          options:
             src:
               describe: "Path to the local directory your theme is in, relative to your current working directory"
             dest:
               describe: "Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site."
-          options:
             notify:
               describe: "Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file"
             noSsl:
@@ -1015,7 +967,7 @@ en:
         initialUpload: "To upload the directory run \"hs upload\" beforehand or add the \"--initial-upload\" option when running \"hs watch\"."
         notUploaded: "The \"hs watch\" command no longer uploads the watched directory when started. The directory \"{{ path }}\" was not uploaded."
     convertFields:
-      describe: "Converts a specific JavaScript fields file of a module or theme to JSON."
+      describe: "Converts a specific JavaScript fields file of a module or theme to JSON"
       positionals:
         src:
           describe: Path to JS Fields file or directory containing javascript fields files.
@@ -1093,6 +1045,8 @@ en:
       checkIfParentAccountIsAuthed:
         notAuthedError: "To develop this project locally, run {{ authCommand }} to authenticate the App Developer Account {{ accountId }} associated with {{ accountIdentifier }}."
     projects:
+      config:
+        srcOutsideProjectDir: "Invalid value for 'srcDir' in {{ projectConfig }}: {{#bold}}srcDir: \"{{ srcDir }}\"{{/bold}}\n\t'srcDir' must be a relative path to a folder under the project root, such as \".\" or \"./src\""
       uploadProjectFiles:
         add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
         fail: "Failed to upload {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
@@ -1103,11 +1057,6 @@ en:
         compressed: "Project files compressed: {{ byteCount }} bytes"
         compressing: "Compressing build files to \"{{ path }}\""
         fileFiltered: "Ignore rule triggered for \"{{ filename }}\""
-      validateProjectConfig:
-        configNotFound: "Unable to locate a project configuration file. Try running again from a project directory, or run {{ createCommand }} to create a new project."
-        configMissingFields: "The project configuruation file is missing required fields."
-        srcDirNotFound: "Project source directory {{#bold}}{{ srcDir }}{{/bold}} could not be found in {{#bold}}{{ projectDir }}{{/bold}}."
-        srcOutsideProjectDir: "Invalid value for 'srcDir' in {{ projectConfig }}: {{#bold}}srcDir: \"{{ srcDir }}\"{{/bold}}\n\t'srcDir' must be a relative path to a folder under the project root, such as \".\" or \"./src\""
       ensureProjectExists:
         createPrompt: "The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
         createPromptUpload: "[--forceCreate] The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
@@ -1197,8 +1146,8 @@ en:
         noLogsFound: "No logs found."
     commonOpts:
       options:
-        account:
-          describe: "HubSpot account id or name from config"
+        portal:
+          describe: "HubSpot portal id or name from config"
         config:
           describe: "Path to a config file"
         overwrite:
@@ -1212,8 +1161,6 @@ en:
           describe: "Run command in QA mode"
         useEnv:
           describe: "Use environment variable config"
-        debug:
-          describe: "Set log level to debug"
     prompts:
       projectDevTargetAccountPrompt:
         createNewSandboxOption: "<Test on a new development sandbox>"
@@ -1270,7 +1217,6 @@ en:
         selectReactType: "Is this a React module?"
         selectContentType: "What types of content will this module be used in?"
         confirmGlobal: "Is this a global module?"
-        availableForNewContent: "Make this module available for new content?"
         errors:
           invalidLabel: "You entered an invalid name. Please try again."
           labelRequired: "The name may not be blank. Please try again."
@@ -1292,12 +1238,12 @@ en:
           languageRequired: "Please select API sample app's language"
       createProjectPrompt:
         enterName: "[--name] Give your project a name: "
-        enterDest: "[--dest] Enter the folder to create the project in:"
+        enterLocation: "[--location] Enter the folder to create the project in:"
         selectTemplate: "[--template] Choose a project template: "
         errors:
           nameRequired: "A project name is required"
-          destRequired: "A project dest is required"
-          invalidDest: "The selected destination already exists. Please provide a new path for this project."
+          locationRequired: "A project location is required"
+          invalidLocation: "The selected destination already exists. Please provide a new path for this project."
           invalidCharacters: "The selected destination contains invalid characters. Please provide a new path and try again."
           invalidTemplate: "[--template] Could not find template {{ template }}. Please choose an available template."
           noProjectsInConfig: "Please ensure that there is a config.json file that contains a \"projects\" field."
@@ -1324,9 +1270,6 @@ en:
           invalidType: "[--type] Could not find type {{ type }}. Please choose an available type."
       secretPrompt:
         enterValue: "Enter a value for your secret: "
-        enterName: "Enter a name for your secret: "
-        selectSecretUpdate: "Select the secret you want to update"
-        selectSecretDelete: "Select the secret you want to delete"
         errors:
           invalidValue: "You entered an invalid value. Please try again."
       sandboxesPrompt:
@@ -1337,8 +1280,8 @@ en:
           developer: "Development sandbox (Includes production's object definitions)"
           standard: "Standard sandbox (Includes partial copy of production's assets)"
       uploadPrompt:
-        enterDest: "Enter the destination path: "
-        enterSrc: "Enter the source path: "
+        enterDest: "[--dest] Enter the destination path: "
+        enterSrc: "[--src] Enter the source path: "
         errors:
           srcRequired: "You must specify a source directory."
           destRequired: "You must specify a destination directory."
@@ -1363,15 +1306,6 @@ en:
         prompt: "Open hubspot.com to install this app?"
         reinstallPrompt: "Open hubspot.com to reinstall this app?"
         decline: "To continue local development of this app, install it in your target test account and re-run {{#bold}}`hs project dev`{{/bold}}"
-      selectHubDBTablePrompt:
-        selectTable: "Select a HubDB table:"
-        enterDest: "Enter the destination path:"
-        errors:
-          noTables: "No HubDB tables found in account {{ accountId }}"
-          errorFetchingTables: "Unable to fetch HubDB tables in account {{ accountId }}"
-          destRequired: "A destination is required"
-          invalidDest: "The selected destination already exists. Please provide a new path."
-          invalidCharacters: "The selected destination contains invalid characters. Please provide a new path and try again."
     convertFields:
       positionals:
         src: