cli/app/app.go

@@ -9,5 +9,6 @@ var AppCommand = &cobra.Command{
 	// translators: `app` command group
 	Use:     i18n.G("app [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("a")},
-	Short:   i18n.G("Manage apps"),
+	// translators: Short description for `app` command group
+	Short: i18n.G("Manage apps"),
 }

cli/app/backup.go

@@ -15,8 +15,9 @@ var AppBackupListCommand = &cobra.Command{
 	// translators: `app backup list` command
 	Use:     i18n.G("list <domain> [flags]"),
 	Aliases: []string{i18n.G("ls")},
-	Short:   i18n.G("List the contents of a snapshot"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `app backup list` command
+	Short: i18n.G("List the contents of a snapshot"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -66,7 +67,8 @@ var AppBackupDownloadCommand = &cobra.Command{
 	// translators: `app backup download` command
 	Use:     i18n.G("download <domain> [flags]"),
 	Aliases: []string{i18n.G("d")},
-	Short:   i18n.G("Download a snapshot"),
+	// translators: Short description for `app backup download` command
+	Short: i18n.G("Download a snapshot"),
 	Long: i18n.G(`Downloads a backup.tar.gz to the current working directory.
 
 "--volumes/-v" includes data contained in volumes alongide paths specified in
@@ -136,8 +138,9 @@ var AppBackupCreateCommand = &cobra.Command{
 	// translators: `app backup create` command
 	Use:     i18n.G("create <domain> [flags]"),
 	Aliases: []string{i18n.G("c")},
-	Short:   i18n.G("Create a new snapshot"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `app backup create` command
+	Short: i18n.G("Create a new snapshot"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -181,8 +184,9 @@ var AppBackupSnapshotsCommand = &cobra.Command{
 	// translators: `app backup snapshots` command
 	Use:     i18n.G("snapshots <domain> [flags]"),
 	Aliases: []string{i18n.G("s")},
-	Short:   i18n.G("List all snapshots"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `app backup snapshots` command
+	Short: i18n.G("List all snapshots"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -217,7 +221,8 @@ var AppBackupCommand = &cobra.Command{
 	// translators: `app backup` command group
 	Use:     i18n.G("backup [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("b")},
-	Short:   i18n.G("Manage app backups"),
+	// translators: Short description for `app backup` command group
+	Short: i18n.G("Manage app backups"),
 }
 
 var (

cli/app/check.go

@@ -17,7 +17,8 @@ var AppCheckCommand = &cobra.Command{
 	// translators: `app check` command
 	Use:     i18n.G("check <domain> [flags]"),
 	Aliases: []string{i18n.G("chk")},
-	Short:   i18n.G("Ensure an app is well configured"),
+	// translators: Short description for `app check` command
+	Short: i18n.G("Ensure an app is well configured"),
 	Long: i18n.G(`Compare env vars in both the app ".env" and recipe ".env.sample" file.
 
 The goal is to ensure that recipe ".env.sample" env vars are defined in your

cli/app/cmd.go

@@ -22,7 +22,8 @@ var AppCmdCommand = &cobra.Command{
 	// translators: `app command` command
 	Use:     i18n.G("command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]"),
 	Aliases: []string{i18n.G("cmd")},
-	Short:   i18n.G("Run app commands"),
+	// translators: Short description for `app cmd` command
+	Short: i18n.G("Run app commands"),
 	Long: i18n.G(`Run an app specific command.
 
 These commands are bash functions, defined in the abra.sh of the recipe itself.
@@ -194,11 +195,12 @@ does not).`),
 }
 
 var AppCmdListCommand = &cobra.Command{
-	// translators: `app list` command
+	// translators: `app cmd list` command
 	Use:     i18n.G("list <domain> [flags]"),
 	Aliases: []string{i18n.G("ls")},
-	Short:   i18n.G("List all available commands"),
-	Args:    cobra.MinimumNArgs(1),
+	// translators: Short description for `app cmd list` command
+	Short: i18n.G("List all available commands"),
+	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 

cli/app/config.go

@@ -16,6 +16,7 @@ var AppConfigCommand = &cobra.Command{
 	// translators: `app config` command
 	Use:     i18n.G("config <domain> [flags]"),
 	Aliases: []string{i18n.G("cfg")},
+	// translators: Short description for `app config` command
 	Short:   i18n.G("Edit app config"),
 	Example: i18n.G("  abra config 1312.net"),
 	Args:    cobra.ExactArgs(1),

cli/app/cp.go

@@ -29,7 +29,8 @@ var AppCpCommand = &cobra.Command{
 	// translators: `app cp` command
 	Use:     i18n.G("cp <domain> <src> <dst> [flags]"),
 	Aliases: []string{i18n.G("c")},
-	Short:   i18n.G("Copy files to/from a deployed app service"),
+	// translators: Short description for `app cp` command
+	Short: i18n.G("Copy files to/from a deployed app service"),
 	Example: i18n.G(`  # copy myfile.txt to the root of the app service
   abra app cp 1312.net myfile.txt app:/
 

cli/app/deploy.go

@@ -28,7 +28,8 @@ var AppDeployCommand = &cobra.Command{
 	// translators: `app deploy` command
 	Use:     i18n.G("deploy <domain> [version] [flags]"),
 	Aliases: []string{i18n.G("d")},
-	Short:   i18n.G("Deploy an app"),
+	// translators: Short description for `app deploy` command
+	Short: i18n.G("Deploy an app"),
 	Long: i18n.G(`Deploy an app.
 
 This command supports chaos operations. Use "--chaos/-C" to deploy your recipe

cli/app/env.go

@@ -15,6 +15,7 @@ var AppEnvCommand = &cobra.Command{
 	// translators: `app env` command
 	Use:     i18n.G("env <domain> [flags]"),
 	Aliases: []string{i18n.G("e")},
+	// translators: Short description for `app env` command
 	Short:   i18n.G("Show app .env values"),
 	Example: i18n.G("  abra app env 1312.net"),
 	Args:    cobra.ExactArgs(1),

cli/app/labels.go

@@ -23,6 +23,7 @@ var AppLabelsCommand = &cobra.Command{
 	// translators: `app labels` command
 	Use:     i18n.G("labels <domain> [flags]"),
 	Aliases: []string{i18n.G("lb")},
+	// translators: Short description for `app labels` command
 	Short:   i18n.G("Show deployment labels"),
 	Long:    i18n.G("Both local recipe and live deployment labels are shown."),
 	Example: "  " + i18n.G("abra app labels 1312.net"),

cli/app/list.go

@@ -43,7 +43,8 @@ var AppListCommand = &cobra.Command{
 	// translators: `app list` command
 	Use:     i18n.G("list [flags]"),
 	Aliases: []string{i18n.G("ls")},
-	Short:   i18n.G("List all managed apps"),
+	// translators: Short description for `app list` command
+	Short: i18n.G("List all managed apps"),
 	Long: i18n.G(`Generate a report of all managed apps.
 
 Use "--status/-S" flag to query all servers for the live deployment status.`),

cli/app/logs.go

@@ -18,8 +18,9 @@ var AppLogsCommand = &cobra.Command{
 	// translators: `app logs` command
 	Use:     i18n.G("logs <domain> [service] [flags]"),
 	Aliases: []string{i18n.G("l")},
-	Short:   i18n.G("Tail app logs"),
-	Args:    cobra.RangeArgs(1, 2),
+	// translators: Short description for `app logs` command
+	Short: i18n.G("Tail app logs"),
+	Args:  cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/app/new.go

@@ -46,9 +46,10 @@ var AppNewCommand = &cobra.Command{
 	// translators: `app new` command
 	Use:     i18n.G("new [recipe] [version] [flags]"),
 	Aliases: []string{i18n.G("n")},
-	Short:   i18n.G("Create a new app"),
-	Long:    appNewDescription,
-	Args:    cobra.RangeArgs(0, 2),
+	// translators: Short description for `app new` command
+	Short: i18n.G("Create a new app"),
+	Long:  appNewDescription,
+	Args:  cobra.RangeArgs(0, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/app/ps.go

@@ -28,8 +28,9 @@ var AppPsCommand = &cobra.Command{
 	// translators: `app ps` command
 	Use:     i18n.G("ps <domain> [flags]"),
 	Aliases: []string{i18n.G("p")},
-	Short:   i18n.G("Check app deployment status"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `app ps` command
+	Short: i18n.G("Check app deployment status"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/app/remove.go

@@ -19,7 +19,8 @@ var AppRemoveCommand = &cobra.Command{
 	// translators: `app remove` command
 	Use:     i18n.G("remove <domain> [flags]"),
 	Aliases: []string{i18n.G("rm")},
-	Short:   i18n.G("Remove all app data, locally and remotely"),
+	// translators: Short description for `app remove` command
+	Short: i18n.G("Remove all app data, locally and remotely"),
 	Long: i18n.G(`Remove everything related to an app which is already undeployed.
 
 By default, it will prompt for confirmation before proceeding. All secrets,

cli/app/restart.go

@@ -21,7 +21,8 @@ var AppRestartCommand = &cobra.Command{
 	// translators: `app restart` command
 	Use:     i18n.G("restart <domain> [[service] | --all-services] [flags]"),
 	Aliases: []string{i18n.G("re")},
-	Short:   i18n.G("Restart an app"),
+	// translators: Short description for `app restart` command
+	Short: i18n.G("Restart an app"),
 	Long: i18n.G(`This command restarts services within a deployed app.
 
 Run "abra app ps <domain>" to see a list of service names.

cli/app/restore.go

@@ -16,7 +16,8 @@ var AppRestoreCommand = &cobra.Command{
 	// translators: `app restore` command
 	Use:     i18n.G("restore <domain> [flags]"),
 	Aliases: []string{i18n.G("rs")},
-	Short:   i18n.G("Restore a snapshot"),
+	// translators: Short description for `app restore` command
+	Short: i18n.G("Restore a snapshot"),
 	Long: i18n.G(`Snapshots are restored while apps are deployed.
 
 Some restore scenarios may require service / app restarts.`),

cli/app/rollback.go

@@ -25,7 +25,8 @@ var AppRollbackCommand = &cobra.Command{
 	// translators: `app rollback` command
 	Use:     i18n.G("rollback <domain> [version] [flags]"),
 	Aliases: []string{i18n.G("rl")},
-	Short:   i18n.G("Roll an app back to a previous version"),
+	// translators: Short description for `app rollback` command
+	Short: i18n.G("Roll an app back to a previous version"),
 	Long: i18n.G(`This command rolls an app back to a previous version.
 
 Unlike "abra app deploy", chaos operations are not supported here. Only recipe

cli/app/run.go

@@ -21,7 +21,8 @@ var AppRunCommand = &cobra.Command{
 	// translators: `app run` command
 	Use:     i18n.G("run <domain> <service> <cmd> [[args] [flags] | [flags] -- [args]]"),
 	Aliases: []string{i18n.G("r")},
-	Short:   i18n.G("Run a command inside a service container"),
+	// translators: Short description for `app run` command
+	Short: i18n.G("Run a command inside a service container"),
 	Example: i18n.G(`  # run <cmd> with args/flags
   abra app run 1312.net app -- ls -lha
 

cli/app/secret.go

@@ -28,8 +28,9 @@ var AppSecretGenerateCommand = &cobra.Command{
 	// translators: `app secret generate` command
 	Use:     i18n.G("generate <domain> [[secret] [version] | --all] [flags]"),
 	Aliases: []string{i18n.G("g")},
-	Short:   i18n.G("Generate secrets"),
-	Args:    cobra.RangeArgs(1, 3),
+	// translators: Short description for `app secret generate` command
+	Short: i18n.G("Generate secrets"),
+	Args:  cobra.RangeArgs(1, 3),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -149,7 +150,8 @@ var AppSecretInsertCommand = &cobra.Command{
 	// translators: `app secret insert` command
 	Use:     i18n.G("insert <domain> <secret> <version> [<data>] [flags]"),
 	Aliases: []string{i18n.G("i")},
-	Short:   i18n.G("Insert secret"),
+	// translators: Short description for `app secret insert` command
+	Short: i18n.G("Insert secret"),
 	Long: i18n.G(`This command inserts a secret into an app environment.
 
 Arbitrary secret insertion is not supported. Secrets that are inserted must
@@ -323,7 +325,8 @@ var AppSecretRmCommand = &cobra.Command{
 	// translators: `app secret remove` command
 	Use:     i18n.G("remove <domain> [[secret] | --all] [flags]"),
 	Aliases: []string{i18n.G("rm")},
-	Short:   i18n.G("Remove a secret"),
+	// translators: Short description for `app secret remove` command
+	Short: i18n.G("Remove a secret"),
 	Long: i18n.G(`This command removes a secret from an app environment.
 
 Arbitrary secret removal is not supported. Secrets that are removed must
@@ -437,8 +440,9 @@ var AppSecretLsCommand = &cobra.Command{
 	// translators: `app secret list` command
 	Use:     i18n.G("list <domain>"),
 	Aliases: []string{i18n.G("ls")},
-	Short:   i18n.G("List all secrets"),
-	Args:    cobra.MinimumNArgs(1),
+	// translators: Short description for `app secret list` command
+	Short: i18n.G("List all secrets"),
+	Args:  cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -513,7 +517,8 @@ var AppSecretCommand = &cobra.Command{
 	// translators: `app secret` command group
 	Use:     i18n.G("secret [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("s")},
-	Short:   i18n.G("Manage app secrets"),
+	// translators: Short description for `app secret` command group
+	Short: i18n.G("Manage app secrets"),
 }
 
 var (

cli/app/services.go

@@ -21,8 +21,9 @@ var AppServicesCommand = &cobra.Command{
 	// translators: `app services` command
 	Use:     i18n.G("services <domain> [flags]"),
 	Aliases: []string{i18n.G("sr")},
-	Short:   i18n.G("Display all services of an app"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `app services` command
+	Short: i18n.G("Display all services of an app"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/app/undeploy.go

@@ -22,7 +22,8 @@ var AppUndeployCommand = &cobra.Command{
 	// translators: `app undeploy` command
 	Use:     i18n.G("undeploy <domain> [flags]"),
 	Aliases: []string{i18n.G("un")},
-	Short:   i18n.G("Undeploy an app"),
+	// translators: Short description for `app undeploy` command
+	Short: i18n.G("Undeploy an app"),
 	Long: i18n.G(`This does not destroy any application data.
 
 However, you should remain vigilant, as your swarm installation will consider

cli/app/upgrade.go

@@ -29,7 +29,8 @@ var AppUpgradeCommand = &cobra.Command{
 	// translators: `app upgrade` command
 	Use:     i18n.G("upgrade <domain> [version] [flags]"),
 	Aliases: []string{i18n.G("up")},
-	Short:   i18n.G("Upgrade an app"),
+	// translators: Short description for `app upgrade` command
+	Short: i18n.G("Upgrade an app"),
 	Long: i18n.G(`Upgrade an app.
 
 Unlike "abra app deploy", chaos operations are not supported here. Only recipe

cli/app/volume.go

@@ -19,8 +19,9 @@ var AppVolumeListCommand = &cobra.Command{
 	// translators: `app volume list` command
 	Use:     i18n.G("list <domain> [flags]"),
 	Aliases: []string{i18n.G("ls")},
-	Short:   i18n.G("List volumes associated with an app"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `app list` command
+	Short: i18n.G("List volumes associated with an app"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -75,7 +76,8 @@ var AppVolumeListCommand = &cobra.Command{
 
 var AppVolumeRemoveCommand = &cobra.Command{
 	// translators: `app volume remove` command
-	Use:   i18n.G("remove <domain> [volume] [flags]"),
+	Use: i18n.G("remove <domain> [volume] [flags]"),
+	// translators: Short description for `app volume remove` command
 	Short: i18n.G("Remove volume(s) associated with an app"),
 	Long: i18n.G(`Remove volumes associated with an app.
 

cli/catalogue/catalogue.go

@@ -25,8 +25,9 @@ var CatalogueSyncCommand = &cobra.Command{
 	// translators: `catalogue sync` command
 	Use:     i18n.G("sync [flags]"),
 	Aliases: []string{i18n.G("g")},
-	Short:   i18n.G("Sync recipe catalogue for latest changes"),
-	Args:    cobra.NoArgs,
+	// translators: Short description for `catalogue sync` command
+	Short: i18n.G("Sync recipe catalogue for latest changes"),
+	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		if err := catalogue.EnsureCatalogue(); err != nil {
 			log.Fatal(err)
@@ -44,7 +45,8 @@ var CatalogueGenerateCommand = &cobra.Command{
 	// translators: `catalogue generate` command
 	Use:     i18n.G("generate [recipe] [flags]"),
 	Aliases: []string{i18n.G("g")},
-	Short:   i18n.G("Generate the recipe catalogue"),
+	// translators: Short description for `catalogue generate` command
+	Short: i18n.G("Generate the recipe catalogue"),
 	Long: i18n.G(`Generate a new copy of the recipe catalogue.
 
 N.B. this command **will** wipe local unstaged changes from your local recipes
@@ -265,7 +267,8 @@ your private key and enter your passphrase beforehand.
 // CatalogueCommand defines the `abra catalogue` command and sub-commands.
 var CatalogueCommand = &cobra.Command{
 	// translators: `catalogue` command group
-	Use:     i18n.G("catalogue [cmd] [args] [flags]"),
+	Use: i18n.G("catalogue [cmd] [args] [flags]"),
+	// translators: Short description for `catalogue` command group
 	Short:   i18n.G("Manage the recipe catalogue"),
 	Aliases: []string{"c"},
 }

cli/complete.go

@@ -9,7 +9,8 @@ import (
 
 var AutocompleteCommand = &cobra.Command{
 	// translators: `autocomplete` command
-	Use:   i18n.G("autocomplete [bash|zsh|fish|powershell]"),
+	Use: i18n.G("autocomplete [bash|zsh|fish|powershell]"),
+	// translators: Short description for `autocomplete` command
 	Short: i18n.G("Generate autocompletion script"),
 	Long: i18n.G(`To load completions:
 

cli/recipe/diff.go

@@ -13,9 +13,10 @@ var RecipeDiffCommand = &cobra.Command{
 	// translators: `recipe diff` command
 	Use:     i18n.G("diff <recipe> [flags]"),
 	Aliases: []string{i18n.G("d")},
-	Short:   i18n.G("Show unstaged changes in recipe config"),
-	Long:    i18n.G("This command requires /usr/bin/git."),
-	Args:    cobra.MinimumNArgs(1),
+	// translators: Short description for `recipe diff` command
+	Short: i18n.G("Show unstaged changes in recipe config"),
+	Long:  i18n.G("This command requires /usr/bin/git."),
+	Args:  cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/recipe/fetch.go

@@ -18,9 +18,10 @@ var RecipeFetchCommand = &cobra.Command{
 	// translators: `recipe fetch` command
 	Use:     i18n.G("fetch [recipe | --all] [flags]"),
 	Aliases: []string{i18n.G("f")},
-	Short:   i18n.G("Clone recipe(s) locally"),
-	Long:    i18n.G(`Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`),
-	Args:    cobra.RangeArgs(0, 1),
+	// translators: Short description for `recipe fetch` command
+	Short: i18n.G("Clone recipe(s) locally"),
+	Long:  i18n.G(`Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`),
+	Args:  cobra.RangeArgs(0, 1),
 	Example: i18n.G(`  # fetch from recipe catalogue
   abra recipe fetch gitea
 

cli/recipe/lint.go

@@ -12,7 +12,8 @@ import (
 
 var RecipeLintCommand = &cobra.Command{
 	// translators: `recipe lint` command
-	Use:     i18n.G("lint <recipe> [flags]"),
+	Use: i18n.G("lint <recipe> [flags]"),
+	// translators: Short description for `recipe lint` command
 	Short:   i18n.G("Lint a recipe"),
 	Aliases: []string{i18n.G("l")},
 	Args:    cobra.MinimumNArgs(1),

cli/recipe/list.go

@@ -16,7 +16,8 @@ import (
 
 var RecipeListCommand = &cobra.Command{
 	// translators: `recipe list` command
-	Use:     i18n.G("list"),
+	Use: i18n.G("list"),
+	// translators: Short description for `recipe list` command
 	Short:   i18n.G("List recipes"),
 	Aliases: []string{i18n.G("ls")},
 	Args:    cobra.NoArgs,

cli/recipe/recipe.go

@@ -10,7 +10,8 @@ var RecipeCommand = &cobra.Command{
 	// translators: `recipe` command group
 	Use:     i18n.G("recipe [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("r")},
-	Short:   i18n.G("Manage recipes"),
+	// translators: Short description for `recipe` command group
+	Short: i18n.G("Manage recipes"),
 	Long: i18n.G(`A recipe is a blueprint for an app.
 
 It is a bunch of config files which describe how to deploy and maintain an app.

cli/recipe/release.go

@@ -27,7 +27,8 @@ var RecipeReleaseCommand = &cobra.Command{
 	// translators: `recipe release` command
 	Use:     i18n.G("release <recipe> [version] [flags]"),
 	Aliases: []string{i18n.G("rl")},
-	Short:   i18n.G("Release a new recipe version"),
+	// translators: Short description for `recipe release` command
+	Short: i18n.G("Release a new recipe version"),
 	Long: i18n.G(`Create a new version of a recipe.
 
 These versions are then published on the Co-op Cloud recipe catalogue. These

cli/recipe/reset.go

@@ -13,9 +13,10 @@ var RecipeResetCommand = &cobra.Command{
 	// translators: `recipe reset` command
 	Use:     i18n.G("reset <recipe> [flags]"),
 	Aliases: []string{i18n.G("rs")},
-	Short:   i18n.G("Remove all unstaged changes from recipe config"),
-	Long:    i18n.G("WARNING: this will delete your changes. Be Careful."),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `recipe reset` command
+	Short: i18n.G("Remove all unstaged changes from recipe config"),
+	Long:  i18n.G("WARNING: this will delete your changes. Be Careful."),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/recipe/sync.go

@@ -22,7 +22,8 @@ var RecipeSyncCommand = &cobra.Command{
 	// translators: `recipe sync` command
 	Use:     i18n.G("sync <recipe> [version] [flags]"),
 	Aliases: []string{i18n.G("s")},
-	Short:   i18n.G("Sync recipe version label"),
+	// translators: Short description for `recipe sync` command
+	Short: i18n.G("Sync recipe version label"),
 	Long: i18n.G(`Generate labels for the main recipe service.
 
 By convention, the service named "app" using the following format:

cli/recipe/upgrade.go

@@ -41,7 +41,8 @@ var RecipeUpgradeCommand = &cobra.Command{
 	// translators: `recipe upgrade` command
 	Use:     i18n.G("upgrade <recipe> [flags]"),
 	Aliases: []string{i18n.G("u")},
-	Short:   i18n.G("Upgrade recipe image tags"),
+	// translators: Short description for `recipe upgrade` command
+	Short: i18n.G("Upgrade recipe image tags"),
 	Long: i18n.G(`Upgrade a given <recipe> configuration.
 
 It will update the relevant compose file tags on the local file system.

cli/recipe/version.go

@@ -17,8 +17,9 @@ var RecipeVersionCommand = &cobra.Command{
 	// translators: `recipe versions` command
 	Use:     i18n.G("versions <recipe> [flags]"),
 	Aliases: []string{i18n.G("v")},
-	Short:   i18n.G("List recipe versions"),
-	Args:    cobra.ExactArgs(1),
+	// translators: Short description for `recipe versions` command
+	Short: i18n.G("List recipe versions"),
+	Args:  cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,

cli/run.go

@@ -22,7 +22,8 @@ import (
 func Run(version, commit string) {
 	rootCmd := &cobra.Command{
 		// translators: `abra` binary name
-		Use:     i18n.G("abra [cmd] [args] [flags]"),
+		Use: i18n.G("abra [cmd] [args] [flags]"),
+		// translators: Short description for `abra` binary
 		Short:   i18n.G("The Co-op Cloud command-line utility belt 🎩🐇"),
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		ValidArgs: []string{
@@ -82,7 +83,8 @@ func Run(version, commit string) {
 		// translators: `man` command
 		Use:     i18n.G("man [flags]"),
 		Aliases: []string{"m"},
-		Short:   i18n.G("Generate manpage"),
+		// translators: Short description for `man` command
+		Short: i18n.G("Generate manpage"),
 		Example: i18n.G(`  # generate the man pages into /usr/local/share/man/man1
   abra_path=$(which abra)  # pass abra absolute path to sudo below
   sudo $abra_path man

cli/server/add.go

@@ -21,7 +21,8 @@ var ServerAddCommand = &cobra.Command{
 	// translators: `server add` command
 	Use:     i18n.G("add [[server] | --local] [flags]"),
 	Aliases: []string{i18n.G("a")},
-	Short:   i18n.G("Add a new server"),
+	// translators: Short description for `server add` command
+	Short: i18n.G("Add a new server"),
 	Long: i18n.G(`Add a new server to your configuration so that it can be managed by Abra.
 
 Abra relies on the standard SSH command-line and ~/.ssh/config for client

cli/server/list.go

@@ -18,8 +18,9 @@ var ServerListCommand = &cobra.Command{
 	// translators: `server list` command
 	Use:     i18n.G("list [flags]"),
 	Aliases: []string{i18n.G("ls")},
-	Short:   i18n.G("List managed servers"),
-	Args:    cobra.NoArgs,
+	// translators: Short description for `server list` command
+	Short: i18n.G("List managed servers"),
+	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		dockerContextStore := contextPkg.NewDefaultDockerContextStore()
 		contexts, err := dockerContextStore.Store.List()

cli/server/prune.go

@@ -15,7 +15,8 @@ var ServerPruneCommand = &cobra.Command{
 	// translators: `server prune` command
 	Use:     i18n.G("prune <server> [flags]"),
 	Aliases: []string{i18n.G("p")},
-	Short:   i18n.G("Prune resources on a server"),
+	// translators: Short description for `server prune` command
+	Short: i18n.G("Prune resources on a server"),
 	Long: i18n.G(`Prunes unused containers, networks, and dangling images.
 
 Use "--volumes/-v" to remove volumes that are not associated with a deployed

cli/server/remove.go

@@ -17,7 +17,8 @@ var ServerRemoveCommand = &cobra.Command{
 	// translators: `server remove` command
 	Use:     i18n.G("remove <server> [flags]"),
 	Aliases: []string{i18n.G("rm")},
-	Short:   i18n.G("Remove a managed server"),
+	// translators: Short description for `server remove` command
+	Short: i18n.G("Remove a managed server"),
 	Long: i18n.G(`Remove a managed server.
 
 Abra will remove the internal bookkeeping ($ABRA_DIR/servers/...) and

cli/server/server.go

@@ -10,5 +10,6 @@ var ServerCommand = &cobra.Command{
 	// translators: `server` command group
 	Use:     i18n.G("server [cmd] [args] [flags]"),
 	Aliases: []string{i18n.G("s")},
-	Short:   i18n.G("Manage servers"),
+	// translators: Short description for `server` command group
+	Short: i18n.G("Manage servers"),
 }

cli/updater/updater.go

@@ -35,7 +35,8 @@ var NotifyCommand = &cobra.Command{
 	// translators: `notify` command
 	Use:     i18n.G("notify [flags]"),
 	Aliases: []string{i18n.G("n")},
-	Short:   i18n.G("Check for available upgrades"),
+	// translators: Short description for `notify` command
+	Short: i18n.G("Check for available upgrades"),
 	Long: i18n.G(`Notify on new versions for deployed apps.
 
 If a new patch/minor version is available, a notification is printed.
@@ -75,7 +76,8 @@ var UpgradeCommand = &cobra.Command{
 	// translators: `app upgrade` command
 	Use:     i18n.G("upgrade [[stack] [recipe] | --all] [flags]"),
 	Aliases: []string{i18n.G("u")},
-	Short:   i18n.G("Upgrade apps"),
+	// translators: Short description for `app upgrade` command
+	Short: i18n.G("Upgrade apps"),
 	Long: i18n.G(`Upgrade an app by specifying stack name and recipe. 
 
 Use "--all" to upgrade every deployed app.
@@ -473,7 +475,8 @@ func newKadabraApp(version, commit string) *cobra.Command {
 		// translators: `kadabra` binary name
 		Use:     i18n.G("kadabra [cmd] [flags]"),
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
-		Short:   i18n.G("The Co-op Cloud auto-updater 🤖 🚀"),
+		// translators: Short description for `kababra` binary
+		Short: i18n.G("The Co-op Cloud auto-updater 🤖 🚀"),
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			log.Logger.SetStyles(charmLog.DefaultStyles())
 			charmLog.SetDefault(log.Logger)

cli/upgrade.go

@@ -16,7 +16,8 @@ var UpgradeCommand = &cobra.Command{
 	// translators: `upgrade` command
 	Use:     i18n.G("upgrade [flags]"),
 	Aliases: []string{"u"},
-	Short:   i18n.G("Upgrade abra"),
+	// translators: Short description for `upgrade` command
+	Short: i18n.G("Upgrade abra"),
 	Long: i18n.G(`Upgrade abra in-place with the latest stable or release candidate.
 
 By default, the latest stable release is downloaded.